From 749b240897b849fea44d98f6feb475b2da695d75 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 15 Jun 2020 22:25:03 -0400 Subject: [PATCH] Group extension details classes together --- .../tachiyomi/ui/browse/extension/ExtensionController.kt | 1 + .../extension/{ => details}/ExtensionDetailsController.kt | 7 +++++-- .../extension/{ => details}/ExtensionDetailsPresenter.kt | 2 +- .../extension/{ => details}/SourcePreferencesController.kt | 2 +- .../extension/{ => details}/SourcePreferencesPresenter.kt | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) rename app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/{ => details}/ExtensionDetailsController.kt (97%) rename app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/{ => details}/ExtensionDetailsPresenter.kt (95%) rename app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/{ => details}/SourcePreferencesController.kt (99%) rename app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/{ => details}/SourcePreferencesPresenter.kt (87%) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt index ad22837098..eec9c7fcaa 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt @@ -18,6 +18,7 @@ import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.BrowseController +import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsController import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt similarity index 97% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionDetailsController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt index b50c5e8729..79602d04a9 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.extension +package eu.kanade.tachiyomi.ui.browse.extension.details import android.annotation.SuppressLint import android.content.Context @@ -30,6 +30,7 @@ import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.ui.base.controller.NoToolbarElevationController import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.browse.extension.getApplicationIcon import eu.kanade.tachiyomi.util.preference.DSL import eu.kanade.tachiyomi.util.preference.onChange import eu.kanade.tachiyomi.util.preference.preferenceCategory @@ -160,7 +161,9 @@ class ExtensionDetailsController(bundle: Bundle? = null) : switchSettingsPreference { block() onSettingsClick = View.OnClickListener { - router.pushController(SourcePreferencesController(source.id).withFadeTransaction()) + router.pushController( + SourcePreferencesController(source.id).withFadeTransaction() + ) } } } else { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt similarity index 95% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionDetailsPresenter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt index a9760b7588..e43ea629d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsPresenter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.extension +package eu.kanade.tachiyomi.ui.browse.extension.details import android.os.Bundle import eu.kanade.tachiyomi.extension.ExtensionManager diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/SourcePreferencesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt similarity index 99% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/SourcePreferencesController.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt index 3cca2f0064..41abd3ec82 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/SourcePreferencesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.extension +package eu.kanade.tachiyomi.ui.browse.extension.details import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/SourcePreferencesPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesPresenter.kt similarity index 87% rename from app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/SourcePreferencesPresenter.kt rename to app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesPresenter.kt index 096f76de0c..3e3147c669 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/SourcePreferencesPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesPresenter.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.ui.browse.extension +package eu.kanade.tachiyomi.ui.browse.extension.details import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter