Implement CheckmarkPopup

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt

@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.core.ui.screens.habits.list
 
+import org.isoron.platform.gui.ScreenLocation
 import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
@@ -50,7 +51,7 @@ open class ListHabitsBehavior @Inject constructor(
         screen.showHabitScreen(h)
     }
 
-    fun onEdit(habit: Habit, timestamp: Timestamp?) {
+    fun onEdit(location: ScreenLocation, habit: Habit, timestamp: Timestamp?) {
         val entry = habit.computedEntries.get(timestamp!!)
         if (habit.type == HabitType.NUMERICAL) {
             val oldValue = entry.value.toDouble()
@@ -65,12 +66,11 @@ open class ListHabitsBehavior @Inject constructor(
                 commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value, newNotes))
             }
         } else {
-            screen.showCheckmarkDialog(
+            screen.showCheckmarkPopup(
                 entry.value,
                 entry.notes,
-                timestamp.toLocalDate(),
-                timestamp.toDialogDateString(),
                 habit.color,
+                location,
             ) { newValue, newNotes ->
                 commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, newValue, newNotes))
             }
@@ -171,6 +171,13 @@ open class ListHabitsBehavior @Inject constructor(
             frequency: Frequency,
             callback: NumberPickerCallback
         )
+        fun showCheckmarkPopup(
+            selectedValue: Int,
+            notes: String,
+            color: PaletteColor,
+            location: ScreenLocation,
+            callback: CheckMarkDialogCallback
+        )
         fun showCheckmarkDialog(
             selectedValue: Int,
             notes: String,

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt

@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits.core.ui.screens.habits.show.views
 
+import org.isoron.platform.gui.ScreenLocation
 import org.isoron.platform.time.DayOfWeek
 import org.isoron.platform.time.LocalDate
 import org.isoron.uhabits.core.commands.CommandRunner
@@ -65,55 +66,65 @@ class HistoryCardPresenter(
     val screen: Screen,
 ) : OnDateClickedListener {
 
-    override fun onDateLongPress(date: LocalDate) {
+    override fun onDateLongPress(location: ScreenLocation, date: LocalDate) {
         val timestamp = Timestamp.fromLocalDate(date)
         screen.showFeedback()
         if (habit.isNumerical) {
             showNumberPicker(timestamp)
         } else {
-            val entry = habit.computedEntries.get(timestamp)
-            val nextValue = Entry.nextToggleValue(
-                value = entry.value,
-                isSkipEnabled = preferences.isSkipEnabled,
-                areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
-            )
+            if (preferences.isShortToggleEnabled) showCheckmarkPopup(location, timestamp)
+            else toggle(timestamp)
+        }
+    }
+
+    override fun onDateShortPress(location: ScreenLocation, date: LocalDate) {
+        val timestamp = Timestamp.fromLocalDate(date)
+        screen.showFeedback()
+        if (habit.isNumerical) {
+            showNumberPicker(timestamp)
+        } else {
+            if (preferences.isShortToggleEnabled) toggle(timestamp)
+            else showCheckmarkPopup(location, timestamp)
+        }
+    }
+
+    private fun showCheckmarkPopup(location: ScreenLocation, timestamp: Timestamp) {
+        val entry = habit.computedEntries.get(timestamp)
+        screen.showCheckmarkPopup(
+            entry.value,
+            entry.notes,
+            preferences,
+            habit.color,
+            location,
+        ) { newValue, newNotes ->
             commandRunner.run(
                 CreateRepetitionCommand(
                     habitList,
                     habit,
                     timestamp,
-                    nextValue,
-                    entry.notes,
+                    newValue,
+                    newNotes,
                 ),
             )
         }
     }
 
-    override fun onDateShortPress(date: LocalDate) {
-        val timestamp = Timestamp.fromLocalDate(date)
-        screen.showFeedback()
-        if (habit.isNumerical) {
-            showNumberPicker(timestamp)
-        } else {
-            val entry = habit.computedEntries.get(timestamp)
-            screen.showCheckmarkDialog(
-                entry.value,
+    private fun toggle(timestamp: Timestamp) {
+        val entry = habit.computedEntries.get(timestamp)
+        val nextValue = Entry.nextToggleValue(
+            value = entry.value,
+            isSkipEnabled = preferences.isSkipEnabled,
+            areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
+        )
+        commandRunner.run(
+            CreateRepetitionCommand(
+                habitList,
+                habit,
+                timestamp,
+                nextValue,
                 entry.notes,
-                timestamp.toLocalDate(),
-                preferences,
-                habit.color,
-            ) { newValue, newNotes ->
-                commandRunner.run(
-                    CreateRepetitionCommand(
-                        habitList,
-                        habit,
-                        timestamp,
-                        newValue,
-                        newNotes,
-                    ),
-                )
-            }
-        }
+            ),
+        )
     }
 
     private fun showNumberPicker(timestamp: Timestamp) {
@@ -211,5 +222,14 @@ class HistoryCardPresenter(
             color: PaletteColor,
             callback: ListHabitsBehavior.CheckMarkDialogCallback,
         )
+
+        fun showCheckmarkPopup(
+            selectedValue: Int,
+            notes: String,
+            preferences: Preferences,
+            color: PaletteColor,
+            location: ScreenLocation,
+            callback: ListHabitsBehavior.CheckMarkDialogCallback,
+        )
     }
 }

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt

@@ -22,6 +22,7 @@ package org.isoron.uhabits.core.ui.views
 import org.isoron.platform.gui.Canvas
 import org.isoron.platform.gui.Color
 import org.isoron.platform.gui.DataView
+import org.isoron.platform.gui.ScreenLocation
 import org.isoron.platform.gui.TextAlign
 import org.isoron.platform.time.DayOfWeek
 import org.isoron.platform.time.LocalDate
@@ -33,8 +34,8 @@ import kotlin.math.min
 import kotlin.math.round
 
 interface OnDateClickedListener {
-    fun onDateShortPress(date: LocalDate) {}
-    fun onDateLongPress(date: LocalDate) {}
+    fun onDateShortPress(location: ScreenLocation, date: LocalDate) {}
+    fun onDateLongPress(location: ScreenLocation, date: LocalDate) {}
 }
 
 class HistoryChart(
@@ -90,10 +91,11 @@ class HistoryChart(
         if (x - padding < 0 || row == 0 || row > 7 || col == nColumns) return
         val clickedDate = topLeftDate.plus(offset)
         if (clickedDate.isNewerThan(today)) return
+        val location = ScreenLocation(x, y)
         if (isLongClick) {
-            onDateClickedListener.onDateLongPress(clickedDate)
+            onDateClickedListener.onDateLongPress(location, clickedDate)
         } else {
-            onDateClickedListener.onDateShortPress(clickedDate)
+            onDateClickedListener.onDateShortPress(location, clickedDate)
         }
     }