Merge branch 'number-popup' into release/2.1.0

2025-12-06 01:08:50 -06:00 · 2022-05-14 23:22:28 -05:00
parent 180cf25ad3 d2d45991b0
commit 03b02aaa06
22 changed files with 291 additions and 411 deletions
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt
@@ -18,10 +18,8 @@
 */
 package org.isoron.uhabits.core.ui.screens.habits.list

-import org.isoron.platform.gui.ScreenLocation
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
-import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitList
 import org.isoron.uhabits.core.models.HabitType
@@ -50,17 +48,11 @@ open class ListHabitsBehavior @Inject constructor(
        screen.showHabitScreen(h)
    }

-    fun onEdit(location: ScreenLocation, habit: Habit, timestamp: Timestamp?) {
+    fun onEdit(habit: Habit, timestamp: Timestamp?) {
        val entry = habit.computedEntries.get(timestamp!!)
        if (habit.type == HabitType.NUMERICAL) {
-            val oldValue = entry.value.toDouble()
-            screen.showNumberPicker(
-                oldValue / 1000,
-                habit.unit,
-                entry.notes,
-                timestamp.toDialogDateString(),
-                habit.frequency
-            ) { newValue: Double, newNotes: String, ->
+            val oldValue = entry.value.toDouble() / 1000
+            screen.showNumberPopup(oldValue, entry.notes) { newValue: Double, newNotes: String ->
                val value = (newValue * 1000).roundToInt()
                commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value, newNotes))
            }
@@ -69,7 +61,6 @@ open class ListHabitsBehavior @Inject constructor(
                entry.value,
                entry.notes,
                habit.color,
-                location,
            ) { newValue, newNotes ->
                commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, newValue, newNotes))
            }
