Improved valuebar, added drawing for min and max.

PhilJay · Oct 24, 2014 · 42f68cc · 42f68cc
1 parent e7e3888
commit 42f68cc
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 82 deletions.
diff --git a/ValueBarExample/libs/valuebarlibrary-1-0-0.jar b/ValueBarExample/libs/valuebarlibrary-1-0-0.jar
diff --git a/ValueBarExample/project.properties b/ValueBarExample/project.properties
@@ -12,4 +12,3 @@
 
 # Project target.
 target=android-20
-android.library.reference.1=../ValueBarLib
diff --git a/ValueBarExample/res/layout/activity_main.xml b/ValueBarExample/res/layout/activity_main.xml
@@ -3,40 +3,56 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="40dp"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="40dp"
     tools:context="com.philjay.valuebar.MainActivity" >
 
     <com.philjay.valuebar.ValueBar
         android:id="@+id/valueBar1"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
         android:layout_weight="1" />
 
     <com.philjay.valuebar.ValueBar
         android:id="@+id/valueBar2"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
         android:layout_weight="1" />
 
     <com.philjay.valuebar.ValueBar
         android:id="@+id/valueBar3"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
         android:layout_weight="1" />
 
     <com.philjay.valuebar.ValueBar
         android:id="@+id/valueBar4"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
         android:layout_weight="1" />
 
     <com.philjay.valuebar.ValueBar
         android:id="@+id/valueBar5"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="5dp"
         android:layout_weight="1" />
 
 </LinearLayout>
diff --git a/ValueBarExample/res/menu/main.xml b/ValueBarExample/res/menu/main.xml
@@ -11,5 +11,13 @@
         android:id="@+id/animDown"
         android:orderInCategory="100"
         android:title="Animate Down"/>
+    <item
+        android:id="@+id/toggleMinMaxLabel"
+        android:orderInCategory="100"
+        android:title="Toggle MinMax Label"/>
+    <item
+        android:id="@+id/toggleValueLabel"
+        android:orderInCategory="100"
+        android:title="Toggle Value Label"/>
 
 </menu>
diff --git a/ValueBarExample/src/com/philjay/valuebarexample/MainActivity.java b/ValueBarExample/src/com/philjay/valuebarexample/MainActivity.java
@@ -36,10 +36,9 @@ private void setup() {
             bar.setMinMax(0, 1000);
             bar.animate(0, 900, 1500);
             bar.setDrawBorder(false);
-            bar.setOffset(3);
             bar.setValueBarSelectionListener(this);
             bar.setColorFormatter(new RedToGreenFormatter());
-//            bar.setColor(Color.BLUE);
+            // bar.setColor(Color.BLUE);
         }
     }
 
@@ -48,23 +47,39 @@ private void animateUp() {
         for (ValueBar bar : mValueBars)
             bar.animateUp(800, 1500);
     }
-    
+
     private void animateDown() {
 
         for (ValueBar bar : mValueBars)
             bar.animateDown(0, 1500);
     }
-
+
+    private void toggleMinMaxLabel() {
+
+        for (ValueBar bar : mValueBars) {
+            bar.setDrawMinMaxText(bar.isDrawMinMaxTextEnabled() ? false : true);
+            bar.invalidate();
+        }
+    }
+
+    private void toggleValueLabel() {
+
+        for (ValueBar bar : mValueBars) {
+            bar.setDrawValueText(bar.isDrawValueTextEnabled() ? false : true);
+            bar.invalidate();
+        }
+    }
+
     @Override
     public void onSelectionUpdate(float val, float maxval, float minval, ValueBar bar) {
         Log.i("ValueBar", "Value selection update: " + val);
     }
-    
+
     @Override
     public void onValueSelected(float val, float maxval, float minval, ValueBar bar) {
         Log.i("ValueBar", "Value selected: " + val);
     }
-    
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.main, menu);
@@ -73,14 +88,20 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        
-        switch(item.getItemId()) {
+
+        switch (item.getItemId()) {
             case R.id.animUp:
                 animateUp();
                 break;
             case R.id.animDown:
                 animateDown();
                 break;
+            case R.id.toggleMinMaxLabel:
+                toggleMinMaxLabel();
+                break;
+            case R.id.toggleValueLabel:
+                toggleValueLabel();
+                break;
         }
 
         return super.onOptionsItemSelected(item);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@

		# Project target.
		target=android-20
		android.library.reference.1=../ValueBarLib