imageedit包所有样式补充z前缀，防止跟别的库中的imageedit有冲突问题

zhongjhATC · Sep 16, 2022 · 6247688 · 6247688
1 parent cc097e4
commit 6247688
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>