Use SideSheet instead of BottomSheet on landscape

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ChaptersSheet.kt

@@ -9,8 +9,8 @@ import dagger.hilt.android.AndroidEntryPoint
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableMangaChapters
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseBottomSheet
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback
 import org.koitharu.kotatsu.core.util.ext.getParcelableCompat
 import org.koitharu.kotatsu.core.util.ext.withArgs
@@ -23,7 +23,7 @@ import javax.inject.Inject
 import kotlin.math.roundToInt
 
 @AndroidEntryPoint
-class ChaptersBottomSheet : BaseBottomSheet<SheetChaptersBinding>(), OnListItemClickListener<ChapterListItem> {
+class ChaptersSheet : BaseAdaptiveSheet<SheetChaptersBinding>(), OnListItemClickListener<ChapterListItem> {
 
 	@Inject
 	lateinit var settings: AppSettings
@@ -83,7 +83,7 @@ class ChaptersBottomSheet : BaseBottomSheet<SheetChaptersBinding>(), OnListItemC
 			fm: FragmentManager,
 			chapters: List<MangaChapter>,
 			currentId: Long,
-		) = ChaptersBottomSheet().withArgs(2) {
+		) = ChaptersSheet().withArgs(2) {
 			putParcelable(ARG_CHAPTERS, ParcelableMangaChapters(chapters))
 			putLong(ARG_CURRENT_ID, currentId)
 		}.show(fm, TAG)

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt

@@ -52,7 +52,7 @@ import org.koitharu.kotatsu.core.util.ext.zipWithPrevious
 import org.koitharu.kotatsu.databinding.ActivityReaderBinding
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaChapter
-import org.koitharu.kotatsu.reader.ui.config.ReaderConfigBottomSheet
+import org.koitharu.kotatsu.reader.ui.config.ReaderConfigSheet
 import org.koitharu.kotatsu.reader.ui.pager.ReaderPage
 import org.koitharu.kotatsu.reader.ui.pager.ReaderUiState
 import org.koitharu.kotatsu.reader.ui.thumbnails.OnPageSelectListener
@@ -64,10 +64,10 @@ import javax.inject.Inject
 @AndroidEntryPoint
 class ReaderActivity :
 	BaseFullscreenActivity<ActivityReaderBinding>(),
-	ChaptersBottomSheet.OnChapterChangeListener,
+	ChaptersSheet.OnChapterChangeListener,
 	GridTouchHelper.OnGridTouchListener,
 	OnPageSelectListener,
-	ReaderConfigBottomSheet.Callback,
+	ReaderConfigSheet.Callback,
 	ReaderControlDelegate.OnInteractionListener,
 	OnApplyWindowInsetsListener,
 	IdlingDetector.Callback {
@@ -179,7 +179,7 @@ class ReaderActivity :
 			}
 
 			R.id.action_chapters -> {
-				ChaptersBottomSheet.show(
+				ChaptersSheet.show(
 					supportFragmentManager,
 					viewModel.manga?.chapters.orEmpty(),
 					viewModel.getCurrentState()?.chapterId ?: 0L,
@@ -207,7 +207,7 @@ class ReaderActivity :
 			R.id.action_options -> {
 				viewModel.saveCurrentState(readerManager.currentReader?.getCurrentState())
 				val currentMode = readerManager.currentMode ?: return false
-				ReaderConfigBottomSheet.show(supportFragmentManager, currentMode)
+				ReaderConfigSheet.show(supportFragmentManager, currentMode)
 			}
 
 			else -> return super.onOptionsItemSelected(item)

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/config/ReaderConfigSheet.kt

@@ -23,7 +23,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.core.prefs.ReaderMode
 import org.koitharu.kotatsu.core.prefs.observeAsStateFlow
-import org.koitharu.kotatsu.core.ui.BaseBottomSheet
+import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.util.ScreenOrientationHelper
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.viewLifecycleScope
@@ -36,8 +36,8 @@ import org.koitharu.kotatsu.settings.SettingsActivity
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class ReaderConfigBottomSheet :
-	BaseBottomSheet<SheetReaderConfigBinding>(),
+class ReaderConfigSheet :
+	BaseAdaptiveSheet<SheetReaderConfigBinding>(),
 	ActivityResultCallback<Uri?>,
 	View.OnClickListener,
 	MaterialButtonToggleGroup.OnButtonCheckedListener,
@@ -59,11 +59,17 @@ class ReaderConfigBottomSheet :
 			?: ReaderMode.STANDARD
 	}
 
-	override fun onCreateViewBinding(inflater: LayoutInflater, container: ViewGroup?): SheetReaderConfigBinding {
+	override fun onCreateViewBinding(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+	): SheetReaderConfigBinding {
 		return SheetReaderConfigBinding.inflate(inflater, container, false)
 	}
 
-	override fun onViewBindingCreated(binding: SheetReaderConfigBinding, savedInstanceState: Bundle?) {
+	override fun onViewBindingCreated(
+		binding: SheetReaderConfigBinding,
+		savedInstanceState: Bundle?,
+	) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		observeScreenOrientation()
 		binding.buttonStandard.isChecked = mode == ReaderMode.STANDARD
@@ -127,7 +133,11 @@ class ReaderConfigBottomSheet :
 		}
 	}
 
-	override fun onButtonChecked(group: MaterialButtonToggleGroup?, checkedId: Int, isChecked: Boolean) {
+	override fun onButtonChecked(
+		group: MaterialButtonToggleGroup?,
+		checkedId: Int,
+		isChecked: Boolean,
+	) {
 		if (!isChecked) {
 			return
 		}
@@ -180,7 +190,7 @@ class ReaderConfigBottomSheet :
 		private const val TAG = "ReaderConfigBottomSheet"
 		private const val ARG_MODE = "mode"
 
-		fun show(fm: FragmentManager, mode: ReaderMode) = ReaderConfigBottomSheet().withArgs(1) {
+		fun show(fm: FragmentManager, mode: ReaderMode) = ReaderConfigSheet().withArgs(1) {
 			putInt(ARG_MODE, mode.id)
 		}.show(fm, TAG)
 	}

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsSheet.kt

@@ -14,12 +14,13 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.resolve.SnackbarErrorObserver
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.prefs.AppSettings
-import org.koitharu.kotatsu.core.ui.BaseBottomSheet
 import org.koitharu.kotatsu.core.ui.list.BoundsScrollListener
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.ui.list.ScrollListenerInvalidationObserver
 import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration
-import org.koitharu.kotatsu.core.ui.widgets.BottomSheetHeaderBar
+import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetBehavior
+import org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetCallback
+import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
 import org.koitharu.kotatsu.core.util.ext.observe
 import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
@@ -31,14 +32,13 @@ import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.PageThumbnailAdapter
 import org.koitharu.kotatsu.reader.ui.thumbnails.adapter.TargetScrollObserver
-import org.koitharu.kotatsu.util.LoggingAdapterDataObserver
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class PagesThumbnailsSheet :
-	BaseBottomSheet<SheetPagesBinding>(),
-	OnListItemClickListener<PageThumbnail>,
-	BottomSheetHeaderBar.OnExpansionChangeListener {
+	BaseAdaptiveSheet<SheetPagesBinding>(),
+	AdaptiveSheetCallback,
+	OnListItemClickListener<PageThumbnail> {
 
 	private val viewModel by viewModels<PagesThumbnailsViewModel>()
 
@@ -64,11 +64,6 @@ class PagesThumbnailsSheet :
 	override fun onViewBindingCreated(binding: SheetPagesBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		spanResolver = MangaListSpanResolver(binding.root.resources)
-		with(binding.headerBar) {
-			title = viewModel.title
-			subtitle = null
-			addOnExpansionChangeListener(this@PagesThumbnailsSheet)
-		}
 		thumbnailsAdapter = PageThumbnailAdapter(
 			coil = coil,
 			lifecycleOwner = viewLifecycleOwner,
@@ -87,14 +82,11 @@ class PagesThumbnailsSheet :
 				ScrollListenerInvalidationObserver(this, checkNotNull(scrollListener)),
 			)
 			thumbnailsAdapter?.registerAdapterDataObserver(TargetScrollObserver(this))
-			thumbnailsAdapter?.registerAdapterDataObserver(LoggingAdapterDataObserver("THUMB"))
 		}
 		viewModel.thumbnails.observe(viewLifecycleOwner) {
 			thumbnailsAdapter?.setItems(it, listCommitCallback)
 		}
-		viewModel.branch.observe(viewLifecycleOwner) {
-			onExpansionStateChanged(binding.headerBar, binding.headerBar.isExpanded)
-		}
+		viewModel.branch.observe(viewLifecycleOwner, ::updateTitle)
 		viewModel.onError.observeEvent(viewLifecycleOwner, SnackbarErrorObserver(binding.recyclerView, this))
 	}
 
@@ -118,13 +110,17 @@ class PagesThumbnailsSheet :
 		dismiss()
 	}
 
-	override fun onExpansionStateChanged(headerBar: BottomSheetHeaderBar, isExpanded: Boolean) {
-		if (isExpanded) {
-			headerBar.subtitle = viewModel.branch.value
+	override fun onStateChanged(sheet: View, newState: Int) {
+		viewBinding?.recyclerView?.isFastScrollerEnabled = newState == AdaptiveSheetBehavior.STATE_EXPANDED
+	}
+
+	private fun updateTitle(branch: String?) {
+		val mangaName = viewModel.manga.title
+		viewBinding?.headerBar?.title = if (branch != null) {
+			getString(R.string.manga_branch_title_template, mangaName, branch)
 		} else {
-			headerBar.subtitle = null
+			mangaName
 		}
-		viewBinding?.recyclerView?.isFastScrollerEnabled = isExpanded
 	}
 
 	private inner class ScrollListener : BoundsScrollListener(3, 3) {

app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/thumbnails/PagesThumbnailsViewModel.kt

@@ -42,7 +42,6 @@ class PagesThumbnailsViewModel @Inject constructor(
 
 	val thumbnails = MutableStateFlow<List<ListModel>>(emptyList())
 	val branch = MutableStateFlow<String?>(null)
-	val title = manga.title
 
 	init {
 		loadingJob = launchJob(Dispatchers.Default) {