kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-27 23:40:33 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #2785 from Bnyro/master

Browse Source 
Fix the different colors of navigation and bottom bar
This commit is contained in:
Bnyro 2023-01-21 11:08:39 +01:00 committed by GitHub
commit e3ad011de6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
View File

@ -97,7 +97,7 @@ class MainActivity : BaseActivity() {
// sets the navigation bar color to the previously calculated color // sets the navigation bar color to the previously calculated color
window.navigationBarColor = if (binding.bottomNav.menu.size() > 0) { window.navigationBarColor = if (binding.bottomNav.menu.size() > 0) {
SurfaceColors.getColorForElevation(this, 10F) SurfaceColors.getColorForElevation(this, binding.bottomNav.elevation)
} else { } else {
ThemeHelper.getThemeColor(this, android.R.attr.colorBackground) ThemeHelper.getThemeColor(this, android.R.attr.colorBackground)
} }
@ -120,7 +120,7 @@ class MainActivity : BaseActivity() {
val navHostFragment = val navHostFragment =
supportFragmentManager.findFragmentById(R.id.fragment) as NavHostFragment? supportFragmentManager.findFragmentById(R.id.fragment) as NavHostFragment?
// get the current fragment // get the current fragment
val fragment = navHostFragment?.childFragmentManager?.fragments?.get(0) val fragment = navHostFragment?.childFragmentManager?.fragments?.getOrNull(0)
tryScrollToTop(fragment?.requireView() as? ViewGroup) tryScrollToTop(fragment?.requireView() as? ViewGroup)
} }
} }