fixed values

OpenCraft · Jan 15, 2018 · 236b247 · 236b247
1 parent 531fb51
commit 236b247
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/app/src/main/java/opencraft/com/verticalseekbar/MainActivity.kt b/app/src/main/java/opencraft/com/verticalseekbar/MainActivity.kt
@@ -8,6 +8,8 @@ import opencraft.com.verticalseekbarlib.VerticalSeekBarListener
 
 class MainActivity : AppCompatActivity() {
 
+    var animationStoped = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -16,9 +18,12 @@ class MainActivity : AppCompatActivity() {
             override fun onAnimationStop(thumbY: Float, backgroundY: Float) {
                 balloon.y = thumbY - 15
                 balloon.visibility = View.VISIBLE
+                animationStoped = true
             }
 
             override fun onYPositionChanged(thumbY: Float, backgroundY: Float) {
+                if (animationStoped)
+                    balloon.visibility = View.GONE
                 background_top.y = backgroundY + top.height - 10
             }
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -21,12 +21,7 @@
         android:layout_height="wrap_content" />
 
 
-    <TextView
-        android:id="@+id/text_bottom"
-        android:text="500"
-        android:layout_alignParentBottom="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+
 
     <ImageView
         android:id="@+id/background_top"
@@ -53,6 +48,7 @@
         app:seekbar_thumbMarginTop="-25dp"
         app:seekbar_thumb="@drawable/check_on"
         app:seekbar_value="5000"
+        app:seekbar_max_value="2500"
         app:seekbar_step="25" />
 
     <View
@@ -62,5 +58,11 @@
         android:layout_alignParentBottom="true"
         android:background="@color/colorPrimary" />
 
+    <TextView
+        android:id="@+id/text_bottom"
+        android:text="500"
+        android:layout_alignParentBottom="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
 </RelativeLayout>
diff --git a/verticalseekbarlib/src/main/java/opencraft/com/verticalseekbarlib/VerticalSeekBar.java b/verticalseekbarlib/src/main/java/opencraft/com/verticalseekbarlib/VerticalSeekBar.java
@@ -169,11 +169,11 @@ private void animateViews(float wantedY) {
             callOnValueChanged(calculatedValue);
         } else {
             if (wantedY >= maxValueY) {
-                callOnValueChanged(maxValue);
+                callOnValueChanged(value == maxValue ? 0 : maxValue);
                 setYPosition(maxValueY, maxValueY);
             }
             if (wantedY <= 0) {
-                callOnValueChanged(0);
+                callOnValueChanged(value);
                 setYPosition(0, 0);
             }
         }