Replace NumberPickerDialog by NumberPopup

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/EntryButtonViewTest.kt

@@ -45,7 +45,7 @@ class EntryButtonViewTest : BaseViewTest() {
             value = Entry.NO
             color = PaletteUtils.getAndroidTestColor(5)
             onToggle = { _, _, _ -> toggled = true }
-            onEdit = { _ -> edited = true }
+            onEdit = { edited = true }
         }
         measureView(view, dpToPixels(48), dpToPixels(48))
     }

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt

@@ -76,7 +76,7 @@ class NumberPanelViewTest : BaseViewTest() {
     @Test
     fun testEdit() {
         val timestamps = mutableListOf<Timestamp>()
-        view.onEdit = { _, t -> timestamps.plusAssign(t) }
+        view.onEdit = { t -> timestamps.plusAssign(t) }
         view.buttons[0].performLongClick()
         view.buttons[2].performLongClick()
         view.buttons[3].performLongClick()
@@ -87,7 +87,7 @@ class NumberPanelViewTest : BaseViewTest() {
     fun testEdit_withOffset() {
         val timestamps = mutableListOf<Timestamp>()
         view.dataOffset = 3
-        view.onEdit = { _, t -> timestamps += t }
+        view.onEdit = { t -> timestamps += t }
         view.buttons[0].performLongClick()
         view.buttons[2].performLongClick()
         view.buttons[3].performLongClick()

uhabits-android/src/main/AndroidManifest.xml

@@ -125,7 +125,7 @@
             android:exported="true"
             android:label="NumericalCheckmarkWidget"
             android:noHistory="true"
-            android:theme="@style/Theme.AppCompat.Light.Dialog">
+            android:theme="@style/Theme.Transparent">
             <intent-filter>
                 <action android:name="org.isoron.uhabits.ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY" />
             </intent-filter>

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

@@ -19,14 +19,12 @@
 
 package org.isoron.uhabits.activities.common.dialogs
 
+import android.app.Dialog
 import android.content.Context
-import android.graphics.drawable.ColorDrawable
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.GONE
-import android.widget.PopupWindow
-import org.isoron.platform.gui.ScreenLocation
+import android.view.View.VISIBLE
 import org.isoron.uhabits.R
 import org.isoron.uhabits.core.models.Entry.Companion.NO
 import org.isoron.uhabits.core.models.Entry.Companion.SKIP
@@ -52,13 +50,15 @@ class CheckmarkPopup(
     private val anchor: View,
 ) {
     var onToggle: (Int, String) -> Unit = { _, _ -> }
+    private lateinit var dialog: Dialog
 
     private val view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context)).apply {
         // Required for round corners
         container.clipToOutline = true
     }
 
     init {
+        view.booleanButtons.visibility = VISIBLE
         initColors()
         initTypefaces()
         hideDisabledButtons()
@@ -94,34 +94,34 @@ class CheckmarkPopup(
             SKIP -> if (prefs.isSkipEnabled) view.skipBtn else view.noBtn
             else -> null
         }
-        selectedBtn?.background = ColorDrawable(view.root.sres.getColor(R.attr.contrast40))
         view.notes.setText(notes)
     }
 
-    fun show(location: ScreenLocation) {
-        val popup = PopupWindow()
-        popup.contentView = view.root
-        popup.width = view.root.dp(POPUP_WIDTH).toInt()
-        popup.height = view.root.dp(POPUP_HEIGHT).toInt()
-        popup.isFocusable = true
-        popup.elevation = view.root.dp(24f)
+    fun show() {
+        dialog = Dialog(context, android.R.style.Theme_NoTitleBar)
+        dialog.setContentView(view.root)
+        dialog.window?.apply {
+            setLayout(
+                view.root.dp(POPUP_WIDTH).toInt(),
+                view.root.dp(POPUP_HEIGHT).toInt()
+            )
+            setBackgroundDrawableResource(android.R.color.transparent)
+        }
         fun onClick(v: Int) {
             this.value = v
-            popup.dismiss()
+            save()
         }
         view.yesBtn.setOnClickListener { onClick(YES_MANUAL) }
         view.noBtn.setOnClickListener { onClick(NO) }
         view.skipBtn.setOnClickListener { onClick(SKIP) }
         view.unknownBtn.setOnClickListener { onClick(UNKNOWN) }
-        popup.setOnDismissListener {
-            onToggle(value, view.notes.text.toString())
-        }
-        popup.showAtLocation(
-            anchor,
-            Gravity.NO_GRAVITY,
-            view.root.dp(location.x.toFloat()).toInt(),
-            view.root.dp(location.y.toFloat()).toInt(),
-        )
-        popup.dimBehind()
+        dialog.setCanceledOnTouchOutside(true)
+        dialog.dimBehind()
+        dialog.show()
+    }
+
+    fun save() {
+        onToggle(value, view.notes.text.toString().trim())
+        dialog.dismiss()
     }
 }