Skip to content
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.

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

fix: navigation bar color when pure theme disabled #6029

Merged
merged 2 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,12 @@
}

// 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) {

Check failure on line 115 in app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt

View workflow job for this annotation

GitHub Actions / Check Code Quality

[ktlint] reported by reviewdog 🐶 A multiline expression should start on a new line Raw Output: app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt:115:30: error: A multiline expression should start on a new line (standard:multiline-expression-wrapping)
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)

Expand Down
8 changes: 8 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/53.txt
Original file line number Diff line number Diff line change
@@ -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
Loading