Эх сурвалжийг харах

Port some status bar theming to new utils

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 жил өмнө
parent
commit
51332a6fea

+ 1 - 1
app/build.gradle

@@ -355,7 +355,7 @@ dependencies {
     gplayImplementation "com.google.firebase:firebase-messaging:23.0.7"
 
     // TODO change back to tag before merging
-    implementation 'com.github.nextcloud.android-common:ui:2c8987f0f2'
+    implementation 'com.github.nextcloud.android-common:ui:1177040'
 }
 
 configurations.all {

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -785,7 +785,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
                 btnChooseFolder.setBackgroundColor(Color.GRAY);
             }
 
-            themeToolbarUtils.colorStatusBar(this);
+            viewThemeUtils.platform.themeStatusBar(this);
 
             themeToolbarUtils.tintBackButton(actionBar, this);
 

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -756,7 +756,7 @@ public class SettingsActivity extends ThemedPreferenceActivity
         ActionBar actionBar = getDelegate().getSupportActionBar();
 
         if (actionBar != null) {
-            themeToolbarUtils.colorStatusBar(this);
+            viewThemeUtils.platform.themeStatusBar(this);
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setDisplayShowTitleEnabled(true);
             if (this.getResources() != null) {

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

@@ -93,7 +93,6 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
     private void setupToolbar(boolean isHomeSearchToolbarShow, boolean showSortListButtonGroup) {
         mToolbar = findViewById(R.id.toolbar);
         setSupportActionBar(mToolbar);
-        themeToolbarUtils.colorStatusBar(this);
 
         mAppBar = findViewById(R.id.appbar);
         mDefaultToolbar = findViewById(R.id.default_toolbar);
@@ -118,6 +117,7 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
         mToolbarSpinner = findViewById(R.id.toolbar_spinner);
 
         viewThemeUtils.material.themeToolbar(mToolbar);
+        viewThemeUtils.platform.themeStatusBar(this);
     }
 
     public void setupToolbar() {
@@ -174,7 +174,7 @@ public abstract class ToolbarActivity extends BaseActivity implements Injectable
         } else {
             mAppBar.setStateListAnimator(AnimatorInflater.loadStateListAnimator(mAppBar.getContext(),
                                                                                 R.animator.appbar_elevation_on));
-            viewThemeUtils.platform.themeStatusBar(this, mDefaultToolbar);
+            viewThemeUtils.platform.themeStatusBar(this);
             mDefaultToolbar.setVisibility(View.VISIBLE);
             mHomeSearchToolbar.setVisibility(View.GONE);
         }

+ 5 - 0
app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -780,6 +780,11 @@ public class OCFileListFragment extends ExtendedListFragment implements
                 setFabVisible(true);
             }
 
+            Activity activity = getActivity();
+            if (activity != null) {
+                viewThemeUtils.platform.resetStatusBar(activity);
+            }
+
             getCommonAdapter().setMultiSelect(false);
             getCommonAdapter().clearCheckedItems();
         }

+ 0 - 4
app/src/main/java/com/owncloud/android/utils/theme/ThemeToolbarUtils.java

@@ -160,8 +160,4 @@ public class ThemeToolbarUtils {
             }
         }
     }
-
-    public void colorStatusBar(Activity fragmentActivity) {
-        colorStatusBar(fragmentActivity, themeColorUtils.primaryAppbarColor(fragmentActivity));
-    }
 }