优化
This commit is contained in:
@@ -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
|
val insets = windowMetrics.windowInsets
|
||||||
.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
|
.getInsetsIgnoringVisibility(WindowInsets.Type.systemBars() or WindowInsets.Type.displayCutout())
|
||||||
val waterfallInsets = windowMetrics.windowInsets.displayCutout?.waterfallInsets
|
|
||||||
?: Insets.NONE
|
|
||||||
val insets = Insets.max(systemBarsInsets, waterfallInsets)
|
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user