diff --git a/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt b/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt index 680810b6f941..786d8597fd57 100644 --- a/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt +++ b/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt @@ -17,7 +17,7 @@ import com.nextcloud.client.player.ui.audio.AudioPlayerActivity import com.nmc.android.ui.LauncherActivity import com.owncloud.android.R import com.owncloud.android.authentication.AuthenticatorActivity -import com.owncloud.android.ui.activity.DrawerActivity +import com.owncloud.android.ui.activity.ToolbarActivity import com.owncloud.android.ui.preview.PreviewImageActivity import com.owncloud.android.utils.theme.ViewThemeUtils import dynamiccolor.MaterialDynamicColors @@ -58,7 +58,7 @@ class SystemBarBackgroundCallbacks(private val viewThemeUtilsProvider: Provider< @ColorInt private fun statusBarColor(activity: Activity, @ColorInt actionBarColor: Int): Int { - if (activity is DrawerActivity && activity.isToolbarStyleSearch) { + if (activity is ToolbarActivity && activity.isHomeSearchToolbarVisible) { return ContextCompat.getColor(activity, R.color.bg_default) } diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java index 7db6c88e12bb..e8628ddc6ca3 100644 --- a/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java +++ b/app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java @@ -32,6 +32,7 @@ import com.google.android.material.textview.MaterialTextView; import com.nextcloud.android.common.ui.theme.utils.ColorRole; import com.nextcloud.client.di.Injectable; +import com.nextcloud.client.systembars.SystemBarBackgroundCallbacks; import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -289,6 +290,12 @@ private void showHomeSearchToolbar(boolean isShow) { mDefaultToolbar.setVisibility(View.VISIBLE); mHomeSearchToolbar.setVisibility(View.GONE); } + + SystemBarBackgroundCallbacks.apply(this, viewThemeUtils); + } + + public boolean isHomeSearchToolbarVisible() { + return mHomeSearchToolbar != null && mHomeSearchToolbar.getVisibility() == View.VISIBLE; } /**