From a87d3a23d40579b0444a6d242852d2dfcf3853a3 Mon Sep 17 00:00:00 2001
From: semenvav <semenvavev@gmail.com>
Date: Thu, 2 Nov 2023 00:35:50 +0200
Subject: [PATCH] move to SettingsDataScreen

---
 .../main/java/eu/kanade/presentation/more/MoreScreen.kt  | 9 ---------
 .../more/settings/screen/SettingsDataScreen.kt           | 8 ++++++++
 app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt | 2 --
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
index 4152850fed..6f7e9e3d70 100644
--- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.CloudOff
-import androidx.compose.material.icons.outlined.FileDownloadDone
 import androidx.compose.material.icons.outlined.GetApp
 import androidx.compose.material.icons.outlined.HelpOutline
 import androidx.compose.material.icons.outlined.Info
@@ -49,7 +48,6 @@ fun MoreScreen(
     onClickDataAndStorage: () -> Unit,
     onClickSettings: () -> Unit,
     onClickAbout: () -> Unit,
-    onClickDownloadState: () -> Unit,
 ) {
     val uriHandler = LocalUriHandler.current
 
@@ -141,13 +139,6 @@ fun MoreScreen(
                     onPreferenceClick = onClickStats,
                 )
             }
-            item {
-                TextPreferenceWidget(
-                    title = stringResource(R.string.label_download_stats),
-                    icon = Icons.Outlined.FileDownloadDone,
-                    onPreferenceClick = onClickDownloadState,
-                )
-            }
             item {
                 TextPreferenceWidget(
                     title = stringResource(R.string.label_data_storage),
diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
index c62c6c12a3..0dc8843e92 100644
--- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsDataScreen.kt
@@ -34,6 +34,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import cafe.adriel.voyager.navigator.LocalNavigator
+import cafe.adriel.voyager.navigator.currentOrThrow
+import eu.kanade.presentation.more.download.DownloadStatsScreen
 import eu.kanade.presentation.more.settings.Preference
 import eu.kanade.presentation.more.settings.widget.BasePreferenceWidget
 import eu.kanade.presentation.more.settings.widget.PrefsHorizontalPadding
@@ -377,6 +380,7 @@ object SettingsDataScreen : SearchableSettings {
         val scope = rememberCoroutineScope()
         val context = LocalContext.current
         val libraryPreferences = remember { Injekt.get<LibraryPreferences>() }
+        val navigator = LocalNavigator.currentOrThrow
 
         val chapterCache = remember { Injekt.get<ChapterCache>() }
         var cacheReadableSizeSema by remember { mutableIntStateOf(0) }
@@ -409,6 +413,10 @@ object SettingsDataScreen : SearchableSettings {
                     pref = libraryPreferences.autoClearChapterCache(),
                     title = stringResource(R.string.pref_auto_clear_chapter_cache),
                 ),
+                Preference.PreferenceItem.TextPreference(
+                    title = stringResource(R.string.label_download_stats),
+                    onClick =  { navigator.push(DownloadStatsScreen()) }
+                )
             ),
         )
     }
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
index f334e94e5b..8179fe68d4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt
@@ -20,7 +20,6 @@ import cafe.adriel.voyager.navigator.tab.TabOptions
 import eu.kanade.core.preference.asState
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.presentation.more.MoreScreen
-import eu.kanade.presentation.more.download.DownloadStatsScreen
 import eu.kanade.presentation.util.Tab
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.DownloadManager
@@ -75,7 +74,6 @@ object MoreTab : Tab {
             onClickDataAndStorage = { navigator.push(SettingsScreen.toDataAndStorageScreen()) },
             onClickSettings = { navigator.push(SettingsScreen.toMainScreen()) },
             onClickAbout = { navigator.push(SettingsScreen.toAboutScreen()) },
-            onClickDownloadState = { navigator.push(DownloadStatsScreen()) },
         )
     }
 }