Move read button to bottom

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt

@@ -25,7 +25,6 @@ import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
-import androidx.swiperefreshlayout.widget.CircularProgressDrawable
 import coil.ImageLoader
 import coil.request.ImageRequest
 import coil.request.SuccessResult
@@ -135,7 +134,7 @@ class DetailsActivity :
 		viewBinding.buttonRead.setOnClickListener(this)
 		viewBinding.buttonRead.setOnLongClickListener(this)
 		viewBinding.buttonRead.setOnContextClickListenerCompat(this)
-		viewBinding.buttonDownload?.setOnClickListener(this)
+		// viewBinding.buttonDownload?.setOnClickListener(this)
 		viewBinding.infoLayout.chipBranch.setOnClickListener(this)
 		viewBinding.infoLayout.chipSize.setOnClickListener(this)
 		viewBinding.infoLayout.chipSource.setOnClickListener(this)
@@ -153,7 +152,7 @@ class DetailsActivity :
 		viewBinding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance()
 		viewBinding.chipsTags.onChipClickListener = this
 		TitleScrollCoordinator(viewBinding.textViewTitle).attach(viewBinding.scrollView)
-		viewBinding.containerBottomSheet?.let { BottomSheetBehavior.from(it) }?.let { behavior ->
+		viewBinding.layoutBottomSheet?.let { BottomSheetBehavior.from(it) }?.let { behavior ->
 			onBackPressedDispatcher.addCallback(BottomSheetCollapseCallback(behavior))
 		}
 
@@ -202,7 +201,7 @@ class DetailsActivity :
 		when (v.id) {
 			R.id.button_read -> openReader(isIncognitoMode = false)
 			R.id.chip_branch -> showBranchPopupMenu(v)
-			R.id.button_download -> DownloadDialogHelper(v, viewModel).show(menuProvider)
+			// R.id.button_download -> DownloadDialogHelper(v, viewModel).show(menuProvider)
 
 			R.id.chip_author -> {
 				val manga = viewModel.manga.value ?: return
@@ -409,18 +408,18 @@ class DetailsActivity :
 	}
 
 	private fun onLoadingStateChanged(isLoading: Boolean) {
-		val button = viewBinding.buttonDownload ?: return
-		if (isLoading) {
-			button.setImageDrawable(
-				CircularProgressDrawable(this).also {
-					it.setStyle(CircularProgressDrawable.LARGE)
-					it.setColorSchemeColors(getThemeColor(materialR.attr.colorControlNormal))
-					it.start()
-				},
-			)
-		} else {
-			button.setImageResource(R.drawable.ic_download)
-		}
+		// val button = null ?: return
+		// if (isLoading) {
+		// 	button.setImageDrawable(
+		// 		CircularProgressDrawable(this).also {
+		// 			it.setStyle(CircularProgressDrawable.LARGE)
+		// 			it.setColorSchemeColors(getThemeColor(materialR.attr.colorControlNormal))
+		// 			it.start()
+		// 		},
+		// 	)
+		// } else {
+		// 	button.setImageResource(R.drawable.ic_download)
+		// }
 	}
 
 	private fun onScrobblingInfoChanged(scrobblings: List<ScrobblingInfo>) {
@@ -536,7 +535,7 @@ class DetailsActivity :
 		val isFirstCall = buttonRead.tag == null
 		buttonRead.tag = Unit
 		buttonRead.setProgress(info.history?.percent?.coerceIn(0f, 1f) ?: 0f, !isFirstCall)
-		buttonDownload?.isEnabled = info.isValid && info.canDownload
+		// buttonDownload?.isEnabled = info.isValid && info.canDownload
 		buttonRead.isEnabled = info.isValid
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/pager/ChaptersPagesSheet.kt

@@ -49,6 +49,7 @@ class ChaptersPagesSheet : BaseAdaptiveSheet<SheetChaptersPagesBinding>(), Actio
 	override fun onViewBindingCreated(binding: SheetChaptersPagesBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
 		disableFitToContents()
+		binding.headerBar.isVisible = dialog != null
 
 		val args = arguments ?: Bundle.EMPTY
 		var defaultTab = args.getInt(ARG_TAB, settings.defaultDetailsTab)

app/src/main/res/layout/activity_details.xml

@@ -177,44 +177,6 @@
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toBottomOf="@id/barrier_header" />
 
-			<org.koitharu.kotatsu.core.ui.widgets.ProgressButton
-				android:id="@+id/button_read"
-				android:layout_width="0dp"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="16dp"
-				android:layout_marginTop="@dimen/margin_normal"
-				android:layout_marginEnd="12dp"
-				android:foreground="?selectableItemBackground"
-				android:gravity="center"
-				android:paddingHorizontal="6dp"
-				android:paddingVertical="8dp"
-				app:baseColor="?colorSecondaryContainer"
-				app:layout_constraintEnd_toStartOf="@id/button_download"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/info_layout"
-				app:progressColor="?colorPrimary"
-				app:subtitleTextAppearance="?textAppearanceBodySmall"
-				app:titleTextAppearance="?textAppearanceButton"
-				tools:max="100"
-				tools:progress="40"
-				tools:subtitle="12 chapters"
-				tools:title="@string/read" />
-
-			<ImageView
-				android:id="@+id/button_download"
-				android:layout_width="0dp"
-				android:layout_height="0dp"
-				android:layout_marginEnd="16dp"
-				android:background="@drawable/bg_circle_button"
-				android:backgroundTint="?colorSecondaryContainer"
-				android:contentDescription="@string/download"
-				android:scaleType="centerInside"
-				app:layout_constraintBottom_toBottomOf="@id/button_read"
-				app:layout_constraintDimensionRatio="1"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintTop_toTopOf="@id/button_read"
-				app:srcCompat="@drawable/ic_download" />
-
 			<TextView
 				android:id="@+id/textView_description_title"
 				android:layout_width="0dp"
@@ -229,7 +191,7 @@
 				android:textAppearance="@style/TextAppearance.Kotatsu.SectionHeader"
 				app:layout_constraintEnd_toStartOf="@id/button_description_more"
 				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@id/button_read" />
+				app:layout_constraintTop_toBottomOf="@id/info_layout" />
 
 			<Button
 				android:id="@+id/button_description_more"
@@ -396,19 +358,78 @@
 
 	</androidx.core.widget.NestedScrollView>
 
-	<androidx.fragment.app.FragmentContainerView
-		android:id="@+id/container_bottom_sheet"
-		android:name="org.koitharu.kotatsu.details.ui.pager.ChaptersPagesSheet"
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:id="@+id/layout_bottom_sheet"
 		style="@style/Widget.Material3.BottomSheet"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:elevation="6dp"
-		android:nestedScrollingEnabled="false"
 		android:outlineProvider="background"
 		app:behavior_fitToContents="false"
 		app:behavior_hideable="false"
 		app:behavior_peekHeight="@dimen/details_bs_peek_height"
-		app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-		tools:layout="@layout/sheet_chapters_pages" />
+		app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+		<com.google.android.material.bottomsheet.BottomSheetDragHandleView
+			android:id="@+id/drag_handle_sheet"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent" />
+
+		<ImageView
+			android:id="@+id/button_download"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_marginStart="16dp"
+			android:background="@drawable/bg_circle_button"
+			android:backgroundTint="?colorSecondaryContainer"
+			android:contentDescription="@string/download"
+			android:scaleType="centerInside"
+			app:layout_constraintBottom_toBottomOf="@id/button_read"
+			app:layout_constraintDimensionRatio="1"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="@id/button_read"
+			app:srcCompat="@drawable/ic_download" />
+
+		<org.koitharu.kotatsu.core.ui.widgets.ProgressButton
+			android:id="@+id/button_read"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginHorizontal="12dp"
+			android:layout_marginTop="@dimen/margin_normal"
+			android:foreground="?selectableItemBackground"
+			android:gravity="center"
+			android:minWidth="240dp"
+			android:paddingHorizontal="6dp"
+			android:paddingVertical="8dp"
+			app:baseColor="?colorSecondaryContainer"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@id/button_download"
+			app:layout_constraintTop_toBottomOf="@id/drag_handle_sheet"
+			app:progressColor="?colorPrimary"
+			app:subtitleTextAppearance="?textAppearanceBodySmall"
+			app:titleTextAppearance="?textAppearanceButton"
+			tools:max="100"
+			tools:progress="40"
+			tools:subtitle="12 chapters"
+			tools:title="@string/read" />
+
+		<androidx.fragment.app.FragmentContainerView
+			android:id="@+id/container_bottom_sheet"
+			android:name="org.koitharu.kotatsu.details.ui.pager.ChaptersPagesSheet"
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_below="@id/drag_handle_sheet"
+			android:elevation="6dp"
+			android:visibility="gone"
+			android:nestedScrollingEnabled="false"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/drag_handle_sheet"
+			tools:layout="@layout/sheet_chapters_pages" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/values/dimens.xml

@@ -35,7 +35,7 @@
 	<dimen name="chapter_grid_width">80dp</dimen>
 	<dimen name="side_card_offset">8dp</dimen>
 	<dimen name="webtoon_pages_gap">24dp</dimen>
-	<dimen name="details_bs_peek_height">92dp</dimen>
+	<dimen name="details_bs_peek_height">142dp</dimen>
 
 	<dimen name="search_suggestions_manga_height">142dp</dimen>
 	<dimen name="search_suggestions_manga_spacing">6dp</dimen>