From c01cee3f832b567d76df7d4aa5238f4597677c06 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sat, 21 Jan 2023 11:06:16 +0100 Subject: [PATCH 1/2] Use a lower elevation for the navigation bar --- .../java/com/github/libretube/ui/activities/MainActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt index 17dd44643..3e2069659 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt @@ -97,7 +97,7 @@ class MainActivity : BaseActivity() { // sets the navigation bar color to the previously calculated color window.navigationBarColor = if (binding.bottomNav.menu.size() > 0) { - SurfaceColors.getColorForElevation(this, 10F) + SurfaceColors.getColorForElevation(this, 9F) } else { ThemeHelper.getThemeColor(this, android.R.attr.colorBackground) } @@ -120,7 +120,7 @@ class MainActivity : BaseActivity() { val navHostFragment = supportFragmentManager.findFragmentById(R.id.fragment) as NavHostFragment? // get the current fragment - val fragment = navHostFragment?.childFragmentManager?.fragments?.get(0) + val fragment = navHostFragment?.childFragmentManager?.fragments?.getOrNull(0) tryScrollToTop(fragment?.requireView() as? ViewGroup) } } From 87519742dac1f138e91aa35626a20da2f9cab54e Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sat, 21 Jan 2023 11:08:32 +0100 Subject: [PATCH 2/2] Use the same elevation for nav and bottom bar --- .../java/com/github/libretube/ui/activities/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt index 3e2069659..2f9cd70b2 100644 --- a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt @@ -97,7 +97,7 @@ class MainActivity : BaseActivity() { // sets the navigation bar color to the previously calculated color window.navigationBarColor = if (binding.bottomNav.menu.size() > 0) { - SurfaceColors.getColorForElevation(this, 9F) + SurfaceColors.getColorForElevation(this, binding.bottomNav.elevation) } else { ThemeHelper.getThemeColor(this, android.R.attr.colorBackground) }