Group advanced settings

(cherry picked from commit a2ece821971576b56de56a3e5e6da11da6c48f4f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt

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

@@ -63,6 +63,33 @@ class SettingsAdvancedController : SettingsController() {
     override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
         titleRes = R.string.pref_category_advanced
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            preference {
+                titleRes = R.string.pref_disable_battery_optimization
+                summaryRes = R.string.pref_disable_battery_optimization_summary
+
+                onClick {
+                    val packageName: String = context.packageName
+                    if (!context.powerManager.isIgnoringBatteryOptimizations(packageName)) {
+                        try {
+                            val intent = Intent().apply {
+                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                                data = Uri.parse("package:$packageName")
+                            }
+                            startActivity(intent)
+                        } catch (e: ActivityNotFoundException) {
+                            context.toast(R.string.battery_optimization_setting_activity_not_found)
+                        }
+                    } else {
+                        context.toast(R.string.battery_optimization_disabled)
+                    }
+                }
+            }
+        }
+
+        preferenceCategory {
+            titleRes = R.string.label_data
+
             preference {
                 key = CLEAR_CACHE_KEY
                 titleRes = R.string.pref_clear_chapter_cache
@@ -88,6 +115,11 @@ class SettingsAdvancedController : SettingsController() {
                     ctrl.showDialog(router)
                 }
             }
+        }
+
+        preferenceCategory {
+            titleRes = R.string.label_library
+
             preference {
                 titleRes = R.string.pref_refresh_library_covers
 
@@ -99,29 +131,8 @@ class SettingsAdvancedController : SettingsController() {
 
                 onClick { LibraryUpdateService.start(context, target = Target.TRACKING) }
             }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        }
-            preference {
-                titleRes = R.string.pref_disable_battery_optimization
-                summaryRes = R.string.pref_disable_battery_optimization_summary
 
-                onClick {
-                    val packageName: String = context.packageName
-                    if (!context.powerManager.isIgnoringBatteryOptimizations(packageName)) {
-                        try {
-                            val intent = Intent().apply {
-                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-                                data = Uri.parse("package:$packageName")
-                            }
-                            startActivity(intent)
-                        } catch (e: ActivityNotFoundException) {
-                            context.toast(R.string.battery_optimization_setting_activity_not_found)
-                        }
-                    } else {
-                        context.toast(R.string.battery_optimization_disabled)
-                    }
-                }
-            }
-        }
         // <-- EXH
         preferenceCategory {
             title = "Developer tools"

app/src/main/res/values/strings.xml

@@ -354,6 +354,7 @@
     <string name="restoring_backup_canceled">Canceled restore</string>
 
       <!-- Advanced section -->
+    <string name="label_data">Data</string>
     <string name="pref_clear_chapter_cache">Clear chapter cache</string>
     <string name="used_cache">Used: %1$s</string>
     <string name="cache_deleted">Cache cleared. %1$d files have been deleted</string>
@@ -362,7 +363,7 @@
     <string name="cookies_cleared">Cookies cleared</string>
     <string name="choices_reset">Dialog choices reset</string>
     <string name="pref_clear_database">Clear database</string>
-    <string name="pref_clear_database_summary">Delete manga and chapters that are not in your library</string>
+    <string name="pref_clear_database_summary">Delete history for manga that are not in saved your library</string>
     <string name="clear_database_confirmation">Are you sure? Read chapters and progress of non-library manga will be lost</string>
     <string name="clear_database_completed">Entries deleted</string>
     <string name="pref_refresh_library_covers">Refresh library manga covers</string>