diff --git a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt index 64cf3249b..c3f795185 100644 --- a/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/library/LibrarySettingsDialog.kt @@ -200,40 +200,47 @@ private fun ColumnScope.SortPage( globalSortMode.type } val sortDescending = if (screenModel.grouping == LibraryGroup.BY_DEFAULT) { - category.sort.isAscending + !category.sort.isAscending } else { - globalSortMode.isAscending - }.not() + !globalSortMode.isAscending + } val hasSortTags by remember { screenModel.libraryPreferences.sortTagsForLibrary().changes() .map { it.isNotEmpty() } }.collectAsState(initial = screenModel.libraryPreferences.sortTagsForLibrary().get().isNotEmpty()) // SY <-- - val trackerSortOption = if (trackers.isEmpty()) { - emptyList() - } else { - listOf(MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean) - } - - listOfNotNull( - MR.strings.action_sort_alpha to LibrarySort.Type.Alphabetical, - MR.strings.action_sort_total to LibrarySort.Type.TotalChapters, - MR.strings.action_sort_last_read to LibrarySort.Type.LastRead, - MR.strings.action_sort_last_manga_update to LibrarySort.Type.LastUpdate, - MR.strings.action_sort_unread_count to LibrarySort.Type.UnreadCount, - MR.strings.action_sort_latest_chapter to LibrarySort.Type.LatestChapter, - MR.strings.action_sort_chapter_fetch_date to LibrarySort.Type.ChapterFetchDate, - MR.strings.action_sort_date_added to LibrarySort.Type.DateAdded, - MR.strings.action_sort_random to LibrarySort.Type.Random, + val options = remember(trackers.isEmpty()/* SY --> */, hasSortTags/* SY <-- */) { + val trackerMeanPair = if (trackers.isNotEmpty()) { + MR.strings.action_sort_tracker_score to LibrarySort.Type.TrackerMean + } else { + null + } // SY --> - if (hasSortTags) { + val tagSortPair = if (hasSortTags) { SYMR.strings.tag_sorting to LibrarySort.Type.TagList } else { null - }, + } // SY <-- - ).plus(trackerSortOption).map { (titleRes, mode) -> + listOfNotNull( + MR.strings.action_sort_alpha to LibrarySort.Type.Alphabetical, + MR.strings.action_sort_total to LibrarySort.Type.TotalChapters, + MR.strings.action_sort_last_read to LibrarySort.Type.LastRead, + MR.strings.action_sort_last_manga_update to LibrarySort.Type.LastUpdate, + MR.strings.action_sort_unread_count to LibrarySort.Type.UnreadCount, + MR.strings.action_sort_latest_chapter to LibrarySort.Type.LatestChapter, + MR.strings.action_sort_chapter_fetch_date to LibrarySort.Type.ChapterFetchDate, + MR.strings.action_sort_date_added to LibrarySort.Type.DateAdded, + trackerMeanPair, + // SY --> + tagSortPair, + // SY <-- + MR.strings.action_sort_random to LibrarySort.Type.Random, + ) + } + + options.map { (titleRes, mode) -> if (mode == LibrarySort.Type.Random) { BaseSortItem( label = stringResource(titleRes), diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 21102b595..2581a3765 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -91,6 +91,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.system.hasDisplayCutout import eu.kanade.tachiyomi.util.system.isNightMode +import eu.kanade.tachiyomi.util.system.openInBrowser import eu.kanade.tachiyomi.util.system.toShareIntent import eu.kanade.tachiyomi.util.system.toast import eu.kanade.tachiyomi.util.view.setComposeContent