Download options dialog

app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt

@@ -8,10 +8,14 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.util.mapToSet
 
+@JvmName("mangaIds")
 fun Collection<Manga>.ids() = mapToSet { it.id }
 
 fun Collection<Manga>.distinctById() = distinctBy { it.id }
 
+@JvmName("chaptersIds")
+fun Collection<MangaChapter>.ids() = mapToSet { it.id }
+
 fun Collection<ChapterListItem>.countChaptersByBranch(): Int {
 	if (size <= 1) {
 		return size

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/widgets/TwoLinesItemView.kt

@@ -24,6 +24,7 @@ import com.google.android.material.shape.MaterialShapeDrawable
 import com.google.android.material.shape.ShapeAppearanceModel
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.util.ext.resolveDp
+import org.koitharu.kotatsu.core.util.ext.textAndVisible
 import org.koitharu.kotatsu.databinding.ViewTwoLinesItemBinding
 
 @SuppressLint("RestrictedApi")
@@ -35,6 +36,18 @@ class TwoLinesItemView @JvmOverloads constructor(
 
 	private val binding = ViewTwoLinesItemBinding.inflate(LayoutInflater.from(context), this)
 
+	var title: CharSequence?
+		get() = binding.title.text
+		set(value) {
+			binding.title.text = value
+		}
+
+	var subtitle: CharSequence?
+		get() = binding.subtitle.textAndVisible
+		set(value) {
+			binding.subtitle.textAndVisible = value
+		}
+
 	init {
 		var textColors: ColorStateList? = null
 		context.withStyledAttributes(
@@ -76,8 +89,7 @@ class TwoLinesItemView @JvmOverloads constructor(
 	}
 
 	fun setIconResource(@DrawableRes resId: Int) {
-		val icon = if (resId != 0) ContextCompat.getDrawable(context, resId) else null
-		binding.icon.setImageDrawable(icon)
+		binding.icon.setImageResource(resId)
 	}
 
 	private fun createShapeDrawable(ta: TypedArray): InsetDrawable {

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

@@ -30,6 +30,7 @@ class ChaptersBottomSheetMediator(
 	}
 
 	override fun onActionModeStarted(mode: ActionMode) {
+		behavior.state = BottomSheetBehavior.STATE_EXPANDED
 		lock()
 	}
 

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

@@ -18,6 +18,7 @@ import org.koitharu.kotatsu.core.ui.list.ListSelectionController
 import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback
 import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.observeEvent
 import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
 import org.koitharu.kotatsu.databinding.FragmentChaptersBinding
 import org.koitharu.kotatsu.details.ui.adapter.ChaptersAdapter
@@ -66,6 +67,9 @@ class ChaptersFragment :
 		viewModel.isChaptersEmpty.observe(viewLifecycleOwner) {
 			binding.textViewHolder.isVisible = it
 		}
+		viewModel.onSelectChapter.observeEvent(viewLifecycleOwner) {
+			selectionController?.onItemLongClick(it)
+		}
 	}
 
 	override fun onDestroyView() {

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

@@ -16,12 +16,11 @@ import kotlinx.coroutines.launch
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.browser.BrowserActivity
 import org.koitharu.kotatsu.core.os.AppShortcutManager
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.core.util.ShareHelper
-import org.koitharu.kotatsu.details.ui.model.MangaBranch
+import org.koitharu.kotatsu.download.ui.dialog.DownloadOption
 import org.koitharu.kotatsu.favourites.ui.categories.select.FavouriteCategoriesSheet
-import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.util.mapNotNullToSet
 import org.koitharu.kotatsu.scrobbling.common.ui.selector.ScrobblingSelectorSheet
 import org.koitharu.kotatsu.search.ui.multi.MultiSearchActivity
 
@@ -30,7 +29,7 @@ class DetailsMenuProvider(
 	private val viewModel: DetailsViewModel,
 	private val snackbarHost: View,
 	private val appShortcutManager: AppShortcutManager,
-) : MenuProvider {
+) : MenuProvider, OnListItemClickListener<DownloadOption> {
 
 	override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
 		menuInflater.inflate(R.menu.opt_details, menu)
@@ -44,7 +43,7 @@ class DetailsMenuProvider(
 		menu.findItem(R.id.action_shortcut).isVisible = ShortcutManagerCompat.isRequestPinShortcutSupported(activity)
 		menu.findItem(R.id.action_scrobbling).isVisible = viewModel.isScrobblingAvailable
 		menu.findItem(R.id.action_favourite).setIcon(
-			if (viewModel.favouriteCategories.value == true) R.drawable.ic_heart else R.drawable.ic_heart_outline,
+			if (viewModel.favouriteCategories.value) R.drawable.ic_heart else R.drawable.ic_heart_outline,
 		)
 	}
 
@@ -80,15 +79,7 @@ class DetailsMenuProvider(
 			}
 
 			R.id.action_save -> {
-				viewModel.manga.value?.let {
-					val chaptersCount = it.chapters?.size ?: 0
-					val branches = viewModel.branches.value.orEmpty()
-					if (chaptersCount > 5 || branches.size > 1) {
-						showSaveConfirmation(it, chaptersCount, branches)
-					} else {
-						viewModel.download(null)
-					}
-				}
+				DownloadDialogHelper(snackbarHost, viewModel).show(this)
 			}
 
 			R.id.action_browser -> {
@@ -125,35 +116,16 @@ class DetailsMenuProvider(
 		return true
 	}
 
-	private fun showSaveConfirmation(manga: Manga, chaptersCount: Int, branches: List<MangaBranch>) {
-		val dialogBuilder = MaterialAlertDialogBuilder(activity)
-			.setTitle(R.string.save_manga)
-			.setNegativeButton(android.R.string.cancel, null)
-		if (branches.size > 1) {
-			val items = Array(branches.size) { i -> branches[i].name.orEmpty() }
-			val currentBranch = branches.indexOfFirst { it.isSelected }
-			val checkedIndices = BooleanArray(branches.size) { i -> i == currentBranch }
-			dialogBuilder.setMultiChoiceItems(items, checkedIndices) { _, i, checked ->
-				checkedIndices[i] = checked
-			}.setPositiveButton(R.string.save) { _, _ ->
-				val selectedBranches = branches.mapIndexedNotNullTo(HashSet()) { i, b ->
-					if (checkedIndices[i]) b.name else null
-				}
-				val chaptersIds = manga.chapters?.mapNotNullToSet { c ->
-					if (c.branch in selectedBranches) c.id else null
-				}
-				viewModel.download(chaptersIds)
-			}
-		} else {
-			dialogBuilder.setMessage(
-				activity.getString(
-					R.string.large_manga_save_confirm,
-					activity.resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount),
-				),
-			).setPositiveButton(R.string.save) { _, _ ->
-				viewModel.download(null)
+	override fun onItemClick(item: DownloadOption, view: View) {
+		val chaptersIds: Set<Long>? = when (item) {
+			is DownloadOption.WholeManga -> null
+			is DownloadOption.SelectionHint -> {
+				viewModel.startChaptersSelection()
+				return
 			}
+
+			else -> item.chaptersIds
 		}
-		dialogBuilder.show()
+		viewModel.download(chaptersIds)
 	}
 }

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

@@ -84,6 +84,7 @@ class DetailsViewModel @Inject constructor(
 
 	val onShowToast = MutableEventFlow<Int>()
 	val onShowTip = MutableEventFlow<Unit>()
+	val onSelectChapter = MutableEventFlow<Long>()
 	val onDownloadStarted = MutableEventFlow<Unit>()
 
 	val manga = doubleManga.map { it?.any }
@@ -290,6 +291,14 @@ class DetailsViewModel @Inject constructor(
 		}
 	}
 
+	fun startChaptersSelection() {
+		val chapters = chapters.value
+		val chapter = chapters.find {
+			it.isUnread && !it.isDownloaded
+		} ?: chapters.firstOrNull() ?: return
+		onSelectChapter.call(chapter.chapter.id)
+	}
+
 	fun onButtonTipClosed() {
 		settings.closeTip(DetailsActivity.TIP_BUTTON)
 	}

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

@@ -0,0 +1,64 @@
+package org.koitharu.kotatsu.details.ui
+
+import android.content.DialogInterface
+import android.view.View
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.ids
+import org.koitharu.kotatsu.core.ui.dialog.RecyclerViewAlertDialog
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.download.ui.dialog.DownloadOption
+import org.koitharu.kotatsu.download.ui.dialog.downloadOptionAD
+
+class DownloadDialogHelper(
+	private val host: View,
+	private val viewModel: DetailsViewModel,
+) {
+
+	fun show(callback: OnListItemClickListener<DownloadOption>) {
+		val branch = viewModel.selectedBranchValue
+		val allChapters = viewModel.manga.value?.chapters ?: return
+		val branchChapters = viewModel.manga.value?.getChapters(branch).orEmpty()
+		val history = viewModel.history.value
+
+		val options = buildList {
+			add(DownloadOption.WholeManga(allChapters.ids()))
+			if (branch != null && branchChapters.isNotEmpty()) {
+				add(DownloadOption.AllChapters(branch, branchChapters.ids()))
+			}
+
+			if (history != null) {
+				val unreadChapters = branchChapters.takeLastWhile { it.id != history.chapterId }
+				if (unreadChapters.isNotEmpty() && unreadChapters.size < branchChapters.size) {
+					add(DownloadOption.AllUnreadChapters(unreadChapters.ids(), branch))
+					if (unreadChapters.size > 5) {
+						add(DownloadOption.NextUnreadChapters(unreadChapters.take(5).ids()))
+						if (unreadChapters.size > 10) {
+							add(DownloadOption.NextUnreadChapters(unreadChapters.take(10).ids()))
+						}
+					}
+				}
+			} else {
+				if (branchChapters.size > 5) {
+					add(DownloadOption.FirstChapters(branchChapters.take(5).ids()))
+					if (branchChapters.size > 10) {
+						add(DownloadOption.FirstChapters(branchChapters.take(10).ids()))
+					}
+				}
+			}
+			add(DownloadOption.SelectionHint())
+		}
+		var dialog: DialogInterface? = null
+		val listener = OnListItemClickListener<DownloadOption> { item, _ ->
+			callback.onItemClick(item, host)
+			dialog?.dismiss()
+		}
+		dialog = RecyclerViewAlertDialog.Builder<DownloadOption>(host.context)
+			.addAdapterDelegate(downloadOptionAD(listener))
+			.setCancelable(true)
+			.setTitle(R.string.download)
+			.setNegativeButton(android.R.string.cancel)
+			.setItems(options)
+			.create()
+			.also { it.show() }
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/dialog/DownloadOption.kt

@@ -0,0 +1,99 @@
+package org.koitharu.kotatsu.download.ui.dialog
+
+import android.content.res.Resources
+import androidx.annotation.DrawableRes
+import org.koitharu.kotatsu.R
+import java.util.Locale
+import com.google.android.material.R as materialR
+
+sealed interface DownloadOption {
+
+	val chaptersIds: Set<Long>
+
+	@get:DrawableRes
+	val iconResId: Int
+
+	val chaptersCount: Int
+		get() = chaptersIds.size
+
+	fun getLabel(resources: Resources): CharSequence
+
+	class AllChapters(
+		val branch: String,
+		override val chaptersIds: Set<Long>,
+	) : DownloadOption {
+
+		override val iconResId = R.drawable.ic_select_group
+
+		override fun getLabel(resources: Resources): CharSequence {
+			return resources.getString(R.string.download_option_all_chapters, branch)
+		}
+	}
+
+	class WholeManga(
+		override val chaptersIds: Set<Long>,
+	) : DownloadOption {
+
+		override val iconResId = materialR.drawable.abc_ic_menu_selectall_mtrl_alpha
+
+		override fun getLabel(resources: Resources): CharSequence {
+			return resources.getString(R.string.download_option_whole_manga)
+		}
+	}
+
+	class FirstChapters(
+		override val chaptersIds: Set<Long>,
+	) : DownloadOption {
+
+		override val iconResId = R.drawable.ic_list_start
+
+		override fun getLabel(resources: Resources): CharSequence {
+			return resources.getString(
+				R.string.download_option_first_n_chapters,
+				resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount)
+					.lowercase(Locale.getDefault()),
+			)
+		}
+	}
+
+	class AllUnreadChapters(
+		override val chaptersIds: Set<Long>,
+		val branch: String?,
+	) : DownloadOption {
+
+		override val iconResId = R.drawable.ic_list_end
+
+		override fun getLabel(resources: Resources): CharSequence {
+			return if (branch == null) {
+				resources.getString(R.string.download_option_all_unread)
+			} else {
+				resources.getString(R.string.download_option_all_unread_b, branch)
+			}
+		}
+	}
+
+	class NextUnreadChapters(
+		override val chaptersIds: Set<Long>,
+	) : DownloadOption {
+
+		override val iconResId = R.drawable.ic_list_next
+
+		override fun getLabel(resources: Resources): CharSequence {
+			return resources.getString(
+				R.string.download_option_next_unread_n_chapters,
+				resources.getQuantityString(R.plurals.chapters, chaptersCount, chaptersCount)
+					.lowercase(Locale.getDefault()),
+			)
+		}
+	}
+
+	class SelectionHint : DownloadOption {
+
+		override val chaptersIds: Set<Long> = emptySet()
+		override val iconResId = R.drawable.ic_tap
+
+		override fun getLabel(resources: Resources): CharSequence {
+			return resources.getString(R.string.download_option_manual_selection)
+		}
+	}
+}

app/src/main/kotlin/org/koitharu/kotatsu/download/ui/dialog/DownloadOptionAD.kt

@@ -0,0 +1,27 @@
+package org.koitharu.kotatsu.download.ui.dialog
+
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
+import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
+import org.koitharu.kotatsu.databinding.ItemDownloadOptionBinding
+
+fun downloadOptionAD(
+	onClickListener: OnListItemClickListener<DownloadOption>,
+) = adapterDelegateViewBinding<DownloadOption, DownloadOption, ItemDownloadOptionBinding>(
+	{ layoutInflater, parent -> ItemDownloadOptionBinding.inflate(layoutInflater, parent, false) },
+) {
+
+	binding.root.setOnClickListener { v -> onClickListener.onItemClick(item, v) }
+
+	bind {
+		with(binding.root) {
+			title = item.getLabel(resources)
+			subtitle = if (item.chaptersCount == 0) null else resources.getQuantityString(
+				R.plurals.chapters,
+				item.chaptersCount,
+				item.chaptersCount,
+			)
+			setIconResource(item.iconResId)
+		}
+	}
+}

app/src/main/res/drawable/ic_list_end.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000000"
+		android:pathData="M17,12A5,5 0 0,1 12,17A5,5 0 0,1 7,12C7,9.58 8.72,7.56 11,7.1V3H13V7.1C15.28,7.56 17,9.58 17,12M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9Z" />
+</vector>

app/src/main/res/drawable/ic_list_next.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000000"
+		android:pathData="M7,12A5,5 0 0,1 12,7A5,5 0 0,1 17,12C17,14.42 15.28,16.44 13,16.9V21H11V16.9C8.72,16.44 7,14.42 7,12M12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15M13,3V5H11V3H13Z" />
+</vector>

app/src/main/res/drawable/ic_list_start.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#000000"
+		android:pathData="M12,7A5,5 0 0,1 17,12C17,14.42 15.28,16.44 13,16.9V21H11V16.9C8.72,16.44 7,14.42 7,12A5,5 0 0,1 12,7M12,9A3,3 0 0,0 9,12A3,3 0 0,0 12,15A3,3 0 0,0 15,12A3,3 0 0,0 12,9Z" />
+</vector>

app/src/main/res/drawable/ic_select_group.xml

@@ -0,0 +1,11 @@
+<vector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="24dp"
+	android:height="24dp"
+	android:tint="?attr/colorControlNormal"
+	android:viewportWidth="24"
+	android:viewportHeight="24">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M5 3A2 2 0 0 0 3 5H5M7 3V5H9V3M11 3V5H13V3M15 3V5H17V3M19 3V5H21A2 2 0 0 0 19 3M3 7V9H5V7M7 7V11H11V7M13 7V11H17V7M19 7V9H21V7M3 11V13H5V11M19 11V13H21V11M7 13V17H11V13M13 13V17H17V13M3 15V17H5V15M19 15V17H21V15M3 19A2 2 0 0 0 5 21V19M7 19V21H9V19M11 19V21H13V19M15 19V21H17V19M19 19V21A2 2 0 0 0 21 19Z" />
+</vector>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<org.koitharu.kotatsu.core.ui.widgets.TwoLinesItemView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/button_file"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:drawablePadding="?android:listPreferredItemPaddingStart"
+	android:minHeight="?android:listPreferredItemHeightSmall"
+	android:paddingStart="?android:listPreferredItemPaddingStart"
+	android:paddingEnd="?android:listPreferredItemPaddingEnd"
+	tools:subtitle="@string/chapters"
+	tools:title="@string/download_option_whole_manga" />
+

app/src/main/res/menu/opt_details.xml

@@ -20,7 +20,7 @@
 	<item
 		android:id="@+id/action_save"
 		android:orderInCategory="40"
-		android:title="@string/save"
+		android:title="@string/download"
 		android:visible="false"
 		app:showAsAction="never" />
 

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

@@ -438,4 +438,11 @@
 	<string name="pages_animation_summary">Animate page switching</string>
 	<string name="details_button_tip">Press and hold the Read button to see more options</string>
 	<string name="clear_source_cookies_summary">Clear cookies for specified domain only. In most cases will invalidate authorization</string>
+	<string name="download_option_all_chapters">All chapters with translation %s</string>
+	<string name="download_option_whole_manga">The whole manga</string>
+	<string name="download_option_first_n_chapters">First %s</string>
+	<string name="download_option_next_unread_n_chapters">Next unread %s</string>
+	<string name="download_option_all_unread">All unread chapters</string>
+	<string name="download_option_all_unread_b">All unread chapters (%s)</string>
+	<string name="download_option_manual_selection">Select chapters manually</string>
 </resources>