Clean up some companion object usages

2021-09-05 14:34:29 -04:00
parent 02b430a5bf
commit ec4e631760
24 changed files with 87 additions and 138 deletions
@@ -243,8 +243,6 @@ class SettingsAdvancedController : SettingsController() {
        db.deleteHistoryNoLastRead().executeAsBlocking()
        activity?.toast(R.string.clear_database_completed)
    }
-
-    private companion object {
-        const val CLEAR_CACHE_KEY = "pref_clear_cache_key"
-    }
 }
+
+private const val CLEAR_CACHE_KEY = "pref_clear_cache_key"
@@ -329,16 +329,12 @@ class SettingsBackupController : SettingsController() {
                    .create()
            }
        }
-
-        private companion object {
-            const val KEY_URI = "RestoreBackupDialog.uri"
-            const val KEY_TYPE = "RestoreBackupDialog.type"
-        }
-    }
-
-    private companion object {
-        const val CODE_BACKUP_DIR = 503
-        const val CODE_BACKUP_CREATE = 504
-        const val CODE_BACKUP_RESTORE = 505
    }
 }
+
+private const val KEY_URI = "RestoreBackupDialog.uri"
+private const val KEY_TYPE = "RestoreBackupDialog.type"
+
+private const val CODE_BACKUP_DIR = 503
+private const val CODE_BACKUP_CREATE = 504
+private const val CODE_BACKUP_RESTORE = 505
@@ -269,8 +269,6 @@ class SettingsDownloadController : SettingsController() {
                .create()
        }
    }
-
-    private companion object {
-        const val DOWNLOAD_DIR = 104
-    }
 }
+
+private const val DOWNLOAD_DIR = 104
@@ -77,8 +77,6 @@ class SettingsSearchAdapter(val controller: SettingsSearchController) :
    interface OnTitleClickListener {
        fun onTitleClick(ctrl: SettingsController)
    }
-
-    private companion object {
-        const val HOLDER_BUNDLE_KEY = "holder_bundle"
-    }
 }
+
+private const val HOLDER_BUNDLE_KEY = "holder_bundle"