null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Black nav bar is no longer used in dark themes for devices android 8 and lower

Browse source 
now matches theme
This commit is contained in:
Jays2Kings 2021-09-13 22:36:59 -04:00
parent f9501fdcea
commit f6633374bc
1 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

52
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -79,6 +79,7 @@ import eu.kanade.tachiyomi.util.system.contextCompatDrawable
import eu.kanade.tachiyomi.util.system.getResourceColor
import eu.kanade.tachiyomi.util.system.hasSideNavBar
import eu.kanade.tachiyomi.util.system.isBottomTappable
import eu.kanade.tachiyomi.util.system.isInNightMode
import eu.kanade.tachiyomi.util.system.launchUI
import eu.kanade.tachiyomi.util.system.prepareSideNavContext
import eu.kanade.tachiyomi.util.system.toast
@ -439,28 +440,35 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
private fun setNavBarColor(insets: WindowInsets?) {
if (insets == null) return
window.navigationBarColor = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1) {
// basically if in landscape on a phone
// For lollipop, draw opaque nav bar
if (insets.hasSideNavBar()) {
Color.BLACK
} else Color.argb(179, 0, 0, 0)
}
// if the android q+ device has gesture nav, transparent nav bar
// this is here in case some crazy with a notch uses landscape
else if (insets.isBottomTappable()) {
getColor(android.R.color.transparent)
}
// if in landscape with 2/3 button mode, fully opaque nav bar
else if (insets.hasSideNavBar()) {
getResourceColor(R.attr.colorPrimaryVariant)
}
// if in portrait with 2/3 button mode, translucent nav bar
else {
ColorUtils.setAlphaComponent(
getResourceColor(R.attr.colorPrimaryVariant),
179
)
window.navigationBarColor = when {
Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1 -> {
// basically if in landscape on a phone
// For lollipop, draw opaque nav bar
when {
insets.hasSideNavBar() -> Color.BLACK
isInNightMode() -> ColorUtils.setAlphaComponent(
getResourceColor(R.attr.colorPrimaryVariant),
179
)
else -> Color.argb(179, 0, 0, 0)
}
}
// if the android q+ device has gesture nav, transparent nav bar
// this is here in case some crazy with a notch uses landscape
insets.isBottomTappable() -> {
getColor(android.R.color.transparent)
}
// if in landscape with 2/3 button mode, fully opaque nav bar
insets.hasSideNavBar() -> {
getResourceColor(R.attr.colorPrimaryVariant)
}
// if in portrait with 2/3 button mode, translucent nav bar
else -> {
ColorUtils.setAlphaComponent(
getResourceColor(R.attr.colorPrimaryVariant),
179
)
}
}
}