Merge pull request #72 from skydoves/update/notifyToFlagView

Update : notify to flag view

Author: skydoves

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

@@ -87,10 +87,12 @@ public class ColorPickerView extends FrameLayout implements LifecycleObserver {
   private ActionMode actionMode = ActionMode.ALWAYS;
 
   @FloatRange(from = 0.0, to = 1.0)
-  private float alpha_selector = 1.0f;
+  private float selector_alpha = 1.0f;
 
   @FloatRange(from = 0.0, to = 1.0)
-  private float alpha_flag = 1.0f;
+  private float flag_alpha = 1.0f;
+
+  private boolean flag_isFlipAble = true;
 
   @Px private int selectorSize = 0;
 
@@ -135,16 +137,20 @@ private void getAttrs(AttributeSet attrs) {
           this.selectorDrawable = AppCompatResources.getDrawable(getContext(), resourceId);
         }
       }
-      if (a.hasValue(R.styleable.ColorPickerView_alpha_selector)) {
-        this.alpha_selector =
-            a.getFloat(R.styleable.ColorPickerView_alpha_selector, alpha_selector);
+      if (a.hasValue(R.styleable.ColorPickerView_selector_alpha)) {
+        this.selector_alpha =
+            a.getFloat(R.styleable.ColorPickerView_selector_alpha, selector_alpha);
       }
       if (a.hasValue(R.styleable.ColorPickerView_selector_size)) {
         this.selectorSize =
             a.getDimensionPixelSize(R.styleable.ColorPickerView_selector_size, selectorSize);
       }
-      if (a.hasValue(R.styleable.ColorPickerView_alpha_flag)) {
-        this.alpha_flag = a.getFloat(R.styleable.ColorPickerView_alpha_flag, alpha_flag);
+      if (a.hasValue(R.styleable.ColorPickerView_flag_alpha)) {
+        this.flag_alpha = a.getFloat(R.styleable.ColorPickerView_flag_alpha, flag_alpha);
+      }
+      if (a.hasValue(R.styleable.ColorPickerView_flag_isFlipAble)) {
+        this.flag_isFlipAble =
+            a.getBoolean(R.styleable.ColorPickerView_flag_isFlipAble, flag_isFlipAble);
       }
       if (a.hasValue(R.styleable.ColorPickerView_actionMode)) {
         int actionMode = a.getInteger(R.styleable.ColorPickerView_actionMode, 0);
@@ -193,7 +199,7 @@ private void onCreate() {
     }
     selectorParam.gravity = Gravity.CENTER;
     addView(selector, selectorParam);
-    selector.setAlpha(alpha_selector);
+    selector.setAlpha(selector_alpha);
 
     getViewTreeObserver()
         .addOnGlobalLayoutListener(
@@ -260,8 +266,8 @@ protected void onCreateByBuilder(Builder builder) {
 
     this.paletteDrawable = builder.paletteDrawable;
     this.selectorDrawable = builder.selectorDrawable;
-    this.alpha_selector = builder.alpha_selector;
-    this.alpha_flag = builder.alpha_flag;
+    this.selector_alpha = builder.selector_alpha;
+    this.flag_alpha = builder.flag_alpha;
     this.selectorSize = builder.selectorSize;
     this.debounceDuration = builder.debounceDuration;
     onCreate();
@@ -429,10 +435,10 @@ public void fireColorListener(@ColorInt int color, final boolean fromUser) {
       if (VISIBLE_FLAG) {
         VISIBLE_FLAG = false;
         if (this.selector != null) {
-          this.selector.setAlpha(alpha_selector);
+          this.selector.setAlpha(selector_alpha);
         }
         if (this.flagView != null) {
-          this.flagView.setAlpha(alpha_flag);
+          this.flagView.setAlpha(flag_alpha);
         }
       }
     }
@@ -460,16 +466,23 @@ private void notifyToFlagView(Point point) {
     if (flagView != null) {
       if (flagView.getFlagMode() == FlagMode.ALWAYS) flagView.visible();
       int posX = centerPoint.x - flagView.getWidth() / 2 + selector.getWidth() / 2;
-      if (centerPoint.y - flagView.getHeight() > 0) {
+      if (flagView.isFlipAble()) {
+        if (centerPoint.y - flagView.getHeight() > 0) {
+          flagView.setRotation(0);
+          flagView.setX(posX);
+          flagView.setY(centerPoint.y - flagView.getHeight());
+          flagView.onRefresh(getColorEnvelope());
+        } else {
+          flagView.setRotation(180);
+          flagView.setX(posX);
+          flagView.setY(centerPoint.y + flagView.getHeight() - selector.getHeight() * 0.5f);
+          flagView.onRefresh(getColorEnvelope());
+        }
+      } else {
         flagView.setRotation(0);
         flagView.setX(posX);
         flagView.setY(centerPoint.y - flagView.getHeight());
         flagView.onRefresh(getColorEnvelope());
-      } else if (flagView.isFlipAble()) {
-        flagView.setRotation(180);
-        flagView.setX(posX);
-        flagView.setY(centerPoint.y + flagView.getHeight() - selector.getHeight() * 0.5f);
-        flagView.onRefresh(getColorEnvelope());
       }
       if (posX < 0) flagView.setX(0);
       if (posX + flagView.getMeasuredWidth() > getMeasuredWidth()) {
@@ -541,7 +554,8 @@ public void setFlagView(@NonNull FlagView flagView) {
     flagView.gone();
     addView(flagView);
     this.flagView = flagView;
-    flagView.setAlpha(alpha_flag);
+    flagView.setAlpha(flag_alpha);
+    flagView.setFlipAble(flag_isFlipAble);
   }
 
   /**
@@ -775,11 +789,11 @@ public void setPaletteDrawable(Drawable drawable) {
     if (!VISIBLE_FLAG) {
       VISIBLE_FLAG = true;
       if (selector != null) {
-        alpha_selector = selector.getAlpha();
+        selector_alpha = selector.getAlpha();
         selector.setAlpha(0.0f);
       }
       if (flagView != null) {
-        alpha_flag = flagView.getAlpha();
+        flag_alpha = flagView.getAlpha();
         flagView.setAlpha(0.0f);
       }
     }
@@ -959,10 +973,12 @@ public static class Builder {
     @ColorInt private int initialColor = 0;
 
     @FloatRange(from = 0.0, to = 1.0)
-    private float alpha_selector = 1.0f;
+    private float selector_alpha = 1.0f;
 
     @FloatRange(from = 0.0, to = 1.0)
-    private float alpha_flag = 1.0f;
+    private float flag_alpha = 1.0f;
+
+    private boolean flag_isFlipAble = false;
 
     @Dp private int selectorSize = 0;
     @Dp private int width = LayoutParams.MATCH_PARENT;
@@ -1015,12 +1031,17 @@ public Builder setActionMode(ActionMode actionMode) {
     }
 
     public Builder setSelectorAlpha(@FloatRange(from = 0.0, to = 1.0) float alpha) {
-      this.alpha_selector = alpha;
+      this.selector_alpha = alpha;
       return this;
     }
 
     public Builder setFlagAlpha(@FloatRange(from = 0.0, to = 1.0) float alpha) {
-      this.alpha_flag = alpha;
+      this.flag_alpha = alpha;
+      return this;
+    }
+
+    public Builder setFlagIsFlipAble(boolean isFlipAble) {
+      this.flag_isFlipAble = isFlipAble;
       return this;
     }
 

colorpickerview/src/main/res/values/attrs_colorpicker.xml

@@ -8,9 +8,11 @@
     <!-- sets a width/height square size of the selector. -->
     <attr name="selector_size" format="dimension" />
     <!-- sets an alpha of thr selector. -->
-    <attr name="alpha_selector" format="float" />
+    <attr name="selector_alpha" format="float" />
     <!-- sets an alpha of the flag. -->
-    <attr name="alpha_flag" format="float" />
+    <attr name="flag_alpha" format="float" />
+    <!-- sets a is flip-able or not of the flag. -->
+    <attr name="flag_isFlipAble" format="boolean" />
     <!-- sets a preference name for persisting and restoring status of the selector and slideBars. -->
     <attr name="preferenceName" format="string" />
     <!-- sets a debounce duration of the invoking color listener. -->

dependencies.gradle

@@ -15,16 +15,16 @@
 ext.versions = [
     minSdk           : 15,
     compileSdk       : 30,
-    versionoCode     : 27,
-    versionName      : '2.2.3',
+    versionoCode     : 28,
+    versionName      : '2.2.4',
 
-    gradleBuildTool  : '4.1.1',
-    spotlessGradle   : '5.9.0',
+    gradleBuildTool  : '4.1.3',
+    spotlessGradle   : '5.12.4',
     ktlintGradle     : '0.40.0',
-    dokkaGradle      : '1.4.20',
-    mavenPublish     : '0.13.0',
+    dokkaGradle      : '1.4.32',
+    mavenPublish     : '0.15.1',
 
-    kotlin           : '1.4.20',
+    kotlin           : '1.4.32',
     androidxAppcompat: '1.2.0',
 
     // for demo

gradle.properties

@@ -49,6 +49,3 @@ POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=skydoves
 POM_DEVELOPER_NAME=Jaewoong Eum
 POM_DEVELOPER_URL=https://github.com/skydoves/
-
-RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/