Skip to content

Commit a8771ab

Browse files
authored
Merge pull request #6029 from Bnyro/master
fix: navigation bar color when pure theme disabled
2 parents 9742b8c + f36e431 commit a8771ab

3 files changed

Lines changed: 16 additions & 4 deletions

File tree

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ android {
1515
applicationId = "com.github.libretube"
1616
minSdk = 21
1717
targetSdk = 34
18-
versionCode = 52
19-
versionName = "0.23.1"
18+
versionCode = 53
19+
versionName = "0.23.2"
2020
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2121
resValue("string", "app_name", "LibreTube")
2222

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,12 @@ class MainActivity : BaseActivity() {
112112
}
113113

114114
// sets the color if the navigation bar is visible
115-
val bottomNavColor = SurfaceColors.getColorForElevation(this, binding.bottomNav.elevation).takeIf {
116-
binding.bottomNav.menu.size() > 0
115+
val bottomNavColor = if (binding.bottomNav.menu.size() == 0) {
116+
null
117+
} else if (PreferenceHelper.getBoolean(PreferenceKeys.PURE_THEME, false)) {
118+
SurfaceColors.getColorForElevation(this, binding.bottomNav.elevation)
119+
} else {
120+
ThemeHelper.getThemeColor(this, com.google.android.material.R.attr.colorSurfaceContainer)
117121
}
118122
ThemeHelper.setSystemBarColors(this, window, bottomNavColor)
119123

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
* fix: comments reloading on sheet reopen and scroll position not restored
2+
* fix: status bar doesn't follow app theme
3+
* fix: dearrow for playing video and watch history
4+
* fix: crash when trying to dearrow feed items
5+
* fix: auto fullscreen causes player layout issues
6+
* fix: crash when ending player service / fragment
7+
* fix: enter PiP mode when clicking link in description
8+
* fix: navigation bar missing when closing player in fullscreen

0 commit comments

Comments
 (0)