From f1d9a019dd1f643b120555ca5217dbbe62358281 Mon Sep 17 00:00:00 2001
From: Jake Powell <jakedp7@gmail.com>
Date: Thu, 17 May 2018 17:02:38 -0400
Subject: [PATCH] Increment and decrement gestures from HabitList

---
 .../habits/list/views/HabitCardView.kt        |  8 ++++++++
 .../habits/list/views/NumberButtonView.kt     | 12 ++++++-----
 .../habits/list/views/NumberPanelView.kt      | 14 +++++++++++++
 .../habits/list/ListHabitsBehavior.java       | 20 +++++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
index f6adfcc16..75ec8da31 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt
@@ -129,6 +129,14 @@ class HabitCardView(
 
         numberPanel = numberPanelFactory.create().apply {
             visibility = GONE
+            onIncrement = { timestamp ->
+                triggerRipple(timestamp)
+                habit?.let { behavior.onIncrement(it, timestamp)}
+            }
+            onDecrement = { timestamp ->
+                triggerRipple(timestamp)
+                habit?.let { behavior.onDecrement(it, timestamp)}
+            }
             onEdit = { timestamp ->
                 triggerRipple(timestamp)
                 habit?.let { behavior.onEdit(it, timestamp) }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
index 411300ab9..81b8cdd63 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.kt
@@ -81,6 +81,8 @@ class NumberButtonView(
             invalidate()
         }
 
+    var onIncrement: () -> Unit = {}
+    var onDecrement: () -> Unit = {}
     var onEdit: () -> Unit = {}
     private var drawer: Drawer = Drawer(context)
     private val detector: GestureDetector = GestureDetector(
@@ -90,19 +92,19 @@ class NumberButtonView(
                 override fun onDown(e: MotionEvent?): Boolean = true
 
                 override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {
-                    Log.d("YOUREIT", "onSingleTapConfirmed")
-                    if (preferences.isShortToggleEnabled) onEdit()
-                    else showMessage(R.string.long_press_to_edit)
+                    onIncrement()
+                    performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                     return true
                 }
 
                 override fun onDoubleTap(e: MotionEvent?): Boolean {
-                    Log.d("YOUREIT", "onDoubleTap")
+                    onDecrement()
+                    performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                     return true
                 }
 
                 override fun onLongPress(e: MotionEvent?) {
-                    Log.d("YOUREIT", "onLongPress")
+                    performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                     onEdit()
                 }
             })
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
index 81b082209..e103e8db8 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelView.kt
@@ -57,6 +57,18 @@ class NumberPanelView(
             setupButtons()
         }
 
+    var onIncrement: (Timestamp) -> Unit = {}
+        set(value) {
+            field = value
+            setupButtons()
+        }
+
+    var onDecrement: (Timestamp) -> Unit = {}
+        set(value) {
+            field = value
+            setupButtons()
+        }
+
     var onEdit: (Timestamp) -> Unit = {}
         set(value) {
             field = value
@@ -78,6 +90,8 @@ class NumberPanelView(
             button.color = color
             button.threshold = threshold
             button.units = units
+            button.onIncrement = { onIncrement(timestamp) }
+            button.onDecrement = { onDecrement(timestamp) }
             button.onEdit = { onEdit(timestamp) }
         }
     }
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
index 45dcc18f1..87b3608b0 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.java
@@ -78,6 +78,26 @@ public class ListHabitsBehavior
         screen.showHabitScreen(h);
     }
 
+    public void onIncrement(@NonNull Habit habit, Timestamp timestamp)
+    {
+        CheckmarkList checkmarks = habit.getCheckmarks();
+        double oldValue = checkmarks.getValues(timestamp, timestamp)[0];
+        commandRunner.execute(
+                new CreateRepetitionCommand(habit, timestamp, (int)(oldValue + 1000)),
+                habit.getId());
+    }
+
+    public void onDecrement(@NonNull Habit habit, Timestamp timestamp)
+    {
+        CheckmarkList checkmarks = habit.getCheckmarks();
+        double oldValue = checkmarks.getValues(timestamp, timestamp)[0];
+        double newValue = oldValue - 1000;
+        if (newValue < 0) return;
+        commandRunner.execute(
+                new CreateRepetitionCommand(habit, timestamp, (int)newValue),
+                habit.getId());
+    }
+
     public void onEdit(@NonNull Habit habit, Timestamp timestamp)
     {
         CheckmarkList checkmarks = habit.getCheckmarks();