From 6c321aaa90a87113711faa5331a750ec29806150 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <giovanni.harting@touchdata.net>
Date: Thu, 17 Sep 2015 17:31:54 +0200
Subject: [PATCH] reactivating the stripe now sets the colorwheel's current
 color increased thickness of saturation and value bars

---
 .../com/idlegandalf/ledd/ColorActivity.java   | 22 +++++++++----------
 app/src/main/res/layout/activity_color.xml    |  6 +++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java b/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java
index 4d20ea3..4d91b61 100644
--- a/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java
+++ b/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java
@@ -85,7 +85,6 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
     private double per = 100.0;
     private double allowance = rate;
     private long last_check = System.currentTimeMillis();
-    private boolean isDisabled = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -112,11 +111,8 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
         colorPicker.setOnColorChangedListener(new ColorPicker.OnColorChangedListener() {
             @Override
             public void onColorChanged(int i) {
-                if (mCurrentStripe != null && mCurrentHelper != null && isRateAcceptable() && !isDisabled) {
-                    float[] hsv = new float[3];
-                    Color.colorToHSV(i, hsv);
-                    mCurrentStripe.setColor(new HSV(hsv[0], hsv[1], hsv[2]));
-                    mCurrentHelper.setColor(mCurrentStripe);
+                if (mCurrentStripe != null && mCurrentHelper != null && isRateAcceptable() && aSwitch.isChecked()) {
+                    setStripeFromColor(i);
                 }
             }
         });
@@ -193,10 +189,9 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
                 nHSV.setValue(0.0);
                 mCurrentStripe.setColor(nHSV);
                 mCurrentHelper.setColor(mCurrentStripe);
-                colorPicker.setColor(Color.HSVToColor(new float[]{(float) nHSV.getHue(), (float) nHSV.getSaturation(), (float) nHSV.getValue()}));
-                isDisabled = true;
+                //colorPicker.setColor(Color.HSVToColor(new float[]{(float) nHSV.getHue(), (float) nHSV.getSaturation(), (float) nHSV.getValue()}));
             } else {
-                isDisabled = false;
+                setStripeFromColor(colorPicker.getColor());
             }
         }
     }
@@ -363,10 +358,8 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
                         colorPicker.setColor(color);
                         if (cColor.getValue() == 0.0) {
                             aSwitch.setChecked(false);
-                            isDisabled = true;
                         } else {
                             aSwitch.setChecked(true);
-                            isDisabled = false;
                         }
                     }
                 });
@@ -401,6 +394,13 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
         }
     }
 
+    private void setStripeFromColor(int color) {
+        float[] hsv = new float[3];
+        Color.colorToHSV(color, hsv);
+        mCurrentStripe.setColor(new HSV(hsv[0], hsv[1], hsv[2]));
+        mCurrentHelper.setColor(mCurrentStripe);
+    }
+
     protected class refreshDaemonsListener extends BroadcastReceiver {
 
         @Override
diff --git a/app/src/main/res/layout/activity_color.xml b/app/src/main/res/layout/activity_color.xml
index e636bc1..a339d8c 100644
--- a/app/src/main/res/layout/activity_color.xml
+++ b/app/src/main/res/layout/activity_color.xml
@@ -63,13 +63,15 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:layout_marginTop="15dp"/>
+            android:layout_marginTop="15dp"
+            app:bar_thickness="15dp"/>
 
         <com.larswerkman.holocolorpicker.ValueBar
             android:id="@+id/valuebar"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"/>
+            android:layout_margin="10dp"
+            app:bar_thickness="15dp"/>
 
     </LinearLayout>