From 834e3d78abaec189e33e35a0420dcd4eba001f65 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Mon, 24 May 2021 16:55:42 -0400
Subject: [PATCH] Put shortcut to backup menu in More

(cherry picked from commit a498f940c6169a486f61be546759c59045be414e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
---
 .../tachiyomi/ui/more/MoreController.kt       |  9 +++
 .../ui/setting/SettingsBackupController.kt    | 67 +++++++++----------
 .../ui/setting/SettingsMainController.kt      |  2 +-
 app/src/main/res/values/strings.xml           |  3 +-
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
index 9ffa583f8..0f5c1a336 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt
@@ -16,6 +16,7 @@ import eu.kanade.tachiyomi.ui.category.CategoryController
 import eu.kanade.tachiyomi.ui.download.DownloadController
 import eu.kanade.tachiyomi.ui.recent.history.HistoryController
 import eu.kanade.tachiyomi.ui.recent.updates.UpdatesController
+import eu.kanade.tachiyomi.ui.setting.SettingsBackupController
 import eu.kanade.tachiyomi.ui.setting.SettingsController
 import eu.kanade.tachiyomi.ui.setting.SettingsMainController
 import eu.kanade.tachiyomi.util.preference.add
@@ -116,6 +117,14 @@ class MoreController :
                     router.pushController(CategoryController().withFadeTransaction())
                 }
             }
+            preference {
+                titleRes = R.string.label_backup
+                iconRes = R.drawable.ic_backup_24dp
+                iconTint = tintColor
+                onClick {
+                    router.pushController(SettingsBackupController().withFadeTransaction())
+                }
+            }
             // SY -->
             if (preferences.isHentaiEnabled().get()) {
                 preference {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
index 17eea1558..76f2f8e59 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt
@@ -53,46 +53,43 @@ class SettingsBackupController : SettingsController() {
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) = screen.apply {
-        titleRes = R.string.backup
+        titleRes = R.string.label_backup
 
-        preferenceCategory {
-            titleRes = R.string.backup
+        preference {
+            key = "pref_create_backup"
+            titleRes = R.string.pref_create_backup
+            summaryRes = R.string.pref_create_backup_summ
 
-            preference {
-                key = "pref_create_backup"
-                titleRes = R.string.pref_create_backup
-                summaryRes = R.string.pref_create_backup_summ
-
-                onClick {
-                    if (!BackupCreateService.isRunning(context)) {
-                        val ctrl = CreateBackupDialog()
-                        ctrl.targetController = this@SettingsBackupController
-                        ctrl.showDialog(router)
-                    } else {
-                        context.toast(R.string.backup_in_progress)
-                    }
-                }
-            }
-            preference {
-                key = "pref_restore_backup"
-                titleRes = R.string.pref_restore_backup
-                summaryRes = R.string.pref_restore_backup_summ
-
-                onClick {
-                    if (!BackupRestoreService.isRunning(context)) {
-                        val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
-                            addCategory(Intent.CATEGORY_OPENABLE)
-                            type = "*/*"
-                        }
-                        val title = resources?.getString(R.string.file_select_backup)
-                        val chooser = Intent.createChooser(intent, title)
-                        startActivityForResult(chooser, CODE_BACKUP_RESTORE)
-                    } else {
-                        context.toast(R.string.restore_in_progress)
-                    }
+            onClick {
+                if (!BackupCreateService.isRunning(context)) {
+                    val ctrl = CreateBackupDialog()
+                    ctrl.targetController = this@SettingsBackupController
+                    ctrl.showDialog(router)
+                } else {
+                    context.toast(R.string.backup_in_progress)
                 }
             }
         }
+        preference {
+            key = "pref_restore_backup"
+            titleRes = R.string.pref_restore_backup
+            summaryRes = R.string.pref_restore_backup_summ
+
+            onClick {
+                if (!BackupRestoreService.isRunning(context)) {
+                    val intent = Intent(Intent.ACTION_GET_CONTENT).apply {
+                        addCategory(Intent.CATEGORY_OPENABLE)
+                        type = "*/*"
+                    }
+                    val title = resources?.getString(R.string.file_select_backup)
+                    val chooser = Intent.createChooser(intent, title)
+                    startActivityForResult(chooser, CODE_BACKUP_RESTORE)
+                } else {
+                    context.toast(R.string.restore_in_progress)
+                }
+            }
+        }
+
         preferenceCategory {
             titleRes = R.string.pref_backup_service_category
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
index 365d48189..3fa3f93fd 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
@@ -62,7 +62,7 @@ class SettingsMainController : SettingsController() {
         preference {
             iconRes = R.drawable.ic_backup_24dp
             iconTint = tintColor
-            titleRes = R.string.backup
+            titleRes = R.string.label_backup
             onClick { navigateTo(SettingsBackupController()) }
         }
         preference {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51a3844d7..b10c6169e 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="label_recent_updates">Updates</string>
     <string name="label_recent_manga">History</string>
     <string name="label_sources">Sources</string>
-    <string name="label_backup">Backup</string>
+    <string name="label_backup">Backup and restore</string>
     <string name="label_migration">Migrate</string>
     <string name="label_extensions">Extensions</string>
     <string name="label_extension_info">Extension info</string>
@@ -389,7 +389,6 @@
     <string name="pref_search_pinned_sources_only">Only include pinned sources</string>
 
       <!-- Backup section -->
-    <string name="backup">Backup</string>
     <string name="pref_create_backup">Create backup</string>
     <string name="pref_create_backup_summ">Can be used to restore current library</string>
     <string name="pref_restore_backup">Restore backup</string>