pull/1395/head
gedoor 3 years ago
parent 7424e63557
commit bd888d0c37
  1. 2
      app/src/main/java/io/legado/app/base/BaseActivity.kt
  2. 14
      app/src/main/java/io/legado/app/utils/ActivityExtensions.kt

@ -157,7 +157,7 @@ abstract class BaseActivity<VB : ViewBinding>(
private fun setupSystemBar() { private fun setupSystemBar() {
if (fullScreen && !isInMultiWindow) { if (fullScreen && !isInMultiWindow) {
fullScreen(true) fullScreen()
} }
val isTransparentStatusBar = AppConfig.isTransparentStatusBar val isTransparentStatusBar = AppConfig.isTransparentStatusBar
val statusBarColor = ThemeStore.statusBarColor(this, isTransparentStatusBar) val statusBarColor = ThemeStore.statusBarColor(this, isTransparentStatusBar)

@ -42,27 +42,19 @@ val Activity.windowSize: DisplayMetrics
return displayMetrics return displayMetrics
} }
fun Activity.fullScreen(fullScreen: Boolean) { fun Activity.fullScreen() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
window.setDecorFitsSystemWindows(fullScreen) window.setDecorFitsSystemWindows(true)
} }
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
if (fullScreen) {
window.decorView.systemUiVisibility = window.decorView.systemUiVisibility =
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
@Suppress("DEPRECATION")
window.clearFlags( window.clearFlags(
WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
or WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION or WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
) )
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
} else {
window.decorView.systemUiVisibility = 0
window.addFlags(
WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
or WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
)
window.clearFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
}
} }
/** /**

Loading…
Cancel
Save