Refactor color picker package

pranavpandey · Jul 11, 2022 · 1e9ccfd · 1e9ccfd
1 parent 086402b
commit 1e9ccfd
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 17 deletions.
diff --git a/dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/Dynamic.java b/dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/Dynamic.java
@@ -62,7 +62,7 @@
 import com.pranavpandey.android.dynamic.support.listener.DynamicSnackbar;
 import com.pranavpandey.android.dynamic.support.model.DynamicItem;
 import com.pranavpandey.android.dynamic.support.motion.DynamicMotion;
-import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView;
+import com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView;
 import com.pranavpandey.android.dynamic.support.setting.base.DynamicPreference;
 import com.pranavpandey.android.dynamic.support.theme.DynamicTheme;
 import com.pranavpandey.android.dynamic.support.theme.inflater.DynamicLayoutInflater;

diff --git a/.../src/main/java/com/pranavpandey/android/dynamic/support/adapter/DynamicColorsAdapter.java b/.../src/main/java/com/pranavpandey/android/dynamic/support/adapter/DynamicColorsAdapter.java
@@ -29,7 +29,7 @@
 import com.pranavpandey.android.dynamic.support.R;
 import com.pranavpandey.android.dynamic.support.listener.DynamicColorListener;
 import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorShape;
-import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView;
+import com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView;
 import com.pranavpandey.android.dynamic.theme.Theme;
 
 /**

diff --git a/...c/main/java/com/pranavpandey/android/dynamic/support/picker/color/DynamicColorPicker.java b/...c/main/java/com/pranavpandey/android/dynamic/support/picker/color/DynamicColorPicker.java
@@ -43,6 +43,7 @@
 import com.pranavpandey.android.dynamic.support.listener.DynamicColorListener;
 import com.pranavpandey.android.dynamic.support.listener.DynamicSliderChangeListener;
 import com.pranavpandey.android.dynamic.support.picker.DynamicPickerType;
+import com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView;
 import com.pranavpandey.android.dynamic.support.setting.base.DynamicColorPreference;
 import com.pranavpandey.android.dynamic.support.setting.base.DynamicSliderPreference;
 import com.pranavpandey.android.dynamic.support.theme.DynamicTheme;
@@ -693,7 +694,7 @@ private void initializeShades(boolean showCustom) {
      * @param position The position of the parent color.
      * @param color The selected color.
      */
