From 878d3a3ceb94b709acba67f51387bb12b4de4e8f Mon Sep 17 00:00:00 2001 From: aayush262 Date: Tue, 2 Jan 2024 14:45:54 +0530 Subject: [PATCH] changed alter dialog view --- .../dantotsu/media/anime/AnimeWatchFragment.kt | 18 +++++++++--------- .../dantotsu/media/manga/MangaReadFragment.kt | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt index 5dba0e85..b890d63a 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchFragment.kt @@ -314,19 +314,19 @@ class AnimeWatchFragment : Fragment() { if (show) View.GONE else View.VISIBLE } } + var itemSelected = false val allSettings = pkg.sources.filterIsInstance() if (allSettings.isNotEmpty()) { var selectedSetting = allSettings[0] if (allSettings.size > 1) { - val names = allSettings.map { it.lang }.toTypedArray() + val names = allSettings.sortedBy { it.lang }.map { it.lang }.toTypedArray() var selectedIndex = 0 - val dialog = AlertDialog.Builder(requireContext()) + val dialog = AlertDialog.Builder(requireContext() , R.style.MyPopup) .setTitle("Select a Source") - .setSingleChoiceItems(names, selectedIndex) { _, which -> + .setSingleChoiceItems(names, selectedIndex) { dialog, which -> selectedIndex = which - } - .setPositiveButton("OK") { dialog, _ -> selectedSetting = allSettings[selectedIndex] + itemSelected = true dialog.dismiss() // Move the fragment transaction here @@ -343,10 +343,10 @@ class AnimeWatchFragment : Fragment() { .commit() } } - .setNegativeButton("Cancel") { dialog, _ -> - dialog.cancel() - changeUIVisibility(true) - return@setNegativeButton + .setOnDismissListener { + if (!itemSelected) { + changeUIVisibility(true) + } } .show() dialog.window?.setDimAmount(0.8f) diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt index 241c979a..fb71b03f 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt @@ -356,19 +356,19 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { if (show) View.GONE else View.VISIBLE } } + var itemSelected = false val allSettings = pkg.sources.filterIsInstance() if (allSettings.isNotEmpty()) { var selectedSetting = allSettings[0] if (allSettings.size > 1) { - val names = allSettings.map { it.lang }.toTypedArray() + val names = allSettings.sortedBy { it.lang }.map { it.lang }.toTypedArray() var selectedIndex = 0 - val dialog = AlertDialog.Builder(requireContext()) + val dialog = AlertDialog.Builder(requireContext(), R.style.MyPopup) .setTitle("Select a Source") - .setSingleChoiceItems(names, selectedIndex) { _, which -> + .setSingleChoiceItems(names, selectedIndex) { dialog, which -> selectedIndex = which - } - .setPositiveButton("OK") { dialog, _ -> selectedSetting = allSettings[selectedIndex] + itemSelected = true dialog.dismiss() // Move the fragment transaction here @@ -383,10 +383,10 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener { .addToBackStack(null) .commit() } - .setNegativeButton("Cancel") { dialog, _ -> - dialog.cancel() - changeUIVisibility(true) - return@setNegativeButton + .setOnDismissListener { + if (!itemSelected) { + changeUIVisibility(true) + } } .show() dialog.window?.setDimAmount(0.8f)