From 87fdbdbb6ed2af9ddd177198e17a9eddd44fca93 Mon Sep 17 00:00:00 2001 From: tom5079 Date: Fri, 2 Oct 2020 00:19:56 +0900 Subject: [PATCH] Open GalleryDialog first instead of opening Reader directly --- .../java/xyz/quaver/pupil/ui/MainActivity.kt | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt index d696316f..3b34fd3d 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt @@ -287,12 +287,22 @@ class MainActivity : setTitle(R.string.main_open_gallery_by_id) setPositiveButton(android.R.string.ok) { _, _ -> - val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton - val intent = Intent(this@MainActivity, ReaderActivity::class.java).apply { - putExtra("galleryID", galleryID) - } + val galleryID = editText.text.toString().toIntOrNull() ?: return@setPositiveButton - startActivity(intent) + GalleryDialog(this@MainActivity, galleryID).apply { + onChipClickedHandler.add { + runOnUiThread { + query = it.toQuery() + currentPage = 0 + + cancelFetch() + clearGalleries() + fetchGalleries(query, sortMode) + loadBlocks() + } + dismiss() + } + }.show() } }.show() }