Bottom sheet improvements

app/src/main/java/org/koitharu/kotatsu/base/ui/BaseBottomSheet.kt

@@ -1,19 +1,18 @@
 package org.koitharu.kotatsu.base.ui
 
-import android.app.Dialog
 import android.os.Bundle
+import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams
-import androidx.appcompat.app.AppCompatDialog
 import androidx.core.view.updateLayoutParams
 import androidx.viewbinding.ViewBinding
 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
 
 abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
@@ -33,6 +32,20 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 	): View {
 		val binding = onInflateView(inflater, container)
 		viewBinding = binding
+
+		// Enforce max width for tablets
+		val width = resources.getDimensionPixelSize(R.dimen.bottom_sheet_width)
+		if (width > 0) {
+			behavior?.maxWidth = width
+		}
+
+		// Set peek height to 50% display height
+		requireContext().displayCompat?.let {
+			val metrics = DisplayMetrics()
+			it.getRealMetrics(metrics)
+			behavior?.peekHeight = metrics.heightPixels / 2
+		}
+
 		return binding.root
 	}
 
@@ -41,14 +54,6 @@ abstract class BaseBottomSheet<B : ViewBinding> : BottomSheetDialogFragment() {
 		super.onDestroyView()
 	}
 
-	override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-		return if (resources.getBoolean(R.bool.is_tablet)) {
-			AppCompatDialog(context, R.style.Theme_Kotatsu_Dialog)
-		} else {
-			AppBottomSheetDialog(requireContext(), theme)
-		}
-	}
-
 	protected abstract fun onInflateView(inflater: LayoutInflater, container: ViewGroup?): B
 
 	protected fun setExpanded(isExpanded: Boolean, isLocked: Boolean) {

app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -233,6 +233,8 @@ class MainActivity :
 		}
 		binding.toolbarCard.updateLayoutParams<MarginLayoutParams> {
 			topMargin = insets.top + bottomMargin
+			leftMargin = insets.left
+			rightMargin = insets.right
 		}
 		binding.root.updatePadding(
 			left = insets.left,

app/src/main/java/org/koitharu/kotatsu/utils/ext/DisplayExt.kt

@@ -0,0 +1,15 @@
+package org.koitharu.kotatsu.utils.ext
+
+import android.content.Context
+import android.os.Build
+import android.view.Display
+import android.view.WindowManager
+import androidx.core.content.getSystemService
+
+val Context.displayCompat: Display?
+	get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+		display
+	} else {
+		@Suppress("DEPRECATION")
+		getSystemService<WindowManager>()?.defaultDisplay
+	}