Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 18:51:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to themes and theme changing in webview

Browse Source
This commit is contained in:
Jays2Kings 2021-04-18 02:22:19 -04:00
parent 5d0fc750a7
commit f1cc4a35dc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
View File

@ -14,6 +14,7 @@ import androidx.core.graphics.ColorUtils
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.WebviewActivityBinding
import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
import eu.kanade.tachiyomi.util.system.getPrefTheme
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.system.isBottomTappable
import eu.kanade.tachiyomi.util.system.isInNightMode
@ -39,7 +40,11 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
binding.toolbar.setNavigationOnClickListener {
super.onBackPressed()
}
binding.toolbar.navigationIcon?.setTint(getResourceColor(R.attr.actionBarTintColor))
val tintColor = getResourceColor(R.attr.actionBarTintColor)
binding.toolbar.navigationIcon?.setTint(tintColor)
binding.toolbar.navigationIcon?.setTint(tintColor)
binding.toolbar.overflowIcon?.mutate()
binding.toolbar.overflowIcon?.setTint(tintColor)
val container: ViewGroup = findViewById(R.id.web_view_layout)
val content: LinearLayout = binding.webLinearLayout
@ -145,6 +150,7 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
override fun onConfigurationChanged(newConfig: Configuration) {
super.onConfigurationChanged(newConfig)
val lightMode = !isInNightMode()
setTheme(getPrefTheme(preferences).styleRes)
window.statusBarColor = ColorUtils.setAlphaComponent(
getResourceColor(
R.attr
@ -160,6 +166,7 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
binding.toolbar.overflowIcon?.mutate()
binding.toolbar.setTitleTextColor(tintColor)
binding.toolbar.overflowIcon?.setTint(tintColor)
binding.swipeRefresh.setStyle()
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
window.navigationBarColor = getResourceColor(R.attr.colorPrimaryVariant)

1
app/src/main/res/layout/webview_activity.xml
View File

@ -22,6 +22,7 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorSecondary"
android:theme="?attr/actionBarTheme"
app:titleTextColor="?actionBarTintColor"
app:navigationIcon="@drawable/ic_close_24dp"
app:layout_scrollFlags="scroll|enterAlways" />