Merge pull request #2 from OpenCraft/feature-regra

Feature regra
OpenCraft · Jan 10, 2018 · 5bbce6c · 5bbce6c
2 parents bec3aed + a891c6d
commit 5bbce6c
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 18 deletions.
diff --git a/verticalseekbarlib/src/main/java/opencraft/com/verticalseekbarlib/VerticalSeekBar.java b/verticalseekbarlib/src/main/java/opencraft/com/verticalseekbarlib/VerticalSeekBar.java
@@ -17,10 +17,18 @@
 public class VerticalSeekBar extends RelativeLayout {
 
     LayoutInflater inflater;
-    View layoutView, verticalSeekBarBackground, verticalSeekBarThumb;
+    View layoutView;
+    View verticalSeekBarBackground;
+    View verticalSeekBarThumb;
     VerticalSeekBarListener listener;
     float dY = 0;
-    int marginTop = 0, valor = 0, step = 0, calculatedValue = 0;
+    int marginTop = 0;
+    int value = 0;
+    int maxValue = 0;
+    int step = 0;
+    int calculatedValue = 0;
+    final int DEFAULT_VALUE = 500;
+    final int DEFAULT_STEP = 25;
 
     public VerticalSeekBar(Context context) {
         super(context);
@@ -49,15 +57,20 @@ private void loadCustomAttrs(Context context, AttributeSet attrs) {
         loadThumbAttr(attributes);
         loadValueAttr(attributes);
         loadStepAttr(attributes);
+        loadMaxValueAttr(attributes);
         setupBackgroundMarginTopAttr(attributes);
     }
 
     private void loadValueAttr(TypedArray attributes) {
-        valor = attributes.getInteger(R.styleable.VerticalSeekBar_seekbar_value, 500);
+        value = attributes.getInteger(R.styleable.VerticalSeekBar_seekbar_value, DEFAULT_VALUE);
     }
 
     private void loadStepAttr(TypedArray attributes) {
-        step = attributes.getInteger(R.styleable.VerticalSeekBar_seekbar_step, 25);
+        step = attributes.getInteger(R.styleable.VerticalSeekBar_seekbar_step, DEFAULT_STEP);
+    }
+
+    private void loadMaxValueAttr(TypedArray attributes) {
+        maxValue = attributes.getInteger(R.styleable.VerticalSeekBar_seekbar_max_value, 0);
     }
 
     private void loadBackgroundAttr(TypedArray attributes) {
@@ -84,7 +97,7 @@ private void addThumbTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent event) {
 
-                int interations = valor / step;
+                int interations = value / step;
                 int heightArea = getHeight() - marginTop;
                 int pixelNumberToInteraction = heightArea / interations;
 
@@ -97,14 +110,20 @@ public boolean onTouch(View view, MotionEvent event) {
                     case MotionEvent.ACTION_MOVE: {
                         float wantedY = event.getRawY() + dY;
                         int multiplier = (int) wantedY / pixelNumberToInteraction;
-                        calculatedValue = valor - (multiplier * step);
-
-                        handleIfHitTop(wantedY);
-                        handleIfHitBottom(heightArea, wantedY);
-                        handleIfIsBetweenTopAndBottom(heightArea, wantedY);
-
-                        if (listener != null)
-                            listener.onValueChanged(calculatedValue);
+                        calculatedValue = value - (multiplier * step);
+                        int interationsToGetMaxValue = maxValue / step;
+                        float maxValueY = interationsToGetMaxValue * pixelNumberToInteraction;
+
+                        if (wantedY <= maxValueY || maxValueY == 0) {
+                            handleIfHitTop(wantedY);
+                            handleIfHitBottom(heightArea, wantedY);
+                            handleIfIsBetweenTopAndBottom(heightArea, wantedY);
+
+                            callOnValueChanged(calculatedValue);
+                        } else {
+                            callOnValueChanged(maxValue);
+                            setYPosition(maxValueY, maxValueY - marginTop);
+                        }
                         break;
                     }
                     default:
@@ -115,15 +134,14 @@ public boolean onTouch(View view, MotionEvent event) {
         });
     }
 
-    public void setVerticalSeekBarListener(VerticalSeekBarListener verticalSeekBarListener) {
-        listener = verticalSeekBarListener;
+    private void callOnValueChanged(float value) {
+        if (listener != null)
+            listener.onValueChanged(value);
     }
 
     private void handleIfIsBetweenTopAndBottom(int heightArea, float wantedY) {
         if (wantedY > marginTop && wantedY <= heightArea) {
             setYPosition(wantedY, wantedY - marginTop);
-            verticalSeekBarBackground.setY(wantedY);
-            verticalSeekBarThumb.setY(wantedY - marginTop);
         }
     }
 
@@ -137,7 +155,7 @@ private void handleIfHitBottom(int heightArea, float wantedY) {
     private void handleIfHitTop(float wantedY) {
         if (wantedY < marginTop) {
             setYPosition(marginTop, 0);
-            calculatedValue = valor;
+            calculatedValue = value;
         }
     }
 
@@ -146,4 +164,19 @@ private void setYPosition(float yBackground, float yThumb) {
         verticalSeekBarThumb.setY(yThumb);
     }
 
+    public void setVerticalSeekBarListener(VerticalSeekBarListener verticalSeekBarListener) {
+        listener = verticalSeekBarListener;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public void setMaxValue(int maxValue) {
+        this.maxValue = maxValue;
+    }
+
+    public void setStep(int step) {
+        this.step = step;
+    }
 }
diff --git a/verticalseekbarlib/src/main/res/values/attrs.xml b/verticalseekbarlib/src/main/res/values/attrs.xml
@@ -6,6 +6,7 @@
         <attr name="seekbar_thumb" format="reference" />
         <attr name="seekbar_step" format="integer" />
         <attr name="seekbar_value" format="integer" />
+        <attr name="seekbar_max_value" format="integer" />
     </declare-styleable>
 
 </resources>