From a029fc950e47dac93895b4ebaacfb1546ade313b Mon Sep 17 00:00:00 2001 From: CarlosEsco Date: Wed, 22 Apr 2020 13:20:22 -0400 Subject: [PATCH] improve if readability improve bottom edge readability --- .../ui/reader/ReaderSettingsSheet.kt | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt index 1c45799c85..f337cc5cf6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt @@ -52,9 +52,14 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : 0 else -1 ) window?.navigationBarColor = Color.TRANSPARENT - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && preferences.readerTheme() - .getOrDefault() == 0 && activity.window.decorView.rootWindowInsets.systemWindowInsetRight == 0 && activity.window.decorView.rootWindowInsets.systemWindowInsetLeft == 0 - ) window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && + preferences.readerTheme().getOrDefault() == 0 && + activity.window.decorView.rootWindowInsets.systemWindowInsetRight == 0 && + activity.window.decorView.rootWindowInsets.systemWindowInsetLeft == 0 + ) { + window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR + } + val height = activity.window.decorView.rootWindowInsets.systemWindowInsetBottom sheetBehavior.peekHeight = 550.dpToPx + height @@ -87,9 +92,14 @@ class ReaderSettingsSheet(private val activity: ReaderActivity) : is WebtoonViewer -> initWebtoonPreferences() } - setBottomEdge( - if (activity.viewer is PagerViewer) page_transitions else webtoon_side_padding, activity - ) + + + val bottomEdgeView = when(activity.viewer is PagerViewer){ + true -> page_transitions + false -> webtoon_side_padding + } + + setBottomEdge(bottomEdgeView, activity) close_button.setOnClickListener { dismiss()