A few more touches

liutikas · Oct 10, 2016 · 7167f9c · 7167f9c
1 parent 8f341ef
commit 7167f9c
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 12 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/stepperwidget/src/main/java/net/liutikas/widget/StepperWidget.java b/stepperwidget/src/main/java/net/liutikas/widget/StepperWidget.java
@@ -5,18 +5,27 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * A simple widget that will allow users to step up and step down a number and a number will animate
  * as user presses the plus and minus buttons.
  */
 public class StepperWidget extends LinearLayout {
+    public interface OnUpdateListener {
+        void onUpdate(int oldValue, int newValue);
+    }
+
+    private final int mLabelHeight;
     private final ImageButton mPlusButton;
     private final ImageButton mMinusButton;
     private final TextView mLabelOne;
@@ -25,6 +34,7 @@ public class StepperWidget extends LinearLayout {
     private int mCounter = 0;
     private int mChange = 0;
 
+    private List<OnUpdateListener> mListeners;
     private int mMin = Integer.MIN_VALUE;
     private int mMax = Integer.MAX_VALUE;
 
@@ -47,6 +57,8 @@ public StepperWidget(Context context, AttributeSet attrs, int defStyleAttr) {
         mMinusButton = (ImageButton) findViewById(R.id.minus);
         mLabelOne = (TextView) findViewById(R.id.label1);
         mLabelTwo = (TextView) findViewById(R.id.label2);
+        mLabelHeight =
+                context.getResources().getDimensionPixelSize(R.dimen.stepper_widget_label_height);
         mPlusButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -62,6 +74,7 @@ public void onClick(View view) {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.HONEYCOMB) {
             initalizeAnimator();
         }
+        mListeners = new ArrayList<>();
         updateLabel(0);
     }
 
@@ -85,6 +98,14 @@ public void setMin(int min) {
         updateLabel(0);
     }
 
+    public void addOnUpdateListener(OnUpdateListener listener) {
+        mListeners.add(listener);
+    }
+
+    public void removeOnUpdateListener(OnUpdateListener listener) {
+        mListeners.remove(listener);
+    }
+
     /**
      * @return The value that the user has currently chosen using this widget.
      */
@@ -104,11 +125,11 @@ public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 if (mChange == 0) {
                     // Do nothing
                 } else if (mChange < 0) {
-                    getEnteringLabel().setTranslationY(100 - value);
-                    getLeavingLabel().setTranslationY(-value);
+                    getEnteringLabel().setTranslationY((100 - value) * mLabelHeight / 100f);
+                    getLeavingLabel().setTranslationY(-value * mLabelHeight / 100f);
                 } else {
-                    getEnteringLabel().setTranslationY(-100 + value);
-                    getLeavingLabel().setTranslationY(value);
+                    getEnteringLabel().setTranslationY((-100 + value) * mLabelHeight / 100f);
+                    getLeavingLabel().setTranslationY(value * mLabelHeight / 100f);
                 }
             }
         });
@@ -141,9 +162,9 @@ public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 if (mChange == 0) {
                     // Do nothing.
                 } else if (mChange < 0) {
-                    getLeavingLabel().setTranslationY(-value);
+                    getLeavingLabel().setTranslationY(-value * mLabelHeight / 100f);
                 } else {
-                    getLeavingLabel().setTranslationY(value);
+                    getLeavingLabel().setTranslationY(value * mLabelHeight / 100f);
                 }
             }
         });
@@ -175,11 +196,17 @@ private void updateLabel(int change) {
                 updateLabelVisibility(mLabelOneVisible);
                 bounceLabelAnimated(change);
             } else {
+                for (OnUpdateListener listener : mListeners) {
+                    listener.onUpdate(mCounter - change, mCounter);
+                }
                 switchLabelAnimated(change);
             }
-            return;
+        } else {
+            updateLabelVisibility(!mLabelOneVisible);
+            for (OnUpdateListener listener : mListeners) {
+                listener.onUpdate(mCounter - change, mCounter);
+            }
         }
-        updateLabelVisibility(!mLabelOneVisible);
     }
 
     private void updateLabelVisibility(boolean labelOneVisible) {

diff --git a/stepperwidget/src/main/res/drawable/bg_add.xml b/stepperwidget/src/main/res/drawable/bg_add.xml
@@ -8,7 +8,7 @@
                 android:topRightRadius="10dp"
                 android:bottomLeftRadius="0dp"
                 android:bottomRightRadius="0dp" />
-            <solid android:color="#8c008c" />
+            <solid android:color="#FF4081" />
         </shape>
     </item>
     <item>

diff --git a/stepperwidget/src/main/res/drawable/bg_remove.xml b/stepperwidget/src/main/res/drawable/bg_remove.xml
@@ -8,7 +8,7 @@
                 android:topRightRadius="0dp"
                 android:bottomLeftRadius="10dp"
                 android:bottomRightRadius="10dp" />
-            <solid android:color="#8c008c" />
+            <solid android:color="#FF4081" />
         </shape>
     </item>
     <item>

diff --git a/stepperwidget/src/main/res/layout/stepper.xml b/stepperwidget/src/main/res/layout/stepper.xml
@@ -7,7 +7,7 @@
         android:src="@drawable/ic_add"
         android:background="@drawable/bg_add"/>
     <FrameLayout android:layout_width="56dp"
-        android:layout_height="44dp">
+        android:layout_height="@dimen/stepper_widget_label_height">
         <TextView
             android:id="@+id/label1"
             android:layout_width="48dp"

diff --git a/stepperwidget/src/main/res/values/dimens.xml b/stepperwidget/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="stepper_widget_label_height">44dp</dimen>
+</resources>