Improve color in darkmode and fix another searchview collapsed

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>

src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java

@@ -47,6 +47,7 @@ import com.owncloud.android.utils.ThemeUtils;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 
 /**
@@ -82,6 +83,7 @@ public abstract class ToolbarActivity extends BaseActivity {
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+        ThemeUtils.colorStatusBar(this);
 
         mAppBar = findViewById(R.id.appbar);
         mDefaultToolbar = findViewById(R.id.default_toolbar);
@@ -99,8 +101,6 @@ public abstract class ToolbarActivity extends BaseActivity {
         mPreviewImage = findViewById(R.id.preview_image);
         mPreviewImageContainer = findViewById(R.id.preview_image_frame);
 
-        ThemeUtils.colorStatusBar(this);
-
         if (toolbar.getOverflowIcon() != null) {
             ThemeUtils.tintDrawable(toolbar.getOverflowIcon(), fontColor);
         }
@@ -148,7 +148,7 @@ public abstract class ToolbarActivity extends BaseActivity {
 
     @SuppressLint("PrivateResource")
     private void showHomeSearchToolbar(boolean isShow) {
-        if (isShow) {
+        if (isShow && mDefaultToolbar.getVisibility() == View.VISIBLE) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(),
                                                                                     R.animator.appbar_elevation_off));
@@ -157,7 +157,8 @@ public abstract class ToolbarActivity extends BaseActivity {
             }
             mDefaultToolbar.setVisibility(View.GONE);
             mHomeSearchToolbar.setVisibility(View.VISIBLE);
-        } else {
+            ThemeUtils.colorStatusBar(this, ContextCompat.getColor(this, R.color.bg_default));
+        } else if (mDefaultToolbar.getVisibility() == View.GONE) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(),
                                                                                     R.animator.appbar_elevation_on));
@@ -166,6 +167,7 @@ public abstract class ToolbarActivity extends BaseActivity {
             }
             mDefaultToolbar.setVisibility(View.VISIBLE);
             mHomeSearchToolbar.setVisibility(View.GONE);
+            ThemeUtils.colorStatusBar(this);
         }
     }
 

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1242,21 +1242,16 @@ public class OCFileListFragment extends ExtendedListFragment implements
 
 
                 if (searchView != null && !searchView.isIconified() && !fromSearch) {
-
-                    searchView.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            searchView.setQuery("", false);
-                            searchView.onActionViewCollapsed();
-                            Activity activity;
-                            if ((activity = getActivity()) != null && activity instanceof FileDisplayActivity) {
-                                FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) activity;
-                                if (getCurrentFile() != null) {
-                                    fileDisplayActivity.setDrawerIndicatorEnabled(
-                                            fileDisplayActivity.isRoot(getCurrentFile()));
-                                }
+                    searchView.post(() -> {
+                        searchView.setQuery("", false);
+                        searchView.onActionViewCollapsed();
+                        Activity activity;
+                        if ((activity = getActivity()) != null && activity instanceof FileDisplayActivity) {
+                            FileDisplayActivity fileDisplayActivity = (FileDisplayActivity) activity;
+                            fileDisplayActivity.hideSearchView(fileDisplayActivity.getCurrentDir());
+                            if (getCurrentFile() != null) {
+                                fileDisplayActivity.setDrawerIndicatorEnabled(fileDisplayActivity.isRoot(getCurrentFile()));
                             }
-
                         }
                     });
                 }

src/main/res/layout/toolbar_standard.xml

@@ -69,7 +69,7 @@
         android:layout_marginEnd="16dp"
         android:visibility="gone"
         app:background="@color/appbar"
-        app:strokeColor="#E0E0E0"
+        app:strokeColor="@color/stroke_home_toolbar"
         app:strokeWidth="1dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout

src/main/res/values-night/colors.xml

@@ -46,4 +46,5 @@
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">@android:color/white</color>
+    <color name="stroke_home_toolbar">#727272</color>
 </resources>

src/main/res/values/colors.xml

@@ -89,4 +89,5 @@
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="fontSecondaryAppbar">#A5A5A5</color>
+    <color name="stroke_home_toolbar">#E0E0E0</color>
 </resources>