From 58ec6e80c9457b411ad67739bd839340c3a6cd13 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Wed, 30 Oct 2024 16:29:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt     | 2 +-
 .../java/io/legado/app/ui/book/read/BaseReadBookActivity.kt     | 2 +-
 app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt  | 2 +-
 app/src/main/java/io/legado/app/utils/ViewExtensions.kt         | 2 +-
 app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
index 05afbfe97..76b8ac47f 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt
@@ -72,7 +72,7 @@ class BookInfoEditActivity :
 
     private fun initView() {
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
-            val typeMask = WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.ime()
+            val typeMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
             val insets = windowInsets.getInsets(typeMask)
             binding.root.bottomPadding = insets.bottom
             windowInsets
diff --git a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt
index 0e1c7b603..f157141ea 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/BaseReadBookActivity.kt
@@ -84,7 +84,7 @@ abstract class BaseReadBookActivity :
         upLayoutInDisplayCutoutMode()
         super.onCreate(savedInstanceState)
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
-            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             binding.navigationBar.run {
                 layoutParams = layoutParams.apply { height = insets.bottom }
             }
diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
index 5d6c23f7a..94c1a3651 100644
--- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
@@ -200,7 +200,7 @@ class ReadRssActivity : VMBaseActivity<ActivityRssReadBinding, ReadRssViewModel>
 
     private fun initView() {
         ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
-            val typeMask = WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.ime()
+            val typeMask = WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
             val insets = windowInsets.getInsets(typeMask)
             binding.root.bottomPadding = insets.bottom
             windowInsets
diff --git a/app/src/main/java/io/legado/app/utils/ViewExtensions.kt b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
index 17984c762..5e5aa66ea 100644
--- a/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/ViewExtensions.kt
@@ -272,7 +272,7 @@ fun View.applyStatusBarPadding(withInitialPadding: Boolean = false) {
 fun View.applyNavigationBarPadding(withInitialPadding: Boolean = false) {
     val initialPadding = if (withInitialPadding) bottomPadding else 0
     ViewCompat.setOnApplyWindowInsetsListener(this) { _, windowInsets ->
-        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
         bottomPadding = initialPadding + insets.bottom
         windowInsets
     }
diff --git a/app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt b/app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt
index 7edde3f01..5aa6e6ea8 100644
--- a/app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/WindowInsetsExtensions.kt
@@ -3,7 +3,7 @@ package io.legado.app.utils
 import androidx.core.view.WindowInsetsCompat
 
 val WindowInsetsCompat.navigationBarHeight
-    get() = getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
+    get() = getInsets(WindowInsetsCompat.Type.systemBars()).bottom
 
 val WindowInsetsCompat.imeHeight
     get() = getInsets(WindowInsetsCompat.Type.ime()).bottom