-    protected void selectColor(int position, @ColorInt int color) {
+    public void selectColor(int position, @ColorInt int color) {
         if (mDynamicColorListener != null) {
             mSelectedColor = color;
             DynamicPickerUtils.setRecentColor(color);
@@ -711,7 +712,7 @@ protected void selectColor(int position, @ColorInt int color) {
      * @param setRGB {@code true} to set RGB values.
      * @param setCMYK {@code true} to set CMYK values.
      */
-    protected void setCustom(@ColorInt int color, boolean setHSV,
+    public void setCustom(@ColorInt int color, boolean setHSV,
             boolean setRGB, boolean setCMYK) {
         mUpdatingCustomColor = true;
         mSelectedColor = color;

diff --git a/...port/picker/color/DynamicColorDialog.java → ...cker/color/dialog/DynamicColorDialog.java b/...port/picker/color/DynamicColorDialog.java → ...cker/color/dialog/DynamicColorDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.pranavpandey.android.dynamic.support.picker.color;
+package com.pranavpandey.android.dynamic.support.picker.color.dialog;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -30,6 +30,9 @@
 import com.pranavpandey.android.dynamic.support.dialog.fragment.DynamicDialogFragment;
 import com.pranavpandey.android.dynamic.support.listener.DynamicColorListener;
 import com.pranavpandey.android.dynamic.support.picker.DynamicPickerType;
+import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorControl;
+import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorPicker;
+import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorShape;
 import com.pranavpandey.android.dynamic.support.setting.base.DynamicColorPreference;
 
 /**

diff --git a/...pport/picker/color/DynamicColorPopup.java → ...picker/color/popup/DynamicColorPopup.java b/...pport/picker/color/DynamicColorPopup.java → ...picker/color/popup/DynamicColorPopup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.pranavpandey.android.dynamic.support.picker.color;
+package com.pranavpandey.android.dynamic.support.picker.color.popup;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +33,9 @@
 import com.pranavpandey.android.dynamic.support.adapter.DynamicColorsAdapter;
 import com.pranavpandey.android.dynamic.support.dialog.DynamicDialog;
 import com.pranavpandey.android.dynamic.support.listener.DynamicColorListener;
+import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorShape;
+import com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView;
+import com.pranavpandey.android.dynamic.support.picker.color.dialog.DynamicColorDialog;
 import com.pranavpandey.android.dynamic.support.popup.DynamicPopup;
 import com.pranavpandey.android.dynamic.support.setting.base.DynamicColorPreference;
 import com.pranavpandey.android.dynamic.support.theme.DynamicTheme;

diff --git a/...upport/picker/color/DynamicColorView.java → ...t/picker/color/view/DynamicColorView.java b/...upport/picker/color/DynamicColorView.java → ...t/picker/color/view/DynamicColorView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.pranavpandey.android.dynamic.support.picker.color;
+package com.pranavpandey.android.dynamic.support.picker.color.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -47,6 +47,8 @@
 import com.pranavpandey.android.dynamic.support.Dynamic;
 import com.pranavpandey.android.dynamic.support.R;
 import com.pranavpandey.android.dynamic.support.graphics.DynamicPaint;
+import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorPicker;
+import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorShape;
 import com.pranavpandey.android.dynamic.support.theme.DynamicTheme;
 import com.pranavpandey.android.dynamic.support.util.DynamicPickerUtils;
 import com.pranavpandey.android.dynamic.support.util.DynamicResourceUtils;

diff --git a/...in/java/com/pranavpandey/android/dynamic/support/setting/base/DynamicColorPreference.java b/...in/java/com/pranavpandey/android/dynamic/support/setting/base/DynamicColorPreference.java
@@ -36,10 +36,10 @@
 import com.pranavpandey.android.dynamic.support.dialog.DynamicDialog;
 import com.pranavpandey.android.dynamic.support.listener.DynamicColorListener;
 import com.pranavpandey.android.dynamic.support.listener.DynamicColorResolver;
-import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorDialog;
-import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorPopup;
+import com.pranavpandey.android.dynamic.support.picker.color.dialog.DynamicColorDialog;
+import com.pranavpandey.android.dynamic.support.picker.color.popup.DynamicColorPopup;
 import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorShape;
-import com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView;
+import com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView;
 import com.pranavpandey.android.dynamic.support.theme.DynamicTheme;
 import com.pranavpandey.android.dynamic.support.util.DynamicResourceUtils;
 import com.pranavpandey.android.dynamic.theme.DynamicPalette;

diff --git a/dynamic-support/src/main/res/layout/ads_color_picker.xml b/dynamic-support/src/main/res/layout/ads_color_picker.xml
@@ -145,7 +145,7 @@
                     android:paddingEnd="@dimen/ads_dialog_margin_horizontal"
                     android:orientation="horizontal">
 
-                    <com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView
+                    <com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView
                         style="@style/Widget.DynamicApp.ColorView"
                         android:id="@+id/ads_color_picker_color_previous"
                         android:layout_width="0dp"
@@ -156,7 +156,7 @@
                         app:ads_shape="rectangle"
                         app:adt_color= "#123456" />
 
-                    <com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView
+                    <com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView
                         style="@style/Widget.DynamicApp.ColorView"
                         android:id="@+id/ads_color_picker_color"
                         android:layout_width="0dp"

diff --git a/dynamic-support/src/main/res/layout/ads_color_picker_popup_footer.xml b/dynamic-support/src/main/res/layout/ads_color_picker_popup_footer.xml
@@ -55,7 +55,7 @@
             android:layout_gravity="center_vertical"
             android:orientation="horizontal">
 
-            <com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView
+            <com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView
                 style="@style/Widget.DynamicApp.ColorView"
                 android:id="@+id/ads_color_picker_popup_footer_view_default"
                 android:layout_width="@dimen/ads_icon_popup_footer"
@@ -76,7 +76,7 @@
                 app:adt_colorType="accent"
                 app:adt_contrastWithColorType="surface" />
 
-            <com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView
+            <com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView
                 style="@style/Widget.DynamicApp.ColorView"
                 android:id="@+id/ads_color_picker_popup_footer_view"
                 android:layout_width="@dimen/ads_icon_popup_footer"
@@ -98,7 +98,7 @@
                     android:id="@+id/ads_color_picker_popup_footer_divider"
                     app:adt_contrastWithColorType="surface" />
 
-                <com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView
+                <com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView
                     style="@style/Widget.DynamicApp.ColorView"
                     android:id="@+id/ads_color_picker_popup_footer_view_recent"
                     android:layout_width="@dimen/ads_icon_popup_footer"

diff --git a/dynamic-support/src/main/res/layout/ads_layout_color_view.xml b/dynamic-support/src/main/res/layout/ads_layout_color_view.xml
@@ -21,7 +21,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView
+    <com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView
         style="@style/Widget.DynamicApp.ColorView"
         android:id="@+id/ads_color_view"
         android:layout_width="match_parent"

diff --git a/dynamic-support/src/main/res/layout/ads_preference_color.xml b/dynamic-support/src/main/res/layout/ads_preference_color.xml
@@ -15,7 +15,7 @@
 	limitations under the License.
 -->
 
-<com.pranavpandey.android.dynamic.support.picker.color.DynamicColorView
+<com.pranavpandey.android.dynamic.support.picker.color.view.DynamicColorView
     style="@style/Widget.DynamicApp.ColorView.Preference"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/ads_preference_color_view" />