Brand new focuser and mount controllers, bug fixing

Author: marcocipriani01

.idea/assetWizardSettings.xml

@@ -155,7 +155,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
      */
     private class DevicesPagerAdapter extends ArrayPagerAdapter<Fragment> {
 
-        DevicesPagerAdapter(FragmentManager fragmentManager, List<PageDescriptor> descriptors) {
+        private DevicesPagerAdapter(FragmentManager fragmentManager, List<PageDescriptor> descriptors) {
             super(fragmentManager, descriptors);
         }
 
@@ -180,13 +180,13 @@ private class DevicePageDescriptor extends SimplePageDescriptor {
 
         private final INDIDevice device;
 
-        DevicePageDescriptor(INDIDevice device) {
+        private DevicePageDescriptor(INDIDevice device) {
             super(device.getName() + c, device.getName());
             c++;
             this.device = device;
         }
 
-        INDIDevice getDevice() {
+        private INDIDevice getDevice() {
             return device;
         }
     }

.idea/caches/build_file_checksums.ser

@@ -1,58 +1,27 @@
 package org.indilib.i4j.iparcos;
 
-import android.os.Handler;
-import android.view.MotionEvent;
 import android.view.View;
 
 /**
  * @author Noman Rafique
  * @author marcocipriani01
  * @see <a href="https://stackoverflow.com/a/41466381">Continuously increase integer value as the button is pressed</a>
  */
-public class CounterHandler {
+public class CounterHandler extends LongPressHandler {
 
-    private final Handler handler = new Handler();
-    private final View incrementalView;
-    private final View decrementalView;
     private final int steps;
-    private final long delay;
     private final boolean isCycle;
+    private final CounterListener listener;
     private int minValue;
     private int maxValue;
     private int currentValue;
-    private boolean autoIncrement = false;
-    private boolean autoDecrement = false;
-    private CounterListener listener;
 
-    private final Runnable counterRunnable = new Runnable() {
-        @Override
-        public void run() {
-            if (autoIncrement) {
-                increment();
-                handler.postDelayed(this, delay);
-
-            } else if (autoDecrement) {
-                decrement();
-                handler.postDelayed(this, delay);
-            }
-        }
-    };
-
-    public CounterHandler(View incrementalView, View decrementalView, int minValue,
+    public CounterHandler(View incrementView, View decrementView, int minValue,
                           int maxValue, int initialValue, int steps,
                           long delay, boolean isCycle, CounterListener listener) {
-        this(incrementalView, decrementalView, minValue, maxValue, initialValue, steps, delay, isCycle, listener, true);
-    }
-
-    public CounterHandler(View incrementalView, View decrementalView, int minValue,
-                          int maxValue, int initialValue, int steps,
-                          long delay, boolean isCycle, CounterListener listener, boolean setNow) {
-        if ((minValue != -1) && (maxValue != -1)) {
-            if (maxValue <= minValue) {
-                throw new IllegalArgumentException("Max value < min value!");
-            } else if (minValue >= maxValue) {
-                throw new IllegalArgumentException("Min value > max value!");
-            }
+        super(incrementView, decrementView, delay);
+        if ((minValue != -1) && (maxValue != -1) && (minValue >= maxValue)) {
+            throw new IllegalArgumentException("Counter bound error!");
         }
         this.minValue = minValue;
         this.maxValue = maxValue;
@@ -61,53 +30,8 @@ public CounterHandler(View incrementalView, View decrementalView, int minValue,
         }
         this.currentValue = initialValue;
         this.steps = steps;
-        this.delay = delay;
         this.isCycle = isCycle;
-        this.incrementalView = incrementalView;
-        this.decrementalView = decrementalView;
         this.listener = listener;
-
-        this.decrementalView.setOnClickListener(v -> decrement());
-        this.decrementalView.setOnLongClickListener(v -> {
-            autoDecrement = true;
-            handler.postDelayed(counterRunnable, CounterHandler.this.delay);
-            return false;
-        });
-        this.decrementalView.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_UP && autoDecrement) {
-                autoDecrement = false;
-            }
-            return false;
-        });
-
-        this.incrementalView.setOnClickListener(v -> increment());
-        this.incrementalView.setOnLongClickListener(v -> {
-            autoIncrement = true;
-            handler.postDelayed(counterRunnable, CounterHandler.this.delay);
-            return false;
-        });
-        this.incrementalView.setOnTouchListener((v, event) -> {
-            if (event.getAction() == MotionEvent.ACTION_UP && autoIncrement) {
-                autoIncrement = false;
-            }
-            return false;
-        });
-
-        if (this.listener != null && setNow) {
-            this.listener.onIncrement(this.incrementalView, this.currentValue);
-            this.listener.onDecrement(this.decrementalView, this.currentValue);
-        }
-    }
-
-    public void stop() {
-        listener = null;
-        autoDecrement = autoIncrement = false;
-        incrementalView.setOnClickListener(null);
-        incrementalView.setOnLongClickListener(null);
-        incrementalView.setOnTouchListener(null);
-        decrementalView.setOnClickListener(null);
-        decrementalView.setOnLongClickListener(null);
-        decrementalView.setOnTouchListener(null);
     }
 
     public int getValue() {
@@ -117,10 +41,8 @@ public int getValue() {
     public void setValue(int newValue) {
         if ((maxValue != -1) && (newValue > maxValue)) {
             currentValue = maxValue;
-
         } else if ((minValue != -1) && (newValue < minValue)) {
             currentValue = minValue;
-
         } else {
             currentValue = newValue;
         }
@@ -131,31 +53,24 @@ public void setMaxValue(int maxValue) {
             throw new IllegalArgumentException("Max value < min value!");
         }
         this.maxValue = maxValue;
-        if (currentValue > this.maxValue) {
-            currentValue = this.maxValue;
-        }
+        if (currentValue > this.maxValue) currentValue = this.maxValue;
     }
 
     public void setMinValue(int minValue) {
-        if (minValue >= maxValue) {
-            throw new IllegalArgumentException("Min value > max value!");
-        }
+        if (minValue >= maxValue) throw new IllegalArgumentException("Min value > max value!");
         this.minValue = minValue;
-        if (currentValue < this.minValue) {
-            currentValue = this.minValue;
-        }
+        if (currentValue < this.minValue) currentValue = this.minValue;
     }
 
-    private void increment() {
+    @Override
+    protected void increment() {
         int number = this.currentValue;
         if (maxValue != -1) {
             if (number + steps <= maxValue) {
                 number += steps;
-
             } else if (isCycle) {
                 number = minValue == -1 ? 0 : minValue;
             }
-
         } else {
             number += steps;
         }
@@ -165,16 +80,15 @@ private void increment() {
         }
     }
 
-    private void decrement() {
+    @Override
+    protected void decrement() {
         int number = this.currentValue;
         if (minValue != -1) {
             if (number - steps >= minValue) {
                 number -= steps;
-
             } else if (isCycle) {
                 number = maxValue == -1 ? 0 : maxValue;
             }
-
         } else {
             number -= steps;
         }
@@ -185,7 +99,6 @@ private void decrement() {
     }
 
     public interface CounterListener {
-
         void onIncrement(View view, int number);
 
         void onDecrement(View view, int number);