fix: Prevent crash when reopening current tab

aniyomiorg · Sep 5, 2023 · e08926b · e08926b
1 parent b06c85d
commit e08926b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 11 deletions.
diff --git a/app/src/main/java/eu/kanade/presentation/util/Navigator.kt b/app/src/main/java/eu/kanade/presentation/util/Navigator.kt
@@ -25,8 +25,10 @@ import soup.compose.material.motion.animation.rememberSlideDistance
  */
 val LocalBackPress: ProvidableCompositionLocal<(() -> Unit)?> = staticCompositionLocalOf { null }
 
-interface Tab : cafe.adriel.voyager.navigator.tab.Tab {
- suspend fun onReselect(navigator: Navigator) {}
+abstract class Tab : cafe.adriel.voyager.navigator.tab.Tab {
+
+ override val key: ScreenKey = uniqueScreenKey
+ open suspend fun onReselect(navigator: Navigator) {}
 }
 
 // TODO: this prevents crashes in nested navigators with transitions not being disposed

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseTab.kt
@@ -31,7 +31,7 @@ import eu.kanade.tachiyomi.util.storage.DiskUtil
 
 data class BrowseTab(
  private val toExtensions: Boolean = false,
-) : Tab {
+) : Tab() {
 
  override val options: TabOptions
  @Composable

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoriesTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoriesTab.kt
@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.collectLatest
 
 data class CategoriesTab(
  private val isManga: Boolean = false,
-) : Tab {
+) : Tab() {
 
  override val options: TabOptions
  @Composable

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadsTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadsTab.kt
@@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.util.storage.DiskUtil
 
 data class DownloadsTab(
  private val isManga: Boolean = false,
-) : Tab {
+) : Tab() {
 
  override val options: TabOptions
  @Composable

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoriesTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/history/HistoriesTab.kt
@@ -27,7 +27,7 @@ import eu.kanade.tachiyomi.util.storage.DiskUtil
 
 data class HistoriesTab(
  private val fromMore: Boolean,
-) : Tab {
+) : Tab() {
 
  override val options: TabOptions
  @Composable

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/anime/AnimeLibraryTab.kt
@@ -63,7 +63,7 @@ import tachiyomi.presentation.core.screens.LoadingScreen
 import tachiyomi.source.local.entries.anime.isLocal
 import uy.kohesive.injekt.injectLazy
 
-object AnimeLibraryTab : Tab {
+object AnimeLibraryTab : Tab() {
 
  val libraryPreferences: LibraryPreferences by injectLazy()
  private val fromMore = libraryPreferences.bottomNavStyle().get() == 2

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/manga/MangaLibraryTab.kt
@@ -62,7 +62,7 @@ import tachiyomi.presentation.core.screens.LoadingScreen
 import tachiyomi.source.local.entries.manga.isLocal
 import uy.kohesive.injekt.injectLazy
 
-object MangaLibraryTab : Tab {
+object MangaLibraryTab : Tab() {
 
  val libraryPreferences: LibraryPreferences by injectLazy()
  private val fromMore = libraryPreferences.bottomNavStyle().get() == 2

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt
@@ -43,7 +43,7 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 
-object MoreTab : Tab {
+object MoreTab : Tab() {
 
  override val options: TabOptions
  @Composable

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsTab.kt
@@ -18,7 +18,7 @@ import eu.kanade.tachiyomi.ui.stats.manga.mangaStatsTab
 
 data class StatsTab(
  private val isManga: Boolean = false,
-) : Tab {
+) : Tab() {
 
  override val options: TabOptions
  @Composable

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesTab.kt
@@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.ui.updates.manga.mangaUpdatesTab
 data class UpdatesTab(
  private val fromMore: Boolean,
  private val inMiddle: Boolean,
-) : Tab {
+) : Tab() {
 
  override val options: TabOptions
  @Composable