Always show trackers action in MangaScreen

Goes to tracker settings to log in if none are set up.

app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt

@@ -96,7 +96,7 @@ fun MangaScreen(
     onAddToLibraryClicked: () -> Unit,
     onWebViewClicked: (() -> Unit)?,
     onWebViewLongClicked: (() -> Unit)?,
-    onTrackingClicked: (() -> Unit)?,
+    onTrackingClicked: () -> Unit,
 
     // For tags menu
     onTagSearch: (String) -> Unit,
@@ -229,7 +229,7 @@ private fun MangaScreenSmallImpl(
     onAddToLibraryClicked: () -> Unit,
     onWebViewClicked: (() -> Unit)?,
     onWebViewLongClicked: (() -> Unit)?,
-    onTrackingClicked: (() -> Unit)?,
+    onTrackingClicked: () -> Unit,
 
     // For tags menu
     onTagSearch: (String) -> Unit,
@@ -481,7 +481,7 @@ fun MangaScreenLargeImpl(
     onAddToLibraryClicked: () -> Unit,
     onWebViewClicked: (() -> Unit)?,
     onWebViewLongClicked: (() -> Unit)?,
-    onTrackingClicked: (() -> Unit)?,
+    onTrackingClicked: () -> Unit,
 
     // For tags menu
     onTagSearch: (String) -> Unit,

app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt

@@ -169,7 +169,7 @@ fun MangaActionRow(
     onAddToLibraryClicked: () -> Unit,
     onWebViewClicked: (() -> Unit)?,
     onWebViewLongClicked: (() -> Unit)?,
-    onTrackingClicked: (() -> Unit)?,
+    onTrackingClicked: () -> Unit,
     onEditIntervalClicked: (() -> Unit)?,
     onEditCategory: (() -> Unit)?,
     modifier: Modifier = Modifier,
@@ -200,18 +200,16 @@ fun MangaActionRow(
                 onClick = onEditIntervalClicked,
             )
         }
-        if (onTrackingClicked != null) {
+        MangaActionButton(
-            MangaActionButton(
+            title = if (trackingCount == 0) {
-                title = if (trackingCount == 0) {
+                stringResource(MR.strings.manga_tracking_tab)
-                    stringResource(MR.strings.manga_tracking_tab)
+            } else {
-                } else {
+                pluralStringResource(MR.plurals.num_trackers, count = trackingCount, trackingCount)
-                    pluralStringResource(MR.plurals.num_trackers, count = trackingCount, trackingCount)
+            },
-                },
+            icon = if (trackingCount == 0) Icons.Outlined.Sync else Icons.Outlined.Done,
-                icon = if (trackingCount == 0) Icons.Outlined.Sync else Icons.Outlined.Done,
+            color = if (trackingCount == 0) defaultActionButtonColor else MaterialTheme.colorScheme.primary,
-                color = if (trackingCount == 0) defaultActionButtonColor else MaterialTheme.colorScheme.primary,
+            onClick = onTrackingClicked,
-                onClick = onTrackingClicked,
+        )
-            )
-        }
         if (onWebViewClicked != null) {
             MangaActionButton(
                 title = stringResource(MR.strings.action_web_view),

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt

@@ -47,6 +47,7 @@ import eu.kanade.tachiyomi.ui.category.CategoryScreen
 import eu.kanade.tachiyomi.ui.home.HomeScreen
 import eu.kanade.tachiyomi.ui.manga.track.TrackInfoDialogHomeScreen
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import eu.kanade.tachiyomi.ui.setting.SettingsScreen
 import eu.kanade.tachiyomi.ui.webview.WebViewScreen
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import eu.kanade.tachiyomi.util.system.toShareIntent
@@ -130,7 +131,13 @@ class MangaScreen(
                     screenModel.source,
                 )
             }.takeIf { isHttpSource },
-            onTrackingClicked = screenModel::showTrackDialog.takeIf { successState.trackingAvailable },
+            onTrackingClicked = {
+                if (successState.trackingCount == 0) {
+                    navigator.push(SettingsScreen(SettingsScreen.Destination.Tracking))
+                } else {
+                    screenModel.showTrackDialog()
+                }
+            },
             onTagSearch = { scope.launch { performGenreSearch(navigator, it, screenModel.source!!) } },
             onFilterButtonClicked = screenModel::showSettingsDialog,
             onRefresh = screenModel::fetchAllFromSource,

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt

@@ -1090,9 +1090,6 @@ class MangaScreenModel(
             val filterActive: Boolean
                 get() = scanlatorFilterActive || manga.chaptersFiltered()
 
-            val trackingAvailable: Boolean
-                get() = trackItems.isNotEmpty()
-
             val trackingCount: Int
                 get() = trackItems.count { it.track != null }
 

app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt

@@ -53,7 +53,7 @@ object MoreTab : Tab {
         }
 
     override suspend fun onReselect(navigator: Navigator) {
-        navigator.push(SettingsScreen.toMainScreen())
+        navigator.push(SettingsScreen())
     }
 
     @Composable
@@ -72,9 +72,9 @@ object MoreTab : Tab {
             onClickDownloadQueue = { navigator.push(DownloadQueueScreen) },
             onClickCategories = { navigator.push(CategoryScreen()) },
             onClickStats = { navigator.push(StatsScreen()) },
-            onClickDataAndStorage = { navigator.push(SettingsScreen.toDataAndStorageScreen()) },
+            onClickDataAndStorage = { navigator.push(SettingsScreen(SettingsScreen.Destination.DataAndStorage)) },
-            onClickSettings = { navigator.push(SettingsScreen.toMainScreen()) },
+            onClickSettings = { navigator.push(SettingsScreen()) },
-            onClickAbout = { navigator.push(SettingsScreen.toAboutScreen()) },
+            onClickAbout = { navigator.push(SettingsScreen(SettingsScreen.Destination.About)) },
         )
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/more/OnboardingScreen.kt

@@ -34,7 +34,7 @@ class OnboardingScreen : Screen() {
             onComplete = { finishOnboarding() },
             onRestoreBackup = {
                 finishOnboarding()
-                navigator.push(SettingsScreen.toDataAndStorageScreen())
+                navigator.push(SettingsScreen(SettingsScreen.Destination.DataAndStorage))
             },
         )
     }

app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsScreen.kt

@@ -15,6 +15,7 @@ import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.more.settings.screen.SettingsAppearanceScreen
 import eu.kanade.presentation.more.settings.screen.SettingsDataScreen
 import eu.kanade.presentation.more.settings.screen.SettingsMainScreen
+import eu.kanade.presentation.more.settings.screen.SettingsTrackingScreen
 import eu.kanade.presentation.more.settings.screen.about.AboutScreen
 import eu.kanade.presentation.util.DefaultNavigatorScreenTransition
 import eu.kanade.presentation.util.LocalBackPress
@@ -22,9 +23,8 @@ import eu.kanade.presentation.util.Screen
 import eu.kanade.presentation.util.isTabletUi
 import tachiyomi.presentation.core.components.TwoPanelBox
 
-class SettingsScreen private constructor(
+class SettingsScreen(
-    val toDataAndStorage: Boolean,
+    private val destination: Destination = Destination.Main,
-    val toAbout: Boolean,
 ) : Screen() {
 
     @Composable
@@ -32,12 +32,11 @@ class SettingsScreen private constructor(
         val parentNavigator = LocalNavigator.currentOrThrow
         if (!isTabletUi()) {
             Navigator(
-                screen = if (toDataAndStorage) {
+                screen = when (destination) {
-                    SettingsDataScreen
+                    Destination.Main -> SettingsMainScreen
-                } else if (toAbout) {
+                    Destination.About -> AboutScreen
-                    AboutScreen
+                    Destination.DataAndStorage -> SettingsDataScreen
-                } else {
+                    Destination.Tracking -> SettingsTrackingScreen
-                    SettingsMainScreen
                 },
                 content = {
                     val pop: () -> Unit = {
@@ -54,12 +53,11 @@ class SettingsScreen private constructor(
             )
         } else {
             Navigator(
-                screen = if (toDataAndStorage) {
+                screen = when (destination) {
-                    SettingsDataScreen
+                    Destination.Main -> SettingsAppearanceScreen
-                } else if (toAbout) {
+                    Destination.About -> AboutScreen
-                    AboutScreen
+                    Destination.DataAndStorage -> SettingsDataScreen
-                } else {
+                    Destination.Tracking -> SettingsTrackingScreen
-                    SettingsAppearanceScreen
                 },
             ) {
                 val insets = WindowInsets.systemBars.only(WindowInsetsSides.Horizontal)
@@ -78,11 +76,10 @@ class SettingsScreen private constructor(
         }
     }
 
-    companion object {
+    sealed interface Destination {
-        fun toMainScreen() = SettingsScreen(toDataAndStorage = false, toAbout = false)
+        data object Main : Destination
-
+        data object About : Destination
-        fun toDataAndStorageScreen() = SettingsScreen(toDataAndStorage = true, toAbout = false)
+        data object DataAndStorage : Destination
-
+        data object Tracking : Destination
-        fun toAboutScreen() = SettingsScreen(toDataAndStorage = false, toAbout = true)
     }
 }