@@ -162,19 +153,15 @@ open class ListHabitsBehavior @Inject constructor(
        fun showHabitScreen(h: Habit)
        fun showIntroScreen()
        fun showMessage(m: Message)
-        fun showNumberPicker(
+        fun showNumberPopup(
            value: Double,
-            unit: String,
            notes: String,
-            dateString: String,
-            frequency: Frequency,
            callback: NumberPickerCallback
        )
        fun showCheckmarkPopup(
            selectedValue: Int,
            notes: String,
            color: PaletteColor,
-            location: ScreenLocation,
            callback: CheckMarkDialogCallback
        )
        fun showSendBugReportToDeveloperScreen(log: String)
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
@@ -19,7 +19,6 @@

 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
@@ -28,7 +27,6 @@ import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.models.Entry.Companion.SKIP
 import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
 import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
-import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitList
 import org.isoron.uhabits.core.models.NumericalHabitType.AT_LEAST
@@ -66,36 +64,35 @@ class HistoryCardPresenter(
    val screen: Screen,
 ) : OnDateClickedListener {

-    override fun onDateLongPress(location: ScreenLocation, date: LocalDate) {
+    override fun onDateLongPress(date: LocalDate) {
        val timestamp = Timestamp.fromLocalDate(date)
        screen.showFeedback()
        if (habit.isNumerical) {
-            showNumberPicker(timestamp)
+            showNumberPopup(timestamp)
        } else {
-            if (preferences.isShortToggleEnabled) showCheckmarkPopup(location, timestamp)
+            if (preferences.isShortToggleEnabled) showCheckmarkPopup(timestamp)
            else toggle(timestamp)
        }
    }

-    override fun onDateShortPress(location: ScreenLocation, date: LocalDate) {
+    override fun onDateShortPress(date: LocalDate) {
        val timestamp = Timestamp.fromLocalDate(date)
        screen.showFeedback()
        if (habit.isNumerical) {
-            showNumberPicker(timestamp)
+            showNumberPopup(timestamp)
        } else {
            if (preferences.isShortToggleEnabled) toggle(timestamp)
-            else showCheckmarkPopup(location, timestamp)
+            else showCheckmarkPopup(timestamp)
        }
    }

-    private fun showCheckmarkPopup(location: ScreenLocation, timestamp: Timestamp) {
+    private fun showCheckmarkPopup(timestamp: Timestamp) {
        val entry = habit.computedEntries.get(timestamp)
        screen.showCheckmarkPopup(
            entry.value,
            entry.notes,
            preferences,
            habit.color,
-            location,
        ) { newValue, newNotes ->
            commandRunner.run(
                CreateRepetitionCommand(
@@ -127,15 +124,13 @@ class HistoryCardPresenter(
        )
    }

-    private fun showNumberPicker(timestamp: Timestamp) {
+    private fun showNumberPopup(timestamp: Timestamp) {
        val entry = habit.computedEntries.get(timestamp)
        val oldValue = entry.value
-        screen.showNumberPicker(
-            oldValue / 1000.0,
-            habit.unit,
-            entry.notes,
-            timestamp.toDialogDateString(),
-            frequency = habit.frequency
+        screen.showNumberPopup(
+            value = oldValue / 1000.0,
+            notes = entry.notes,
+            preferences = preferences,
        ) { newValue: Double, newNotes: String ->
            val thousands = (newValue * 1000).roundToInt()
            commandRunner.run(
@@ -205,21 +200,17 @@ class HistoryCardPresenter(
    interface Screen {
        fun showHistoryEditorDialog(listener: OnDateClickedListener)
        fun showFeedback()
-        fun showNumberPicker(
+        fun showNumberPopup(
            value: Double,
-            unit: String,
            notes: String,
-            dateString: String,
-            frequency: Frequency,
-            callback: ListHabitsBehavior.NumberPickerCallback
+            preferences: Preferences,
+            callback: ListHabitsBehavior.NumberPickerCallback,
        )
-
        fun showCheckmarkPopup(
            selectedValue: Int,
            notes: String,
            preferences: Preferences,
            color: PaletteColor,
-            location: ScreenLocation,
            callback: ListHabitsBehavior.CheckMarkDialogCallback,
        )
    }
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt
@@ -22,7 +22,6 @@ 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
@@ -34,8 +33,8 @@ import kotlin.math.min
 import kotlin.math.round

 interface OnDateClickedListener {
-    fun onDateShortPress(location: ScreenLocation, date: LocalDate) {}
-    fun onDateLongPress(location: ScreenLocation, date: LocalDate) {}
+    fun onDateShortPress(date: LocalDate) {}
+    fun onDateLongPress(date: LocalDate) {}
 }

 class HistoryChart(
@@ -91,11 +90,10 @@ 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(location, clickedDate)
+            onDateClickedListener.onDateLongPress(clickedDate)
        } else {
-            onDateClickedListener.onDateShortPress(location, clickedDate)
+            onDateClickedListener.onDateShortPress(clickedDate)
        }
    }

--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt
@@ -31,10 +31,8 @@ import junit.framework.Assert.assertTrue
 import org.apache.commons.io.FileUtils
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.core.IsEqual.equalTo
-import org.isoron.platform.gui.ScreenLocation
 import org.isoron.uhabits.core.BaseUnitTest
 import org.isoron.uhabits.core.models.Entry
-import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getToday
@@ -80,13 +78,10 @@ class ListHabitsBehaviorTest : BaseUnitTest() {

    @Test
    fun testOnEdit() {
-        behavior.onEdit(ScreenLocation(0.0, 0.0), habit2, getToday())
-        verify(screen).showNumberPicker(
+        behavior.onEdit(habit2, getToday())
+        verify(screen).showNumberPopup(
            eq(0.1),
-            eq("miles"),
            eq(""),
-            eq("Jan 25, 2015"),
-            eq(Frequency.DAILY),
            picker.capture()
        )
        picker.lastValue.onNumberPicked(100.0, "")
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/views/HistoryChartTest.kt
@@ -24,7 +24,6 @@ import com.nhaarman.mockitokotlin2.reset
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import kotlinx.coroutines.runBlocking
-import org.isoron.platform.gui.ScreenLocation
 import org.isoron.platform.gui.assertRenders
 import org.isoron.platform.time.DayOfWeek
 import org.isoron.platform.time.DayOfWeek.SUNDAY
@@ -90,32 +89,20 @@ class HistoryChartTest {

        // Click top left date
        view.onClick(20.0, 46.0)
-        verify(dateClickedListener).onDateShortPress(
-            ScreenLocation(20.0, 46.0),
-            LocalDate(2014, 10, 26)
-        )
+        verify(dateClickedListener).onDateShortPress(LocalDate(2014, 10, 26))
        reset(dateClickedListener)
        view.onClick(2.0, 28.0)
-        verify(dateClickedListener).onDateShortPress(
-            ScreenLocation(2.0, 28.0),
-            LocalDate(2014, 10, 26)
-        )
+        verify(dateClickedListener).onDateShortPress(LocalDate(2014, 10, 26))
        reset(dateClickedListener)

        // Click date in the middle
        view.onClick(163.0, 113.0)
-        verify(dateClickedListener).onDateShortPress(
-            ScreenLocation(163.0, 113.0),
-            LocalDate(2014, 12, 10)
-        )
+        verify(dateClickedListener).onDateShortPress(LocalDate(2014, 12, 10))
        reset(dateClickedListener)

        // Click today
        view.onClick(336.0, 37.0)
-        verify(dateClickedListener).onDateShortPress(
-            ScreenLocation(336.0, 37.0),
-            LocalDate(2015, 1, 25)
-        )
+        verify(dateClickedListener).onDateShortPress(LocalDate(2015, 1, 25))
        reset(dateClickedListener)

        // Click header
@@ -133,32 +120,20 @@ class HistoryChartTest {

        // Click top left date
        view.onLongClick(20.0, 46.0)
-        verify(dateClickedListener).onDateLongPress(
-            ScreenLocation(20.0, 46.0),
-            LocalDate(2014, 10, 26)
-        )
+        verify(dateClickedListener).onDateLongPress(LocalDate(2014, 10, 26))
        reset(dateClickedListener)
        view.onLongClick(2.0, 28.0)
-        verify(dateClickedListener).onDateLongPress(
-            ScreenLocation(2.0, 28.0),
-            LocalDate(2014, 10, 26)
-        )
+        verify(dateClickedListener).onDateLongPress(LocalDate(2014, 10, 26))
        reset(dateClickedListener)

        // Click date in the middle
        view.onLongClick(163.0, 113.0)
-        verify(dateClickedListener).onDateLongPress(
-            ScreenLocation(163.0, 113.0),
-            LocalDate(2014, 12, 10)
-        )
+        verify(dateClickedListener).onDateLongPress(LocalDate(2014, 12, 10))
        reset(dateClickedListener)

        // Click today
        view.onLongClick(336.0, 37.0)
-        verify(dateClickedListener).onDateLongPress(
-            ScreenLocation(336.0, 37.0),
-            LocalDate(2015, 1, 25)
-        )
+        verify(dateClickedListener).onDateLongPress(LocalDate(2015, 1, 25))
        reset(dateClickedListener)

        // Click header