From 5c4f3f7fe4ede7915ef4f9925bb580d5c90e449d Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Wed, 18 May 2022 23:35:58 +0300 Subject: [PATCH] Revert `onCreateDialog` method This thing is really needed --- .../java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt | 6 ++++++ .../kotatsu/base/ui/dialog/AppBottomSheetDialog.kt | 2 +- app/src/main/res/values-v27/styles.xml | 8 -------- 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 app/src/main/res/values-v27/styles.xml diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt index 38758555f..7378b5acf 100644 --- a/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt +++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt @@ -1,5 +1,6 @@ package org.koitharu.kotatsu.base.ui +import android.app.Dialog import android.os.Bundle import android.util.DisplayMetrics import android.view.LayoutInflater @@ -12,6 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import org.koitharu.kotatsu.R +import org.koitharu.kotatsu.base.ui.dialog.AppBottomSheetDialog import org.koitharu.kotatsu.utils.ext.displayCompat import com.google.android.material.R as materialR @@ -54,6 +56,10 @@ abstract class BaseBottomSheet : BottomSheetDialogFragment() { super.onDestroyView() } + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + return AppBottomSheetDialog(requireContext(), theme) + } + protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) { diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt index d3b911ace..8b6da8d3d 100644 --- a/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt +++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/dialog/AppBottomSheetDialog.kt @@ -21,7 +21,7 @@ class AppBottomSheetDialog(context: Context, theme: Int) : BottomSheetDialog(con if (drawEdgeToEdge) { // Copied from super.onAttachedToWindow: val edgeToEdgeFlags = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_STABLE - // Fix super-class's window flag bug by respecting the intial system UI visibility: + // Fix super-class's window flag bug by respecting the initial system UI visibility: window.decorView.systemUiVisibility = edgeToEdgeFlags or initialSystemUiVisibility } } diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml deleted file mode 100644 index 370045cf3..000000000 --- a/app/src/main/res/values-v27/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file