Merge pull request #6029 from Bnyro/master

fix: navigation bar color when pure theme disabled
libre-tube · May 14, 2024 · a8771ab · a8771ab
2 parents 9742b8c + f36e431
commit a8771ab
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "com.github.libretube"
         minSdk = 21
         targetSdk = 34
-        versionCode = 52
-        versionName = "0.23.1"
+        versionCode = 53
+        versionName = "0.23.2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resValue("string", "app_name", "LibreTube")
 

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
@@ -112,8 +112,12 @@ class MainActivity : BaseActivity() {
         }
 
         // sets the color if the navigation bar is visible
-        val bottomNavColor = SurfaceColors.getColorForElevation(this, binding.bottomNav.elevation).takeIf {
-            binding.bottomNav.menu.size() > 0
+        val bottomNavColor = if (binding.bottomNav.menu.size() == 0) {
+            null
+        } else if (PreferenceHelper.getBoolean(PreferenceKeys.PURE_THEME, false)) {
+            SurfaceColors.getColorForElevation(this, binding.bottomNav.elevation)
+        } else {
+            ThemeHelper.getThemeColor(this, com.google.android.material.R.attr.colorSurfaceContainer)
         }
         ThemeHelper.setSystemBarColors(this, window, bottomNavColor)
 

diff --git a/fastlane/metadata/android/en-US/changelogs/53.txt b/fastlane/metadata/android/en-US/changelogs/53.txt
@@ -0,0 +1,8 @@
+* fix: comments reloading on sheet reopen and scroll position not restored
+* fix: status bar doesn't follow app theme
+* fix: dearrow for playing video and watch history
+* fix: crash when trying to dearrow feed items
+* fix: auto fullscreen causes player layout issues
+* fix: crash when ending player service / fragment
+* fix: enter PiP mode when clicking link in description
+* fix: navigation bar missing when closing player in fullscreen