fix merge

app/build.gradle.kts

@@ -23,7 +23,8 @@ android {
 
  defaultConfig {
  applicationId = "xyz.jmir.tachiyomi.mi"
- versionCode = 102
+
+ versionCode = 103
  versionName = "0.14.6"
 
  buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")

app/proguard-rules.pro

@@ -74,4 +74,8 @@
 ##---------------End: proguard configuration for kotlinx.serialization ----------
 
 # XmlUtil
--keep public enum nl.adaptivity.xmlutil.EventType { *; }
+-keep public enum nl.adaptivity.xmlutil.EventType { *; }
+
+# Firebase
+-keep class com.google.firebase.installations.** { *; }
+-keep interface com.google.firebase.installations.** { *; }

app/src/main/java/eu/kanade/presentation/browse/anime/BrowseAnimeSourceScreen.kt

@@ -21,11 +21,11 @@ import eu.kanade.presentation.browse.anime.components.BrowseAnimeSourceComfortab
 import eu.kanade.presentation.browse.anime.components.BrowseAnimeSourceCompactGrid
 import eu.kanade.presentation.browse.anime.components.BrowseAnimeSourceList
 import eu.kanade.presentation.components.AppBar
+import eu.kanade.presentation.util.formattedMessage
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.animesource.AnimeSource
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.entries.anime.model.Anime
-import tachiyomi.domain.items.episode.model.NoEpisodesException
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.source.anime.model.StubAnimeSource
 import tachiyomi.presentation.core.components.material.Scaffold
@@ -54,12 +54,7 @@ fun BrowseAnimeSourceContent(
  ?: animeList.loadState.append.takeIf { it is LoadState.Error }
 
  val getErrorMessage: (LoadState.Error) -> String = { state ->
- when {
- state.error is NoEpisodesException -> context.getString(R.string.no_results_found)
- state.error.message.isNullOrEmpty() -> ""
- state.error.message.orEmpty().startsWith("HTTP error") -> "${state.error.message}: ${context.getString(R.string.http_error_hint)}"
- else -> state.error.message.orEmpty()
- }
+ with(context) { state.error.formattedMessage }
  }
 
  LaunchedEffect(errorState) {

app/src/main/java/eu/kanade/presentation/browse/manga/BrowseMangaSourceScreen.kt

@@ -21,11 +21,11 @@ import eu.kanade.presentation.browse.manga.components.BrowseMangaSourceComfortab
 import eu.kanade.presentation.browse.manga.components.BrowseMangaSourceCompactGrid
 import eu.kanade.presentation.browse.manga.components.BrowseMangaSourceList
 import eu.kanade.presentation.components.AppBar
+import eu.kanade.presentation.util.formattedMessage
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.MangaSource
 import kotlinx.coroutines.flow.StateFlow
 import tachiyomi.domain.entries.manga.model.Manga
-import tachiyomi.domain.items.chapter.model.NoChaptersException
 import tachiyomi.domain.library.model.LibraryDisplayMode
 import tachiyomi.domain.source.manga.model.StubMangaSource
 import tachiyomi.presentation.core.components.material.Scaffold
@@ -54,12 +54,7 @@ fun BrowseSourceContent(
  ?: mangaList.loadState.append.takeIf { it is LoadState.Error }
 
  val getErrorMessage: (LoadState.Error) -> String = { state ->
- when {
- state.error is NoChaptersException -> context.getString(R.string.no_results_found)
- state.error.message.isNullOrEmpty() -> ""
- state.error.message.orEmpty().startsWith("HTTP error") -> "${state.error.message}: ${context.getString(R.string.http_error_hint)}"
- else -> state.error.message.orEmpty()
- }
+ with(context) { state.error.formattedMessage }
  }
 
  LaunchedEffect(errorState) {

app/src/main/java/eu/kanade/presentation/entries/anime/AnimeScreen.kt

@@ -74,6 +74,7 @@ import kotlinx.coroutines.delay
 import tachiyomi.domain.entries.anime.model.Anime
 import tachiyomi.domain.items.episode.model.Episode
 import tachiyomi.domain.items.service.missingItemsCount
+import tachiyomi.domain.library.service.LibraryPreferences
 import tachiyomi.domain.source.anime.model.StubAnimeSource
 import tachiyomi.presentation.core.components.LazyColumn
 import tachiyomi.presentation.core.components.TwoPanelBox
@@ -96,6 +97,8 @@ fun AnimeScreen(
  dateRelativeTime: Int,
  dateFormat: DateFormat,
  isTabletUi: Boolean,
+ episodeSwipeEndAction: LibraryPreferences.EpisodeSwipeAction,
+ episodeSwipeStartAction: LibraryPreferences.EpisodeSwipeAction,
  onBackClicked: () -> Unit,
  onEpisodeClicked: (episode: Episode, alt: Boolean) -> Unit,
  onDownloadEpisode: ((List<EpisodeItem>, EpisodeDownloadAction) -> Unit)?,
@@ -128,6 +131,9 @@ fun AnimeScreen(
  onMarkPreviousAsSeenClicked: (Episode) -> Unit,
  onMultiDeleteClicked: (List<Episode>) -> Unit,
 
+ // For episode swipe
+ onEpisodeSwipe: (EpisodeItem, LibraryPreferences.EpisodeSwipeAction) -> Unit,
+
  // Episode selection
  onEpisodeSelected: (EpisodeItem, Boolean, Boolean, Boolean) -> Unit,
  onAllEpisodeSelected: (Boolean) -> Unit,
@@ -146,6 +152,8 @@ fun AnimeScreen(
  snackbarHostState = snackbarHostState,
  dateRelativeTime = dateRelativeTime,
  dateFormat = dateFormat,
+ episodeSwipeEndAction = episodeSwipeEndAction,
+ episodeSwipeStartAction = episodeSwipeStartAction,
  onBackClicked = onBackClicked,
  onEpisodeClicked = onEpisodeClicked,
  onDownloadEpisode = onDownloadEpisode,
@@ -169,6 +177,7 @@ fun AnimeScreen(
  onMultiMarkAsSeenClicked = onMultiMarkAsSeenClicked,
  onMarkPreviousAsSeenClicked = onMarkPreviousAsSeenClicked,
  onMultiDeleteClicked = onMultiDeleteClicked,
+ onEpisodeSwipe = onEpisodeSwipe,
  onEpisodeSelected = onEpisodeSelected,
  onAllEpisodeSelected = onAllEpisodeSelected,
  onInvertSelection = onInvertSelection,
@@ -178,6 +187,8 @@ fun AnimeScreen(
  state = state,
  snackbarHostState = snackbarHostState,
  dateRelativeTime = dateRelativeTime,
+ episodeSwipeEndAction = episodeSwipeEndAction,
+ episodeSwipeStartAction = episodeSwipeStartAction,
  dateFormat = dateFormat,
  onBackClicked = onBackClicked,
  onEpisodeClicked = onEpisodeClicked,
@@ -202,6 +213,7 @@ fun AnimeScreen(
  onMultiMarkAsSeenClicked = onMultiMarkAsSeenClicked,
  onMarkPreviousAsSeenClicked = onMarkPreviousAsSeenClicked,
  onMultiDeleteClicked = onMultiDeleteClicked,
+ onEpisodeSwipe = onEpisodeSwipe,
  onEpisodeSelected = onEpisodeSelected,
  onAllEpisodeSelected = onAllEpisodeSelected,
  onInvertSelection = onInvertSelection,
@@ -216,6 +228,8 @@ private fun AnimeScreenSmallImpl(
  snackbarHostState: SnackbarHostState,
  dateRelativeTime: Int,
  dateFormat: DateFormat,
+ episodeSwipeEndAction: LibraryPreferences.EpisodeSwipeAction,
+ episodeSwipeStartAction: LibraryPreferences.EpisodeSwipeAction,
  onBackClicked: () -> Unit,
  onEpisodeClicked: (Episode, Boolean) -> Unit,
  onDownloadEpisode: ((List<EpisodeItem>, EpisodeDownloadAction) -> Unit)?,
@@ -249,6 +263,9 @@ private fun AnimeScreenSmallImpl(
  onMarkPreviousAsSeenClicked: (Episode) -> Unit,
  onMultiDeleteClicked: (List<Episode>) -> Unit,
 
+ // For episode swipe
+ onEpisodeSwipe: (EpisodeItem, LibraryPreferences.EpisodeSwipeAction) -> Unit,
+
  // Episode selection
  onEpisodeSelected: (EpisodeItem, Boolean, Boolean, Boolean) -> Unit,
  onAllEpisodeSelected: (Boolean) -> Unit,
@@ -452,9 +469,12 @@ private fun AnimeScreenSmallImpl(
  episodes = episodes,
  dateRelativeTime = dateRelativeTime,
  dateFormat = dateFormat,
+ episodeSwipeEndAction = episodeSwipeEndAction,
+ episodeSwipeStartAction = episodeSwipeStartAction,
  onEpisodeClicked = onEpisodeClicked,
  onDownloadEpisode = onDownloadEpisode,
  onEpisodeSelected = onEpisodeSelected,
+ onEpisodeSwipe = onEpisodeSwipe,
  )
  }
  }
@@ -469,6 +489,8 @@ fun AnimeScreenLargeImpl(
  snackbarHostState: SnackbarHostState,
  dateRelativeTime: Int,
  dateFormat: DateFormat,
+ episodeSwipeEndAction: LibraryPreferences.EpisodeSwipeAction,
+ episodeSwipeStartAction: LibraryPreferences.EpisodeSwipeAction,
  onBackClicked: () -> Unit,
  onEpisodeClicked: (Episode, Boolean) -> Unit,
  onDownloadEpisode: ((List<EpisodeItem>, EpisodeDownloadAction) -> Unit)?,
@@ -502,6 +524,9 @@ fun AnimeScreenLargeImpl(
  onMarkPreviousAsSeenClicked: (Episode) -> Unit,
  onMultiDeleteClicked: (List<Episode>) -> Unit,
 
+ // For swipe actions
+ onEpisodeSwipe: (EpisodeItem, LibraryPreferences.EpisodeSwipeAction) -> Unit,
+
  // Episode selection
  onEpisodeSelected: (EpisodeItem, Boolean, Boolean, Boolean) -> Unit,
  onAllEpisodeSelected: (Boolean) -> Unit,
@@ -696,9 +721,12 @@ fun AnimeScreenLargeImpl(
  episodes = episodes,
  dateRelativeTime = dateRelativeTime,
  dateFormat = dateFormat,
+ episodeSwipeEndAction = episodeSwipeEndAction,
+ episodeSwipeStartAction = episodeSwipeStartAction,
  onEpisodeClicked = onEpisodeClicked,
  onDownloadEpisode = onDownloadEpisode,
  onEpisodeSelected = onEpisodeSelected,
+ onEpisodeSwipe = onEpisodeSwipe,
  )
  }
  }
@@ -764,9 +792,12 @@ private fun LazyListScope.sharedEpisodeItems(
  episodes: List<EpisodeItem>,
  dateRelativeTime: Int,
  dateFormat: DateFormat,
+ episodeSwipeEndAction: LibraryPreferences.EpisodeSwipeAction,
+ episodeSwipeStartAction: LibraryPreferences.EpisodeSwipeAction,
  onEpisodeClicked: (Episode, Boolean) -> Unit,
  onDownloadEpisode: ((List<EpisodeItem>, EpisodeDownloadAction) -> Unit)?,
  onEpisodeSelected: (EpisodeItem, Boolean, Boolean, Boolean) -> Unit,
+ onEpisodeSwipe: (EpisodeItem, LibraryPreferences.EpisodeSwipeAction) -> Unit,
 ) {
  items(
  items = episodes,
@@ -810,6 +841,8 @@ private fun LazyListScope.sharedEpisodeItems(
  downloadIndicatorEnabled = episodes.fastAll { !it.selected },
  downloadStateProvider = { episodeItem.downloadState },
  downloadProgressProvider = { episodeItem.downloadProgress },
+ episodeSwipeEndAction = episodeSwipeEndAction,
+ episodeSwipeStartAction = episodeSwipeStartAction,
  onLongClick = {
  onEpisodeSelected(episodeItem, !episodeItem.selected, true, true)
  haptic.performHapticFeedback(HapticFeedbackType.LongPress)
@@ -827,6 +860,9 @@ private fun LazyListScope.sharedEpisodeItems(
  } else {
  null
  },
+ onEpisodeSwipe = {
+ onEpisodeSwipe(episodeItem, it)
+ },
  )
  }
 }