소스 검색

Revert "Use insetter library for handling inset padding" (fixes #3586)

This reverts commit 3ddd1033c32d8e051f048a4b7a1911f55b37a501.
arkon 4 년 전
부모
커밋
ecec1bd102
2개의 변경된 파일11개의 추가작업 그리고 10개의 파일을 삭제
  1. 0 2
      app/build.gradle
  2. 11 8
      app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

+ 0 - 2
app/build.gradle

@@ -153,8 +153,6 @@ dependencies {
     // UI library
     implementation 'com.google.android.material:material:1.3.0-alpha02'
 
-    implementation 'dev.chrisbanes:insetter-ktx:0.3.1'
-
     standardImplementation 'com.google.firebase:firebase-core:17.4.4'
 
     // ReactiveX

+ 11 - 8
app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt

@@ -20,11 +20,11 @@ import android.view.WindowManager
 import android.view.animation.Animation
 import android.view.animation.AnimationUtils
 import android.widget.SeekBar
+import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
 import com.google.android.material.snackbar.Snackbar
-import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Chapter
 import eu.kanade.tachiyomi.data.database.models.Manga
@@ -288,13 +288,16 @@ class ReaderActivity : BaseRxActivity<ReaderActivityBinding, ReaderPresenter>()
             onBackPressed()
         }
 
-        if (!window.isDefaultBar()) {
-            binding.readerMenu.applySystemWindowInsetsToPadding(
-                left = true,
-                top = true,
-                right = true,
-                bottom = true
-            )
+        ViewCompat.setOnApplyWindowInsetsListener(binding.readerMenu) { _, insets ->
+            if (!window.isDefaultBar()) {
+                binding.readerMenu.setPadding(
+                    insets.systemWindowInsetLeft,
+                    insets.systemWindowInsetTop,
+                    insets.systemWindowInsetRight,
+                    insets.systemWindowInsetBottom
+                )
+            }
+            insets
         }
 
         // Init listeners on bottom menu