Sectioning Advanced section

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

@@ -58,6 +58,8 @@ class SettingsAdvancedController : SettingsController() {
             summaryRes = R.string.helps_fix_bugs
             defaultValue = true
         }
+        preferenceCategory {
+            titleRes = R.string.data_management
             preference {
                 key = CLEAR_CACHE_KEY
                 titleRes = R.string.clear_chapter_cache
@@ -68,7 +70,10 @@ class SettingsAdvancedController : SettingsController() {
 
             preference {
                 titleRes = R.string.clean_up_cached_covers
-            summary = context.getString(R.string.delete_old_covers_in_library_used_, coverCache.getChapterCacheSize())
+                summary = context.getString(
+                    R.string.delete_old_covers_in_library_used_,
+                    coverCache.getChapterCacheSize()
+                )
 
                 onClick {
                     context.toast(R.string.starting_cleanup)
@@ -77,7 +82,10 @@ class SettingsAdvancedController : SettingsController() {
             }
             preference {
                 titleRes = R.string.clean_up_cached_covers_non_library
-            summary = context.getString(R.string.delete_all_covers__not_in_library_used_, coverCache.getOnlineCoverCacheSize())
+                summary = context.getString(
+                    R.string.delete_all_covers__not_in_library_used_,
+                    coverCache.getOnlineCoverCacheSize()
+                )
 
                 onClick {
                     context.toast(R.string.starting_cleanup)
@@ -85,23 +93,29 @@ class SettingsAdvancedController : SettingsController() {
                 }
             }
             preference {
-            titleRes = R.string.clear_cookies
+                titleRes = R.string.clear_database
+                summaryRes = R.string.clear_database_summary
 
                 onClick {
-                network.cookieManager.removeAll()
+                    val ctrl = ClearDatabaseDialogController()
-                activity?.toast(R.string.cookies_cleared)
+                    ctrl.targetController = this@SettingsAdvancedController
+                    ctrl.showDialog(router)
                 }
             }
             preference {
-            titleRes = R.string.clear_database
+                titleRes = R.string.clean_up_downloaded_chapters
-            summaryRes = R.string.clear_database_summary
+
+                summaryRes = R.string.delete_unused_chapters
 
                 onClick {
-                val ctrl = ClearDatabaseDialogController()
+                    val ctrl = CleanupDownloadsDialogController()
                     ctrl.targetController = this@SettingsAdvancedController
                     ctrl.showDialog(router)
                 }
             }
+        }
+        preferenceCategory {
+            titleRes = R.string.library
             preference {
                 titleRes = R.string.refresh_library_metadata
                 summaryRes = R.string.updates_covers_genres_desc
@@ -114,15 +128,15 @@ class SettingsAdvancedController : SettingsController() {
 
                 onClick { LibraryUpdateService.start(context, target = Target.TRACKING) }
             }
-        preference {
+        }
-            titleRes = R.string.clean_up_downloaded_chapters
 
-            summaryRes = R.string.delete_unused_chapters
+        preferenceCategory {
+            preference {
+                titleRes = R.string.clear_cookies
 
                 onClick {
-                val ctrl = CleanupDownloadsDialogController()
+                    network.cookieManager.removeAll()
-                ctrl.targetController = this@SettingsAdvancedController
+                    activity?.toast(R.string.cookies_cleared)
-                ctrl.showDialog(router)
                 }
             }
 
@@ -147,6 +161,7 @@ class SettingsAdvancedController : SettingsController() {
                 }
             }
         }
+    }
 
     class CleanupDownloadsDialogController() : DialogController() {
         override fun onCreateDialog(savedViewState: Bundle?): Dialog {

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

@@ -527,6 +527,7 @@
 
     <!-- Advanced section -->
     <string name="clear_chapter_cache">Clear chapter cache</string>
+    <string name="data_management">Data Management</string>
     <string name="used_">Used: %1$s</string>
     <plurals name="cache_cleared">
         <item quantity="one">Cache cleared. %d file has been deleted</item>