Fix wrong calcuation for the restoring position of HSVColorPalette

Author: skydoves

colorpickerview/src/main/java/com/skydoves/colorpickerview/ColorHsvPalette.java

@@ -36,8 +36,8 @@
  */
 public class ColorHsvPalette extends BitmapDrawable {
 
-  private Paint huePaint;
-  private Paint saturationPaint;
+  private final Paint huePaint;
+  private final Paint saturationPaint;
 
   public ColorHsvPalette(Resources resources, Bitmap bitmap) {
     super(resources, bitmap);

colorpickerview/src/main/java/com/skydoves/colorpickerview/ColorPickerView.java

@@ -227,6 +227,20 @@ private void onFinishInflated() {
 
     if (getPreferenceName() != null) {
       preferenceManager.restoreColorPickerData(this);
+      final int persisted = preferenceManager.getColor(getPreferenceName(), -1);
+      if (palette.getDrawable() instanceof ColorHsvPalette && persisted != -1) {
+        post(
+            new Runnable() {
+              @Override
+              public void run() {
+                try {
+                  selectByHsvColor(persisted);
+                } catch (IllegalAccessException e) {
+                  e.printStackTrace();
+                }
+              }
+            });
+      }
     } else {
       selectCenter();
     }
@@ -643,8 +657,8 @@ public void setCoordinate(int x, int y) {
    */
   public void setInitialColor(@ColorInt final int color) {
     if (getPreferenceName() == null
-        || (getPreferenceName() != null)
-            && preferenceManager.getColor(getPreferenceName(), -1) == -1) {
+        || (getPreferenceName() != null
+            && preferenceManager.getColor(getPreferenceName(), -1) == -1)) {
       post(
           new Runnable() {
             @Override
@@ -691,8 +705,12 @@ public void selectByHsvColor(@ColorInt int color) throws IllegalAccessException
       selectedPureColor = color;
       selectedColor = color;
       selectedPoint = new Point(mappedPoint.x, mappedPoint.y);
-      if (getAlphaSlideBar() != null) getAlphaSlideBar().setSelectorPosition(getAlpha());
-      if (getBrightnessSlider() != null) getBrightnessSlider().setSelectorPosition(hsv[2]);
+      if (getAlphaSlideBar() != null) {
+        getAlphaSlideBar().setSelectorByHalfSelectorPosition(getAlpha());
+      }
+      if (getBrightnessSlider() != null) {
+        getBrightnessSlider().setSelectorByHalfSelectorPosition(hsv[2]);
+      }
       setCoordinate(mappedPoint.x, mappedPoint.y);
       fireColorListener(getColor(), false);
       notifyToFlagView(selectedPoint);

colorpickerview/src/main/java/com/skydoves/colorpickerview/preference/ColorPickerPreferenceManager.java

@@ -35,7 +35,7 @@ public class ColorPickerPreferenceManager {
   protected static final String AlphaSlider = "_SLIDER_ALPHA";
   protected static final String BrightnessSlider = "_SLIDER_BRIGHTNESS";
   private static ColorPickerPreferenceManager colorPickerPreferenceManager;
-  private SharedPreferences sharedPreferences;
+  private final SharedPreferences sharedPreferences;
 
   private ColorPickerPreferenceManager(Context context) {
     sharedPreferences =
@@ -49,8 +49,9 @@ private ColorPickerPreferenceManager(Context context) {
    * @return {@link ColorPickerPreferenceManager}.
    */
   public static ColorPickerPreferenceManager getInstance(Context context) {
-    if (colorPickerPreferenceManager == null)
+    if (colorPickerPreferenceManager == null) {
       colorPickerPreferenceManager = new ColorPickerPreferenceManager(context);
+    }
     return colorPickerPreferenceManager;
   }
 

colorpickerview/src/main/java/com/skydoves/colorpickerview/sliders/AbstractSlider.java

@@ -199,19 +199,28 @@ public void updateSelectorX(int x) {
 
   public void setSelectorPosition(@FloatRange(from = 0.0, to = 1.0) float selectorPosition) {
     this.selectorPosition = Math.min(selectorPosition, 1.0f);
-    float x = (getMeasuredWidth() * selectorPosition) - getSelectorHalfSize() - getBorderHalfSize();
+    float x = (getMeasuredWidth() * selectorPosition) - getSelectorSize() - getBorderHalfSize();
+    selectedX = (int) getBoundaryX(x);
+    selector.setX(selectedX);
+  }
+
+  public void setSelectorByHalfSelectorPosition(
+      @FloatRange(from = 0.0, to = 1.0) float selectorPosition) {
+    this.selectorPosition = Math.min(selectorPosition, 1.0f);
+    float x =
+        (getMeasuredWidth() * selectorPosition) - (getSelectorSize() * 0.5f) - getBorderHalfSize();
     selectedX = (int) getBoundaryX(x);
     selector.setX(selectedX);
   }
 
   private float getBoundaryX(float x) {
     int maxPos = getMeasuredWidth() - selector.getMeasuredWidth();
     if (x >= maxPos) return maxPos;
-    if (x <= getSelectorHalfSize()) return 0;
-    return x - getSelectorHalfSize();
+    if (x <= getSelectorSize()) return 0;
+    return x - getSelectorSize();
   }
 
-  protected int getSelectorHalfSize() {
+  protected int getSelectorSize() {
     return (int) (selector.getMeasuredWidth());
   }
 

colorpickerview/src/main/java/com/skydoves/colorpickerview/sliders/AlphaSlideBar.java

@@ -37,7 +37,7 @@
 public class AlphaSlideBar extends AbstractSlider {
 
   private Bitmap backgroundBitmap;
-  private AlphaTileDrawable drawable = new AlphaTileDrawable();
+  private final AlphaTileDrawable drawable = new AlphaTileDrawable();
 
   public AlphaSlideBar(Context context) {
     super(context);
@@ -112,7 +112,7 @@ public void onInflateFinished() {
       updateSelectorX(
           ColorPickerPreferenceManager.getInstance(getContext())
                   .getAlphaSliderPosition(getPreferenceName(), defaultPosition)
-              + getSelectorHalfSize());
+              + getSelectorSize());
     } else {
       selector.setX(defaultPosition);
     }

colorpickerview/src/main/java/com/skydoves/colorpickerview/sliders/BrightnessSlideBar.java

@@ -97,7 +97,7 @@ public void onInflateFinished() {
       updateSelectorX(
           ColorPickerPreferenceManager.getInstance(getContext())
                   .getBrightnessSliderPosition(getPreferenceName(), defaultPosition)
-              + getSelectorHalfSize());
+              + getSelectorSize());
     } else {
       selector.setX(defaultPosition);
     }