Mostly from settings rewrite, but some other things too. (cherry picked from commit 69cdba71eb842865586309d8549de78480cdbe0e) # Conflicts: # app/src/main/java/eu/kanade/presentation/more/settings/database/ClearDatabaseScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBackupController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/database/ClearDatabasePresenter.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt # app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/TrackLoginDialog.kt # app/src/main/java/eu/kanade/tachiyomi/widget/materialdialogs/MaterialAlertDialogBuilderExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/widget/preference/IntListPreference.kt # app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt # app/src/main/res/drawable/ic_done_green_24dp.xml # app/src/main/res/layout/pref_account_login.xml # app/src/main/res/layout/pref_library_columns.xml |
||
|---|---|---|
| .. | ||
| wrapper | ||
| androidx.versions.toml | ||
| compose.versions.toml | ||
| kotlinx.versions.toml | ||
| libs.versions.toml | ||
| sy.versions.toml | ||