Skip to content

[stable-35.0.x] fix(status-bar): details #17734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 2 commits into from
Sep 29, 2026
Merged

[stable-35.0.x] fix(status-bar): details #17734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d08a9a
fix(status-bar): details
alperozturk96 Sep 29, 2026
b733f8e
fix imports
alperozturk96 Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/main/java/com/nextcloud/client/systembars/SystemBarBackgroundCallbacks.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) }
Expand All @@ -54,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)
}

Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/owncloud/android/ui/activity/ToolbarActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

/**
Expand Down
Loading