mirror of
https://git.mihon.tech/mihonapp/mihon
synced 2024-11-25 06:36:00 +03:00
Remove download all chapters menu item
Users can still select all the chapters (long press + select all) to download them.
This commit is contained in:
parent
bebd4be43d
commit
09acc53483
6 changed files with 3 additions and 15 deletions
|
@ -13,7 +13,6 @@ fun DownloadDropdownMenu(
|
|||
expanded: Boolean,
|
||||
onDismissRequest: () -> Unit,
|
||||
onDownloadClicked: (DownloadAction) -> Unit,
|
||||
includeDownloadAllOption: Boolean = true,
|
||||
) {
|
||||
DropdownMenu(
|
||||
expanded = expanded,
|
||||
|
@ -25,7 +24,6 @@ fun DownloadDropdownMenu(
|
|||
DownloadAction.NEXT_10_CHAPTERS to pluralStringResource(R.plurals.download_amount, 10, 10),
|
||||
DownloadAction.NEXT_25_CHAPTERS to pluralStringResource(R.plurals.download_amount, 25, 25),
|
||||
DownloadAction.UNREAD_CHAPTERS to stringResource(R.string.download_unread),
|
||||
(DownloadAction.ALL_CHAPTERS to stringResource(R.string.download_all)).takeIf { includeDownloadAllOption },
|
||||
).map { (downloadAction, string) ->
|
||||
DropdownMenuItem(
|
||||
text = { Text(text = string) },
|
||||
|
|
|
@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
|
|||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import eu.kanade.domain.library.service.LibraryPreferences
|
||||
import eu.kanade.presentation.components.TabbedDialog
|
||||
import eu.kanade.presentation.components.TabbedDialogPaddings
|
||||
import eu.kanade.presentation.components.TriStateItem
|
||||
|
@ -21,6 +20,7 @@ import tachiyomi.domain.library.model.LibraryDisplayMode
|
|||
import tachiyomi.domain.library.model.LibrarySort
|
||||
import tachiyomi.domain.library.model.display
|
||||
import tachiyomi.domain.library.model.sort
|
||||
import tachiyomi.domain.library.service.LibraryPreferences
|
||||
import tachiyomi.domain.manga.model.TriStateFilter
|
||||
import tachiyomi.presentation.core.components.CheckboxItem
|
||||
import tachiyomi.presentation.core.components.HeadingItem
|
||||
|
|
|
@ -6,7 +6,6 @@ enum class DownloadAction {
|
|||
NEXT_10_CHAPTERS,
|
||||
NEXT_25_CHAPTERS,
|
||||
UNREAD_CHAPTERS,
|
||||
ALL_CHAPTERS,
|
||||
}
|
||||
|
||||
enum class EditCoverAction {
|
||||
|
|
|
@ -291,7 +291,6 @@ fun LibraryBottomActionMenu(
|
|||
expanded = downloadExpanded,
|
||||
onDismissRequest = onDismissRequest,
|
||||
onDownloadClicked = onDownloadClicked,
|
||||
includeDownloadAllOption = false,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -524,13 +524,6 @@ class MangaInfoScreenModel(
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the list of filtered or all chapter items if [skipFiltered] is false.
|
||||
*/
|
||||
private fun getChapterItems(): List<ChapterItem> {
|
||||
return if (skipFiltered) filteredChapters.orEmpty().toList() else allChapters.orEmpty()
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the next unread chapter or null if everything is read.
|
||||
*/
|
||||
|
@ -540,7 +533,8 @@ class MangaInfoScreenModel(
|
|||
}
|
||||
|
||||
private fun getUnreadChapters(): List<Chapter> {
|
||||
return getChapterItems()
|
||||
val chapterItems = if (skipFiltered) filteredChapters.orEmpty().toList() else allChapters.orEmpty()
|
||||
return chapterItems
|
||||
.filter { (chapter, dlStatus) -> !chapter.read && dlStatus == Download.State.NOT_DOWNLOADED }
|
||||
.map { it.chapter }
|
||||
}
|
||||
|
@ -613,7 +607,6 @@ class MangaInfoScreenModel(
|
|||
DownloadAction.NEXT_10_CHAPTERS -> getUnreadChaptersSorted().take(10)
|
||||
DownloadAction.NEXT_25_CHAPTERS -> getUnreadChaptersSorted().take(25)
|
||||
DownloadAction.UNREAD_CHAPTERS -> getUnreadChapters()
|
||||
DownloadAction.ALL_CHAPTERS -> getChapterItems().map { it.chapter }
|
||||
}
|
||||
if (chaptersToDownload.isNotEmpty()) {
|
||||
startDownload(chaptersToDownload, false)
|
||||
|
|
|
@ -659,7 +659,6 @@
|
|||
<item quantity="one">Next chapter</item>
|
||||
<item quantity="other">Next %d chapters</item>
|
||||
</plurals>
|
||||
<string name="download_all">All</string>
|
||||
<string name="download_unread">Unread</string>
|
||||
<string name="custom_cover">Custom cover</string>
|
||||
<string name="manga_cover">Cover</string>
|
||||
|
|
Loading…
Reference in a new issue