From b3646b8f5fc13cef36e2092635e966c8ef564895 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sat, 22 May 2021 23:10:39 -0400 Subject: [PATCH] Upping to Material lib 1.4.0 beta Which has tablet changes for the bottom sheets and makes it easier to do edge2edge for bottom sheets --- app/build.gradle.kts | 2 +- .../eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt | 8 -------- app/src/main/res/values/styles.xml | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8aa690a6cd..1f4c0c8786 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -97,7 +97,7 @@ dependencies { // Android X libraries implementation("androidx.appcompat:appcompat:1.3.0-rc01") implementation("androidx.cardview:cardview:1.0.0") - implementation("com.google.android.material:material:1.3.0") + implementation("com.google.android.material:material:1.4.0-beta01") implementation("androidx.recyclerview:recyclerview:1.2.0") implementation("androidx.preference:preference:1.1.1") implementation("androidx.annotation:annotation:1.2.0") diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt index 3e0d442a7a..938a801851 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/E2EBottomSheetDialog.kt @@ -31,20 +31,12 @@ abstract class E2EBottomSheetDialog(activity: Activity) : val contentView = binding.root - window?.setBackgroundDrawable(null) window?.navigationBarColor = activity.window.navigationBarColor val isLight = (activity.window?.decorView?.systemUiVisibility ?: 0) and View .SYSTEM_UI_FLAG_LIGHT_STATUS_BAR == View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && isLight) { window?.decorView?.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR } - window?.findViewById(com.google.android.material.R.id.container)?.fitsSystemWindows = - false - window?.findViewById(com.google.android.material.R.id.coordinator)?.fitsSystemWindows = - false - contentView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View - .SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - val insets = activity.window.decorView.rootWindowInsets (contentView.parent as View).background = null contentView.post { diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 429773c717..a43e5c1d33 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -185,6 +185,7 @@ false @android:color/transparent @android:color/transparent + true