From a5e1f92b05e38fc40dc11792a5f32986cb8ce9dc Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 2 Aug 2020 23:09:18 -0400 Subject: [PATCH] Use insetter library for handling inset padding (cherry picked from commit 3ddd1033c32d8e051f048a4b7a1911f55b37a501) --- app/build.gradle | 2 ++ .../tachiyomi/ui/reader/ReaderActivity.kt | 19 ++++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2b8f128e0..b0d8bbc3f 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -164,6 +164,8 @@ 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 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 17ec4ff83..cfce92cac 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -20,13 +20,13 @@ 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.afollestad.materialdialogs.MaterialDialog import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.elvishew.xlog.XLog 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 @@ -359,16 +359,13 @@ class ReaderActivity : BaseRxActivity() onBackPressed() } - ViewCompat.setOnApplyWindowInsetsListener(binding.readerMenu) { _, insets -> - if (!window.isDefaultBar()) { - binding.readerMenu.setPadding( - insets.systemWindowInsetLeft, - insets.systemWindowInsetTop, - insets.systemWindowInsetRight, - insets.systemWindowInsetBottom - ) - } - insets + if (!window.isDefaultBar()) { + binding.readerMenu.applySystemWindowInsetsToPadding( + left = true, + top = true, + right = true, + bottom = true + ) } // Init listeners on bottom menu