Improve UX when changing "pref_key_hide_launcher_icon"

RikkaApps · Feb 9, 2021 · 7e84592 · 7e84592
1 parent 946e5c1
commit 7e84592
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/app/src/main/java/moe/haruue/wadb/component/HomeFragment.kt b/app/src/main/java/moe/haruue/wadb/component/HomeFragment.kt
@@ -124,18 +124,24 @@ class HomeFragment : PreferenceFragment(), WadbStateChangedEvent, WadbFailureEve
         launcherIconPreference.isChecked = !launcherActivityEnabled
         launcherIconPreference.setOnPreferenceChangeListener { _, newValue ->
             if (newValue as Boolean) {
-                wadbApplication.disableLauncherActivity()
-
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
                     AlertDialog.Builder(requireContext())
                             .setMessage(R.string.dialog_hide_icon_message_q)
-                            .setPositiveButton(android.R.string.ok, null)
+                            .setNegativeButton(android.R.string.cancel, null)
+                            .setPositiveButton(android.R.string.ok) { _, _ ->
+                                wadbApplication.disableLauncherActivity()
+                                launcherIconPreference.isChecked = true
+                            }
                             .show()
+                    false
+                } else {
+                    wadbApplication.disableLauncherActivity()
+                    true
                 }
             } else {
                 wadbApplication.enableLauncherActivity()
+                true
             }
-            true
         }
 
         val bootCompletedReceiverPreference = findPreference("start_on_boot") as TwoStatePreference