Horis пре 3 година
родитељ
комит
31684df623
1 измењених фајлова са 2 додато и 6 уклоњено
  1. 2 6
      app/src/main/java/io/legado/app/utils/ActivityExtensions.kt

+ 2 - 6
app/src/main/java/io/legado/app/utils/ActivityExtensions.kt

@@ -3,7 +3,6 @@ package io.legado.app.utils
 import android.annotation.SuppressLint
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Activity
 import android.graphics.Color
 import android.graphics.Color
-import android.graphics.Insets
 import android.os.Build
 import android.os.Build
 import android.os.Bundle
 import android.os.Bundle
 import android.util.DisplayMetrics
 import android.util.DisplayMetrics
@@ -33,11 +32,8 @@ val WindowManager.windowSize: DisplayMetrics
         val displayMetrics = DisplayMetrics()
         val displayMetrics = DisplayMetrics()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             val windowMetrics: WindowMetrics = currentWindowMetrics
             val windowMetrics: WindowMetrics = currentWindowMetrics
-            val systemBarsInsets = windowMetrics.windowInsets
-                .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
-            val waterfallInsets = windowMetrics.windowInsets.displayCutout?.waterfallInsets
-                ?: Insets.NONE
-            val insets = Insets.max(systemBarsInsets, waterfallInsets)
+            val insets = windowMetrics.windowInsets
+                .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars() or WindowInsets.Type.displayCutout())
             val windowWidth = windowMetrics.bounds.width()
             val windowWidth = windowMetrics.bounds.width()
             val windowHeight = windowMetrics.bounds.height()
             val windowHeight = windowMetrics.bounds.height()
             var insetsWidth = insets.left + insets.right
             var insetsWidth = insets.left + insets.right