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,42 +63,6 @@ class SettingsAdvancedController : SettingsController() {
     override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
         titleRes = R.string.pref_category_advanced
 
-        preference {
-            key = CLEAR_CACHE_KEY
-            titleRes = R.string.pref_clear_chapter_cache
-            summary = context.getString(R.string.used_cache, chapterCache.readableSize)
-
-            onClick { clearChapterCache() }
-        }
-        preference {
-            titleRes = R.string.pref_clear_cookies
-
-            onClick {
-                network.cookieManager.removeAll()
-                activity?.toast(R.string.cookies_cleared)
-            }
-        }
-        preference {
-            titleRes = R.string.pref_clear_database
-            summaryRes = R.string.pref_clear_database_summary
-
-            onClick {
-                val ctrl = ClearDatabaseDialogController()
-                ctrl.targetController = this@SettingsAdvancedController
-                ctrl.showDialog(router)
-            }
-        }
-        preference {
-            titleRes = R.string.pref_refresh_library_covers
-
-            onClick { LibraryUpdateService.start(context, target = Target.COVERS) }
-        }
-        preference {
-            titleRes = R.string.pref_refresh_library_tracking
-            summaryRes = R.string.pref_refresh_library_tracking_summary
-
-            onClick { LibraryUpdateService.start(context, target = Target.TRACKING) }
-        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             preference {
                 titleRes = R.string.pref_disable_battery_optimization
@@ -122,6 +86,53 @@ class SettingsAdvancedController : SettingsController() {
                 }
             }
         }
+
+        preferenceCategory {
+            titleRes = R.string.label_data
+
+            preference {
+                key = CLEAR_CACHE_KEY
+                titleRes = R.string.pref_clear_chapter_cache
+                summary = context.getString(R.string.used_cache, chapterCache.readableSize)
+
+                onClick { clearChapterCache() }
+            }
+            preference {
+                titleRes = R.string.pref_clear_cookies
+
+                onClick {
+                    network.cookieManager.removeAll()
+                    activity?.toast(R.string.cookies_cleared)
+                }
+            }
+            preference {
+                titleRes = R.string.pref_clear_database
+                summaryRes = R.string.pref_clear_database_summary
+
+                onClick {
+                    val ctrl = ClearDatabaseDialogController()
+                    ctrl.targetController = this@SettingsAdvancedController
+                    ctrl.showDialog(router)
+                }
+            }
+        }
+
+        preferenceCategory {
+            titleRes = R.string.label_library
+
+            preference {
+                titleRes = R.string.pref_refresh_library_covers
+
+                onClick { LibraryUpdateService.start(context, target = Target.COVERS) }
+            }
+            preference {
+                titleRes = R.string.pref_refresh_library_tracking
+                summaryRes = R.string.pref_refresh_library_tracking_summary
+
+                onClick { LibraryUpdateService.start(context, target = Target.TRACKING) }
+            }
+        }
+
         // <-- 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>