Fix status/navigation bar colors (fixes #2858)
This commit is contained in:
parent
aa70be525d
commit
7c7d40ea44
6 changed files with 6 additions and 24 deletions
|
@ -37,10 +37,6 @@ class WebViewActivity : BaseActivity() {
|
||||||
binding = WebviewActivityBinding.inflate(layoutInflater)
|
binding = WebviewActivityBinding.inflate(layoutInflater)
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
|
|
||||||
// Manually override status bar color since it's normally transparent with the app themes
|
|
||||||
// This is needed to hide the app bar when it scrolls up
|
|
||||||
window.statusBarColor = getResourceColor(R.attr.colorPrimaryDark)
|
|
||||||
|
|
||||||
title = intent.extras?.getString(TITLE_KEY)
|
title = intent.extras?.getString(TITLE_KEY)
|
||||||
setSupportActionBar(binding.toolbar)
|
setSupportActionBar(binding.toolbar)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
|
|
|
@ -54,10 +54,6 @@ open class SimpleNavigationView @JvmOverloads constructor(
|
||||||
R.styleable.NavigationView_elevation, 0).toFloat())
|
R.styleable.NavigationView_elevation, 0).toFloat())
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("DEPRECATION")
|
|
||||||
ViewCompat.setFitsSystemWindows(this,
|
|
||||||
a.getBoolean(R.styleable.NavigationView_android_fitsSystemWindows, false))
|
|
||||||
|
|
||||||
maxWidth = a.getDimensionPixelSize(R.styleable.NavigationView_android_maxWidth, 0)
|
maxWidth = a.getDimensionPixelSize(R.styleable.NavigationView_android_maxWidth, 0)
|
||||||
|
|
||||||
a.recycle()
|
a.recycle()
|
||||||
|
|
|
@ -7,8 +7,7 @@
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:fitsSystemWindows="true">
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/catalogue_view"
|
android:id="@+id/catalogue_view"
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:fitsSystemWindows="true"
|
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<eu.kanade.tachiyomi.widget.ElevationAppBarLayout
|
<eu.kanade.tachiyomi.widget.ElevationAppBarLayout
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:fitsSystemWindows="true"
|
|
||||||
android:orientation="vertical">
|
android:orientation="vertical">
|
||||||
|
|
||||||
<com.google.android.material.appbar.AppBarLayout
|
<com.google.android.material.appbar.AppBarLayout
|
||||||
|
|
|
@ -43,6 +43,8 @@
|
||||||
<item name="android:textDirection">locale</item>
|
<item name="android:textDirection">locale</item>
|
||||||
|
|
||||||
<!-- Themes -->
|
<!-- Themes -->
|
||||||
|
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||||
|
<item name="android:navigationBarColor">?attr/colorPrimary</item>
|
||||||
<item name="windowActionModeOverlay">true</item>
|
<item name="windowActionModeOverlay">true</item>
|
||||||
<item name="elevationOverlayEnabled">false</item>
|
<item name="elevationOverlayEnabled">false</item>
|
||||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
|
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
|
||||||
|
@ -65,7 +67,6 @@
|
||||||
<!-- Main Theme-->
|
<!-- Main Theme-->
|
||||||
<!--===========-->
|
<!--===========-->
|
||||||
<style name="Theme.Tachiyomi.Light" parent="Theme.Base">
|
<style name="Theme.Tachiyomi.Light" parent="Theme.Base">
|
||||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
|
||||||
<item name="android:statusBarColor">@color/md_black_1000_54</item>
|
<item name="android:statusBarColor">@color/md_black_1000_54</item>
|
||||||
<item name="android:navigationBarColor">@color/md_black_1000_54</item>
|
<item name="android:navigationBarColor">@color/md_black_1000_54</item>
|
||||||
|
|
||||||
|
@ -73,10 +74,6 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Tachiyomi.LightBlue" parent="Theme.Base">
|
<style name="Theme.Tachiyomi.LightBlue" parent="Theme.Base">
|
||||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
|
||||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
|
||||||
<item name="android:navigationBarColor">@color/colorPrimaryDark</item>
|
|
||||||
|
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
|
@ -116,11 +113,9 @@
|
||||||
<item name="android:divider">@color/dividerDark</item>
|
<item name="android:divider">@color/dividerDark</item>
|
||||||
<item name="android:listDivider">@drawable/line_divider</item>
|
<item name="android:listDivider">@drawable/line_divider</item>
|
||||||
|
|
||||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
|
||||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
|
||||||
<item name="android:navigationBarColor">@color/colorDarkPrimary</item>
|
|
||||||
|
|
||||||
<!-- Themes -->
|
<!-- Themes -->
|
||||||
|
<item name="android:statusBarColor">?attr/colorPrimary</item>
|
||||||
|
<item name="android:navigationBarColor">?attr/colorPrimary</item>
|
||||||
<item name="windowActionModeOverlay">true</item>
|
<item name="windowActionModeOverlay">true</item>
|
||||||
<item name="elevationOverlayEnabled">false</item>
|
<item name="elevationOverlayEnabled">false</item>
|
||||||
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
|
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
|
||||||
|
@ -144,14 +139,11 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
|
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
|
||||||
<!-- Attributes specific for SDK 16 to SDK 20 -->
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
|
<style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark">
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimary</item>
|
<item name="colorPrimaryDark">@color/colorPrimary</item>
|
||||||
|
|
||||||
<item name="android:navigationBarColor">@color/colorPrimary</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<!--==============-->
|
<!--==============-->
|
||||||
|
@ -164,6 +156,7 @@
|
||||||
|
|
||||||
<item name="android:colorBackground">@color/colorAmoledPrimary</item>
|
<item name="android:colorBackground">@color/colorAmoledPrimary</item>
|
||||||
|
|
||||||
|
<!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
|
||||||
<item name="android:navigationBarColor">@android:color/transparent</item>
|
<item name="android:navigationBarColor">@android:color/transparent</item>
|
||||||
|
|
||||||
<!-- Themes -->
|
<!-- Themes -->
|
||||||
|
|
Reference in a new issue