From 2485ef8547d582f67840a525166bcd05f9844cd1 Mon Sep 17 00:00:00 2001 From: arkon <eugcheung94@gmail.com> Date: Tue, 21 Apr 2020 19:01:01 -0400 Subject: [PATCH] Remove migrating progress dialog --- .../ui/migration/SearchController.kt | 24 ++++--------------- .../res/layout/global_search_controller.xml | 20 ++++++++++++++++ app/src/main/res/values/strings.xml | 1 - 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt index c78cdce96..cf665bf2c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/SearchController.kt @@ -7,9 +7,10 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.base.controller.DialogController -import eu.kanade.tachiyomi.ui.base.controller.popControllerWithTag import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchController import eu.kanade.tachiyomi.ui.source.global_search.GlobalSearchPresenter +import eu.kanade.tachiyomi.util.view.gone +import eu.kanade.tachiyomi.util.view.visible import uy.kohesive.injekt.injectLazy class SearchController( @@ -62,11 +63,9 @@ class SearchController( fun renderIsReplacingManga(isReplacingManga: Boolean) { if (isReplacingManga) { - if (router.getControllerWithTag(LOADING_DIALOG_TAG) == null) { - LoadingController().showDialog(router, LOADING_DIALOG_TAG) - } + binding.progress.visible() } else { - router.popControllerWithTag(LOADING_DIALOG_TAG) + binding.progress.gone() router.popController(this) } } @@ -103,19 +102,4 @@ class SearchController( .build() } } - - class LoadingController : DialogController() { - - override fun onCreateDialog(savedViewState: Bundle?): Dialog { - return MaterialDialog.Builder(activity!!) - .progress(true, 0) - .content(R.string.migrating) - .cancelable(false) - .build() - } - } - - companion object { - const val LOADING_DIALOG_TAG = "LoadingDialog" - } } diff --git a/app/src/main/res/layout/global_search_controller.xml b/app/src/main/res/layout/global_search_controller.xml index 6d321b8d0..ae380eb4b 100644 --- a/app/src/main/res/layout/global_search_controller.xml +++ b/app/src/main/res/layout/global_search_controller.xml @@ -13,4 +13,24 @@ android:paddingBottom="4dp" tools:listitem="@layout/global_search_controller_card" /> + <FrameLayout + android:id="@+id/progress" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone"> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/colorSurface" + android:alpha="0.75" /> + + <ProgressBar + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_gravity="center" /> + + </FrameLayout> + </FrameLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b1f69d7e..8a85f65d0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -526,7 +526,6 @@ <string name="select">Select</string> <string name="migrate">Migrate</string> <string name="copy">Copy</string> - <string name="migrating">Migrating…</string> <!-- Downloads activity and service --> <string name="download_queue_error">Could not download chapters. You can try again in the downloads section</string>