From 6247688c73b7335430725be04d5dc227790c0a61 Mon Sep 17 00:00:00 2001
From: zhongjh <254191389@qq.com>
Date: Fri, 16 Sep 2022 09:22:34 +0800
Subject: [PATCH] =?UTF-8?q?imageedit=E5=8C=85=E6=89=80=E6=9C=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=A1=A5=E5=85=85z=E5=89=8D=E7=BC=80=EF=BC=8C?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E8=B7=9F=E5=88=AB=E7=9A=84=E5=BA=93=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84imageedit=E6=9C=89=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 imageedit/src/main/AndroidManifest.xml                 |  2 +-
 .../com/zhongjh/imageedit/ImageTextEditDialog.java     |  2 +-
 .../com/zhongjh/imageedit/view/ImageColorRadio.java    |  6 +++---
 imageedit/src/main/res/values/image_attrs.xml          |  6 +++---
 imageedit/src/main/res/values/image_styles.xml         | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/imageedit/src/main/AndroidManifest.xml b/imageedit/src/main/AndroidManifest.xml
index 8d83c437..a38398d2 100644
--- a/imageedit/src/main/AndroidManifest.xml
+++ b/imageedit/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
             android:name=".ImageEditActivity"
             android:launchMode="singleTask"
             android:screenOrientation="locked"
-            android:theme="@style/ImageEditTheme"
+            android:theme="@style/ZImageEditTheme"
             android:windowSoftInputMode="stateAlwaysHidden" />
 
     </application>
diff --git a/imageedit/src/main/java/com/zhongjh/imageedit/ImageTextEditDialog.java b/imageedit/src/main/java/com/zhongjh/imageedit/ImageTextEditDialog.java
index b88e96e2..009e4609 100644
--- a/imageedit/src/main/java/com/zhongjh/imageedit/ImageTextEditDialog.java
+++ b/imageedit/src/main/java/com/zhongjh/imageedit/ImageTextEditDialog.java
@@ -30,7 +30,7 @@ public class ImageTextEditDialog extends Dialog implements View.OnClickListener,
     private ImageColorGroup mColorGroup;
 
     public ImageTextEditDialog(Context context, Callback callback) {
-        super(context, R.style.ImageTextDialog);
+        super(context, R.style.ZImageTextDialog);
         setContentView(R.layout.image_text_dialog_zjh);
         mCallback = callback;
         Window window = getWindow();
diff --git a/imageedit/src/main/java/com/zhongjh/imageedit/view/ImageColorRadio.java b/imageedit/src/main/java/com/zhongjh/imageedit/view/ImageColorRadio.java
index 4ccefa15..2e4dede1 100644
--- a/imageedit/src/main/java/com/zhongjh/imageedit/view/ImageColorRadio.java
+++ b/imageedit/src/main/java/com/zhongjh/imageedit/view/ImageColorRadio.java
@@ -52,10 +52,10 @@ public ImageColorRadio(Context context, AttributeSet attrs, int defStyleAttr) {
     }
 
     private void initialize(Context context, AttributeSet attrs) {
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.IMGColorRadio);
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ZIMGColorRadio);
 
-        mColor = a.getColor(R.styleable.IMGColorRadio_image_color, Color.WHITE);
-        mStrokeColor = a.getColor(R.styleable.IMGColorRadio_image_stroke_color, Color.WHITE);
+        mColor = a.getColor(R.styleable.ZIMGColorRadio_z_image_color, Color.WHITE);
+        mStrokeColor = a.getColor(R.styleable.ZIMGColorRadio_z_image_stroke_color, Color.WHITE);
 
         a.recycle();
 
diff --git a/imageedit/src/main/res/values/image_attrs.xml b/imageedit/src/main/res/values/image_attrs.xml
index cfca4b35..8f36569d 100644
--- a/imageedit/src/main/res/values/image_attrs.xml
+++ b/imageedit/src/main/res/values/image_attrs.xml
@@ -4,10 +4,10 @@
     <attr name="z_image_gallery_span_count" format="integer" />
     <attr name="z_image_gallery_select_shade" format="color" />
 
-    <declare-styleable name="IMGColorRadio" tools:ignore="ResourceName">
+    <declare-styleable name="ZIMGColorRadio" tools:ignore="ResourceName">
 
-        <attr name="image_color" format="color" />
-        <attr name="image_stroke_color" format="color" />
+        <attr name="z_image_color" format="color" />
+        <attr name="z_image_stroke_color" format="color" />
 
     </declare-styleable>
 
diff --git a/imageedit/src/main/res/values/image_styles.xml b/imageedit/src/main/res/values/image_styles.xml
index 44b23c9a..e8f45744 100644
--- a/imageedit/src/main/res/values/image_styles.xml
+++ b/imageedit/src/main/res/values/image_styles.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="ImageEditTheme" parent="Theme.AppCompat.Light.NoActionBar"/>
+    <style name="ZImageEditTheme" parent="Theme.AppCompat.Light.NoActionBar"/>
 
-    <style name="ImageTextDialog" parent="android:Theme.Holo.Dialog">
+    <style name="ZImageTextDialog" parent="android:Theme.Holo.Dialog">
 
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
@@ -19,18 +19,18 @@
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:backgroundDimAmount">0.8</item>
 
-        <item name="android:windowAnimationStyle">@style/ImageDialogAnimation</item>
+        <item name="android:windowAnimationStyle">@style/ZImageDialogAnimation</item>
 
     </style>
 
-    <style name="ImageDialogAnimation" parent="android:Animation.Dialog">
+    <style name="ZImageDialogAnimation" parent="android:Animation.Dialog">
 
         <item name="android:windowEnterAnimation">@anim/image_dialog_enter_zjh</item>
         <item name="android:windowExitAnimation">@anim/image_dialog_exit_zjh</item>
 
     </style>
 
-    <style name="ImageGalleryTheme" parent="Theme.AppCompat">
+    <style name="ZImageGalleryTheme" parent="Theme.AppCompat">
         <item name="z_image_gallery_span_count">4</item>
         <item name="z_image_gallery_select_shade">#90FFFFFF</item>
     </style>