From 90e9350f6bd454d8fb3528442e609d1232630ea9 Mon Sep 17 00:00:00 2001
From: Andries Smit <mr.andries.smit@gmail.com>
Date: Wed, 12 Jan 2022 17:17:43 +0100
Subject: [PATCH] Wear: make rotarty input plus minus dynamic

---
 .../interaction/utils/PlusMinusEditText.java  | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.java b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.java
index 54780c83ac..b85f09a8c6 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.java
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/PlusMinusEditText.java
@@ -3,19 +3,20 @@ package info.nightscout.androidaps.interaction.utils;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.wearable.input.RotaryEncoder;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.core.view.InputDeviceCompat;
+import androidx.core.view.MotionEventCompat;
+
 import java.text.NumberFormat;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-
 /**
  * Created by mike on 28.06.2016.
  */
@@ -35,6 +36,12 @@ public class PlusMinusEditText implements View.OnKeyListener,
     boolean allowZero = false;
     boolean roundRobin;
 
+    private int mChangeCounter = 0;
+    private long mLastChange = 0;
+    private final static int THRESHOLD_COUNTER = 5;
+    private final static int THRESHOLD_COUNTER_LONG = 10;
+    private final static int THRESHOLD_TIME = 100;
+
     private final Handler mHandler;
     private ScheduledExecutorService mUpdater;
 
@@ -68,7 +75,7 @@ public class PlusMinusEditText implements View.OnKeyListener,
     private static final int MSG_DEC = 1;
 
     public PlusMinusEditText(View view, int editTextID, int plusID, int minusID, Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero) {
-        this( view,  editTextID,  plusID,  minusID,  initValue,  minValue,  maxValue,  step,  formater,  allowZero, false);
+        this(view, editTextID, plusID, minusID, initValue, minValue, maxValue, step, formater, allowZero, false);
     }
 
     public PlusMinusEditText(View view, int editTextID, int plusID, int minusID, Double initValue, Double minValue, Double maxValue, Double step, NumberFormat formater, boolean allowZero, boolean roundRobin) {
@@ -121,10 +128,11 @@ public class PlusMinusEditText implements View.OnKeyListener,
     public void setStep(Double step) {
         this.step = step;
     }
+
     private void inc(int multiplier) {
         value += step * multiplier;
         if (value > maxValue) {
-            if(roundRobin){
+            if (roundRobin) {
                 value = minValue;
             } else {
                 value = maxValue;
@@ -134,10 +142,10 @@ public class PlusMinusEditText implements View.OnKeyListener,
         updateEditText();
     }
 
-    private void dec( int multiplier) {
+    private void dec(int multiplier) {
         value -= step * multiplier;
         if (value < minValue) {
-            if(roundRobin){
+            if (roundRobin) {
                 value = maxValue;
             } else {
                 value = minValue;
@@ -211,13 +219,21 @@ public class PlusMinusEditText implements View.OnKeyListener,
 
     @Override
     public boolean onGenericMotion(View v, MotionEvent ev) {
-        if (ev.getAction() == MotionEvent.ACTION_SCROLL && RotaryEncoder.isFromRotaryEncoder(ev)) {
-            float delta = -RotaryEncoder.getRotaryAxisValue(ev);
+        if (ev.getAction() == MotionEvent.ACTION_SCROLL && ev.isFromSource(InputDeviceCompat.SOURCE_ROTARY_ENCODER)) {
+            long now = System.currentTimeMillis();
+            if (now - mLastChange > THRESHOLD_TIME) mChangeCounter = 0;
+
+            int dynamicMultiplier = mChangeCounter < THRESHOLD_COUNTER ? 1 :
+                    mChangeCounter < THRESHOLD_COUNTER_LONG ? 2 : 4;
+
+            float delta = -ev.getAxisValue(MotionEventCompat.AXIS_SCROLL);
             if (delta > 0) {
-                inc(1);
+                inc(dynamicMultiplier);
             } else {
-                dec(1);
+                dec(dynamicMultiplier);
             }
+            mLastChange = System.currentTimeMillis();
+            mChangeCounter++;
             return true;
         }
         return false;