diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt index b2a1789edc..9a074d119a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/TabbedLibraryDisplaySheet.kt @@ -6,7 +6,7 @@ import androidx.core.view.isVisible import com.bluelinelabs.conductor.Controller import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.library.LibraryController -import eu.kanade.tachiyomi.ui.setting.SettingsLibraryController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsLibraryController import eu.kanade.tachiyomi.util.system.contextCompatDrawable import eu.kanade.tachiyomi.util.view.compatToolTipText import eu.kanade.tachiyomi.util.view.withFadeTransaction diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 5488473fbc..5c80802755 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -103,7 +103,7 @@ import eu.kanade.tachiyomi.ui.recents.RecentsController import eu.kanade.tachiyomi.ui.recents.RecentsViewType import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate import eu.kanade.tachiyomi.ui.setting.SettingsController -import eu.kanade.tachiyomi.ui.setting.SettingsMainController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsMainController import eu.kanade.tachiyomi.ui.source.BrowseController import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController import eu.kanade.tachiyomi.util.manga.MangaCoverMetadata diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt index 15ebf747e1..81e23d9508 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt @@ -19,7 +19,7 @@ import eu.kanade.tachiyomi.ui.manga.MangaDetailsController import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate import eu.kanade.tachiyomi.ui.setting.SettingsController -import eu.kanade.tachiyomi.ui.setting.SettingsReaderController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsReaderController import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.util.chapter.ChapterSort diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt similarity index 96% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt index 5198ba03c8..f1fb6542f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.annotation.SuppressLint import android.content.Context @@ -42,8 +42,22 @@ import eu.kanade.tachiyomi.network.PREF_DOH_QUAD101 import eu.kanade.tachiyomi.network.PREF_DOH_QUAD9 import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.ui.main.MainActivity +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.bindTo import eu.kanade.tachiyomi.ui.setting.database.ClearDatabaseController import eu.kanade.tachiyomi.ui.setting.debug.DebugController +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.editTextPreference +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.listPreference +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.CrashLogUtil import eu.kanade.tachiyomi.util.system.disableItems import eu.kanade.tachiyomi.util.system.isPackageInstalled diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAppearanceController.kt similarity index 91% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAppearanceController.kt index 20ceb0064a..2c4911786b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAppearanceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAppearanceController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.annotation.SuppressLint import android.os.Bundle @@ -9,6 +9,18 @@ import androidx.core.view.isVisible import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.changesIn +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.ThemePreference +import eu.kanade.tachiyomi.ui.setting.bindTo +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.themePreference +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.system.SideNavMode import eu.kanade.tachiyomi.util.system.appDelegateNightMode import eu.kanade.tachiyomi.util.system.dpToPx diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsBrowseController.kt similarity index 92% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsBrowseController.kt index 107895aee6..a8343d161f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsBrowseController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.app.Activity import android.content.Intent @@ -6,7 +6,6 @@ import android.os.Build import android.provider.Settings import androidx.preference.PreferenceScreen import androidx.preference.SwitchPreferenceCompat -import dev.yokai.domain.base.BasePreferences import dev.yokai.domain.base.BasePreferences.ExtensionInstaller import dev.yokai.presentation.extension.repo.ExtensionRepoController import eu.kanade.tachiyomi.BuildConfig @@ -20,6 +19,18 @@ import eu.kanade.tachiyomi.extension.ExtensionUpdateJob import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.migration.MigrationController +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.bindTo +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.lang.addBetaTag import eu.kanade.tachiyomi.util.view.snack import eu.kanade.tachiyomi.util.view.withFadeTransaction diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDataController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDataController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt index 669f27d33f..3d720393d0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDataController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDataController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.app.Activity import android.content.ActivityNotFoundException @@ -9,7 +9,6 @@ import android.view.MenuInflater import android.view.MenuItem import android.widget.Toast import androidx.appcompat.app.AlertDialog -import androidx.core.net.toFile import androidx.core.net.toUri import androidx.preference.PreferenceScreen import com.hippo.unifile.UniFile @@ -22,6 +21,16 @@ import eu.kanade.tachiyomi.data.backup.BackupFileValidator import eu.kanade.tachiyomi.data.backup.BackupRestoreJob import eu.kanade.tachiyomi.data.backup.models.Backup import eu.kanade.tachiyomi.ui.main.MainActivity +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.bindTo +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.disableItems import eu.kanade.tachiyomi.util.system.materialAlertDialog @@ -30,7 +39,6 @@ import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import uy.kohesive.injekt.injectLazy -import java.io.File class SettingsDataController : SettingsController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDownloadController.kt similarity index 88% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDownloadController.kt index 745be988aa..3b14917b32 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsDownloadController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.content.Intent import androidx.preference.PreferenceScreen @@ -8,6 +8,19 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Category import eu.kanade.tachiyomi.data.preference.changesIn +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.bindTo +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.multiSelectListPreferenceMat +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes +import eu.kanade.tachiyomi.ui.setting.triStateListPreference import eu.kanade.tachiyomi.util.lang.addBetaTag import eu.kanade.tachiyomi.util.view.withFadeTransaction import uy.kohesive.injekt.injectLazy diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsGeneralController.kt similarity index 93% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsGeneralController.kt index 63c86c7617..f01948c83f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsGeneralController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.content.Intent import android.content.res.XmlResourceParser @@ -12,6 +12,19 @@ import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.updater.AppDownloadInstallJob +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.ThemePreference +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.listPreference +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.lang.addBetaTag import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.system.systemLangContext diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt similarity index 91% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt index 14bbc2d2fa..c5e4ff58f4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsLibraryController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.R @@ -10,6 +10,19 @@ import eu.kanade.tachiyomi.ui.category.CategoryController import eu.kanade.tachiyomi.ui.library.LibraryPresenter import eu.kanade.tachiyomi.ui.library.display.TabbedLibraryDisplaySheet import eu.kanade.tachiyomi.ui.main.MainActivity +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.bindTo +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.multiSelectListPreferenceMat +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes +import eu.kanade.tachiyomi.ui.setting.triStateListPreference import eu.kanade.tachiyomi.util.system.launchIO import eu.kanade.tachiyomi.util.system.launchUI import eu.kanade.tachiyomi.util.view.withFadeTransaction diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsMainController.kt similarity index 93% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsMainController.kt index 0479f37e9b..31d81f6110 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsMainController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.app.ActivityManager import android.view.Menu @@ -12,7 +12,13 @@ import com.bluelinelabs.conductor.changehandler.SimpleSwapChangeHandler import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.main.FloatingSearchInterface import eu.kanade.tachiyomi.ui.more.AboutController +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.iconRes +import eu.kanade.tachiyomi.ui.setting.iconTint +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference import eu.kanade.tachiyomi.ui.setting.search.SettingsSearchController +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.system.getResourceColor import eu.kanade.tachiyomi.util.view.activityBinding import eu.kanade.tachiyomi.util.view.fadeTransactionHandler diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsReaderController.kt similarity index 96% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsReaderController.kt index 93d76ce949..6d1efc6039 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsReaderController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsReaderController.kt @@ -1,6 +1,5 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers -import android.os.Build import androidx.preference.PreferenceScreen import dev.yokai.domain.ui.settings.ReaderPreferences import dev.yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour @@ -14,6 +13,17 @@ import eu.kanade.tachiyomi.ui.reader.settings.ReaderBackgroundColor import eu.kanade.tachiyomi.ui.reader.settings.ReaderBottomButton import eu.kanade.tachiyomi.ui.reader.settings.ReadingModeType import eu.kanade.tachiyomi.ui.reader.viewer.ViewerNavigation +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.bindTo +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.listPreference +import eu.kanade.tachiyomi.ui.setting.multiSelectListPreferenceMat +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.summaryRes +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.lang.addBetaTag import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.isTablet diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsSecurityController.kt similarity index 82% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsSecurityController.kt index 4cc112bda6..4a2d7be551 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsSecurityController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import androidx.fragment.app.FragmentActivity import androidx.preference.PreferenceScreen @@ -7,6 +7,16 @@ import eu.kanade.tachiyomi.data.preference.PreferenceKeys import eu.kanade.tachiyomi.data.preference.PreferenceValues import eu.kanade.tachiyomi.data.preference.changesIn import eu.kanade.tachiyomi.ui.security.SecureActivityDelegate +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.bindTo +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.intListPreference +import eu.kanade.tachiyomi.ui.setting.listPreference +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.requireAuthentication +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported class SettingsSecurityController : SettingsController() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsSourcesController.kt similarity index 98% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsSourcesController.kt index dae27850a9..ca5d37e60b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsSourcesController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.graphics.drawable.Drawable import android.view.Menu @@ -16,6 +16,9 @@ import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.main.FloatingSearchInterface import eu.kanade.tachiyomi.ui.main.MainActivity +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.onChange +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.system.LocaleHelper import eu.kanade.tachiyomi.util.view.activityBinding import eu.kanade.tachiyomi.util.view.setOnQueryTextChangeListener diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsTrackingController.kt similarity index 92% rename from app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsTrackingController.kt index 5f83597b26..2c562a08f7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsTrackingController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsTrackingController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.setting +package eu.kanade.tachiyomi.ui.setting.controllers import android.app.Activity import androidx.preference.PreferenceGroup @@ -14,6 +14,16 @@ import eu.kanade.tachiyomi.data.track.bangumi.BangumiApi import eu.kanade.tachiyomi.data.track.myanimelist.MyAnimeListApi import eu.kanade.tachiyomi.data.track.shikimori.ShikimoriApi import eu.kanade.tachiyomi.source.SourceManager +import eu.kanade.tachiyomi.ui.setting.SettingsController +import eu.kanade.tachiyomi.ui.setting.add +import eu.kanade.tachiyomi.ui.setting.defaultValue +import eu.kanade.tachiyomi.ui.setting.iconRes +import eu.kanade.tachiyomi.ui.setting.infoPreference +import eu.kanade.tachiyomi.ui.setting.onClick +import eu.kanade.tachiyomi.ui.setting.preference +import eu.kanade.tachiyomi.ui.setting.preferenceCategory +import eu.kanade.tachiyomi.ui.setting.switchPreference +import eu.kanade.tachiyomi.ui.setting.titleRes import eu.kanade.tachiyomi.util.system.launchIO import eu.kanade.tachiyomi.util.system.openInBrowser import eu.kanade.tachiyomi.util.view.snack diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt index b7a52630fb..fbe0d6984c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt @@ -7,17 +7,17 @@ import androidx.preference.Preference import androidx.preference.PreferenceCategory import androidx.preference.PreferenceGroup import androidx.preference.PreferenceManager -import eu.kanade.tachiyomi.ui.setting.SettingsAdvancedController -import eu.kanade.tachiyomi.ui.setting.SettingsAppearanceController -import eu.kanade.tachiyomi.ui.setting.SettingsDataController -import eu.kanade.tachiyomi.ui.setting.SettingsBrowseController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsAdvancedController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsAppearanceController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsDataController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsBrowseController import eu.kanade.tachiyomi.ui.setting.SettingsController -import eu.kanade.tachiyomi.ui.setting.SettingsDownloadController -import eu.kanade.tachiyomi.ui.setting.SettingsGeneralController -import eu.kanade.tachiyomi.ui.setting.SettingsLibraryController -import eu.kanade.tachiyomi.ui.setting.SettingsReaderController -import eu.kanade.tachiyomi.ui.setting.SettingsSecurityController -import eu.kanade.tachiyomi.ui.setting.SettingsTrackingController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsDownloadController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsGeneralController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsLibraryController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsReaderController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsSecurityController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsTrackingController import eu.kanade.tachiyomi.util.system.isLTR import eu.kanade.tachiyomi.util.system.launchNow import kotlin.reflect.KClass diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index e17f31a54a..21d732ce2b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -41,8 +41,8 @@ import eu.kanade.tachiyomi.ui.main.BottomSheetController import eu.kanade.tachiyomi.ui.main.FloatingSearchInterface import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.RootSearchInterface -import eu.kanade.tachiyomi.ui.setting.SettingsBrowseController -import eu.kanade.tachiyomi.ui.setting.SettingsSourcesController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsBrowseController +import eu.kanade.tachiyomi.ui.setting.controllers.SettingsSourcesController import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.util.system.dpToPx