From 4d08a9a40e3b7be78bc54b53aa19b160e9dc79b6 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 29 Sep 2026 08:28:03 +0200 Subject: [PATCH 1/2] fix(status-bar): details fix(status-bar): details Signed-off-by: alperozturk96 [skip ci] --- .../client/systembars/SystemBarBackgroundCallbacks.kt | 2 +- .../com/owncloud/android/ui/activity/ToolbarActivity.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 a0ebd8ee76ab..1761b74e199a 100644 --- a/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt +++ b/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt @@ -54,7 +54,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; } /** From b733f8e7c98ae21afa42b2eff52224011abb8c5b Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Tue, 29 Sep 2026 16:03:34 +0200 Subject: [PATCH 2/2] fix imports Signed-off-by: alperozturk96 --- .../client/systembars/SystemBarBackgroundCallbacks.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 1761b74e199a..15a7b6ae1cc4 100644 --- a/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt +++ b/app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt @@ -13,10 +13,12 @@ import android.widget.FrameLayout import androidx.annotation.ColorInt import androidx.core.content.ContextCompat import com.nextcloud.client.onboarding.FirstRunActivity +import com.nextcloud.client.player.ui.PlayerActivity 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 import javax.inject.Provider @@ -29,7 +31,9 @@ class SystemBarBackgroundCallbacks(private val viewThemeUtilsProvider: Provider< private val excludedActivities = listOf( LauncherActivity::class, AuthenticatorActivity::class, - FirstRunActivity::class + FirstRunActivity::class, + PlayerActivity::class, + PreviewImageActivity::class ) private fun isExcluded(activity: Activity): Boolean = excludedActivities.any { it.isInstance(activity) }