瀏覽代碼

Hide actionbar title when search input field is opened

Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
ZetaTom 1 年之前
父節點
當前提交
5f7941219e

+ 6 - 8
app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -180,19 +180,17 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
      * Updates title bar and home buttons (state and icon).
      */
     public void updateActionBarTitleAndHomeButtonByString(String title) {
-        String titleToSet = getString(R.string.app_name);    // default
-
-        if (title != null) {
-            titleToSet = title;
-        }
-
         // set & color the chosen title
         ActionBar actionBar = getSupportActionBar();
 
         // set home button properties
         if (actionBar != null) {
-            actionBar.setTitle(titleToSet);
-            actionBar.setDisplayShowTitleEnabled(true);
+            if (title != null) {
+                actionBar.setTitle(title);
+                actionBar.setDisplayShowTitleEnabled(true);
+            } else {
+                actionBar.setDisplayShowTitleEnabled(false);
+            }
         }
     }
 

+ 2 - 2
app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

@@ -137,7 +137,7 @@ class UnifiedSearchFragment : Fragment(), Injectable, UnifiedSearchListInterface
         vm.query.observe(this) { query ->
             if (activity is FileDisplayActivity) {
                 (activity as FileDisplayActivity)
-                    .updateActionBarTitleAndHomeButtonByString("\"${query}\"")
+                    .updateActionBarTitleAndHomeButtonByString(null)
             }
         }
         vm.browserUri.observe(this) { uri ->
@@ -169,7 +169,7 @@ class UnifiedSearchFragment : Fragment(), Injectable, UnifiedSearchListInterface
         if (activity is FileDisplayActivity) {
             val fileDisplayActivity = activity as FileDisplayActivity
             fileDisplayActivity.setMainFabVisible(false)
-            fileDisplayActivity.updateActionBarTitleAndHomeButtonByString("\"${vm.query.value!!}\"")
+            fileDisplayActivity.updateActionBarTitleAndHomeButtonByString(null)
         }
 
         val gridLayoutManager = GridLayoutManager(requireContext(), 1)