Changed the approach

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt

@@ -59,7 +59,9 @@ class NumberPickerFactory
         frequency: Frequency,
         callback: ListHabitsBehavior.NumberPickerCallback
     ): AlertDialog {
-        numberPickerExists = true
+
+        clearCurrentDialog()
+
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(R.layout.number_picker_dialog, null)
 
@@ -113,7 +115,7 @@ class NumberPickerFactory
             }
             .setOnDismissListener {
                 callback.onNumberPickerDismissed()
-                numberPickerExists = false
+                currentDialog = null
             }
 
         if (frequency == DAILY) {
@@ -154,6 +156,7 @@ class NumberPickerFactory
             false
         }
 
+        currentDialog = dialog
         return dialog
     }
 
@@ -172,12 +175,10 @@ class NumberPickerFactory
     }
 
     companion object {
-        private var numberPickerExists = false
+        private var currentDialog: AlertDialog? = null
-
+        fun clearCurrentDialog() {
-        fun numberPickerAlreadyExists(): Boolean = numberPickerExists
+            currentDialog?.dismiss()
-
+            currentDialog = null
-        fun setNumberPickerExists(value: Boolean) {
-            numberPickerExists = value
         }
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt

@@ -234,10 +234,8 @@ class ListHabitsScreen
         frequency: Frequency,
         callback: ListHabitsBehavior.NumberPickerCallback
     ) {
-        if (!NumberPickerFactory.numberPickerAlreadyExists()) {
         numberPickerFactory.create(value, unit, notes, dateString, frequency, callback).show()
     }
-    }
 
     override fun showCheckmarkDialog(
         selectedValue: Int,

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt

@@ -20,7 +20,6 @@ package org.isoron.uhabits.activities.habits.show
 
 import android.content.ContentUris
 import android.os.Bundle
-import android.util.Log
 import android.view.HapticFeedbackConstants
 import android.view.Menu
 import android.view.MenuItem
@@ -174,7 +173,6 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             frequency: Frequency,
             callback: ListHabitsBehavior.NumberPickerCallback
         ) {
-            if(!NumberPickerFactory.numberPickerAlreadyExists()) {
             NumberPickerFactory(this@ShowHabitActivity).create(
                 value,
                 unit,
@@ -184,7 +182,6 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                 callback
             ).show()
         }
-        }
 
         override fun showCheckmarkDialog(
             selectedValue: Int,