#44 修复因为layout名字一样引起的一些闪退问题，现在都加了zjh以示区别

zhongjhATC · Jun 1, 2022 · c886016 · c886016
1 parent a453ff7
commit c886016
Show file tree

Hide file tree

Showing 82 changed files with 234 additions and 234 deletions.
diff --git a/imageedit/src/main/java/com/zhongjh/imageedit/BaseImageEditActivity.java b/imageedit/src/main/java/com/zhongjh/imageedit/BaseImageEditActivity.java
@@ -1,5 +1,8 @@
 package com.zhongjh.imageedit;
 
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+import static com.zhongjh.imageedit.ImageEditActivity.EXTRA_IMAGE_SCREEN_ORIENTATION;
+
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.graphics.Bitmap;
@@ -14,9 +17,6 @@
 import com.zhongjh.imageedit.view.ImageColorGroup;
 import com.zhongjh.imageedit.view.ImageViewCustom;
 
-import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
-import static com.zhongjh.imageedit.ImageEditActivity.EXTRA_IMAGE_SCREEN_ORIENTATION;
-
 /**
  * Created by felix on 2017/12/5 下午3:08.
  */
@@ -55,7 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Bitmap bitmap = getBitmap();
         if (bitmap != null) {
-            setContentView(R.layout.image_edit_activity);
+            setContentView(R.layout.image_edit_activity_zjh);
             initViews();
             mImageViewCustom.setImageBitmap(bitmap);
             onCreated();

diff --git a/imageedit/src/main/java/com/zhongjh/imageedit/ImageTextEditDialog.java b/imageedit/src/main/java/com/zhongjh/imageedit/ImageTextEditDialog.java
@@ -31,7 +31,7 @@ public class ImageTextEditDialog extends Dialog implements View.OnClickListener,
 
     public ImageTextEditDialog(Context context, Callback callback) {
         super(context, R.style.ImageTextDialog);
-        setContentView(R.layout.image_text_dialog);
+        setContentView(R.layout.image_text_dialog_zjh);
         mCallback = callback;
         Window window = getWindow();
         if (window != null) {

diff --git a/.../src/main/res/anim/image_dialog_enter.xml → .../main/res/anim/image_dialog_enter_zjh.xml b/.../src/main/res/anim/image_dialog_enter.xml → .../main/res/anim/image_dialog_enter_zjh.xml
diff --git a/...t/src/main/res/anim/image_dialog_exit.xml → ...c/main/res/anim/image_dialog_exit_zjh.xml b/...t/src/main/res/anim/image_dialog_exit.xml → ...c/main/res/anim/image_dialog_exit_zjh.xml
diff --git a/...eedit/src/main/res/anim/image_fade_in.xml → ...t/src/main/res/anim/image_fade_in_zjh.xml b/...eedit/src/main/res/anim/image_fade_in.xml → ...t/src/main/res/anim/image_fade_in_zjh.xml
diff --git a/...edit/src/main/res/anim/image_fade_out.xml → .../src/main/res/anim/image_fade_out_zjh.xml b/...edit/src/main/res/anim/image_fade_out.xml → .../src/main/res/anim/image_fade_out_zjh.xml
diff --git a/...t/src/main/res/color/image_color_text.xml → ...c/main/res/color/image_color_text_zjh.xml b/...t/src/main/res/color/image_color_text.xml → ...c/main/res/color/image_color_text_zjh.xml
@@ -3,8 +3,8 @@
 
     <item android:color="#333" android:state_enabled="false" />
 
-    <item android:color="@color/image_color_accent" android:state_pressed="true" />
+    <item android:color="@color/z_image_color_accent" android:state_pressed="true" />
 
-    <item android:color="@color/image_color_white" />
+    <item android:color="@color/z_image_color_white" />
 
 </selector>
diff --git a/imageedit/src/main/res/layout/image_color_layout.xml b/imageedit/src/main/res/layout/image_color_layout.xml
diff --git a/imageedit/src/main/res/layout/image_color_layout_zjh.xml b/imageedit/src/main/res/layout/image_color_layout_zjh.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.zhongjh.imageedit.view.ImageColorGroup xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cg_colors"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:checkedButton="@+id/cr_white"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:padding="4dp">
+
+    <com.zhongjh.imageedit.view.ImageColorRadio
+        android:id="@+id/cr_white"
+        android:layout_width="@dimen/z_image_color"
+        android:layout_height="@dimen/z_image_color"
+        android:layout_margin="@dimen/z_image_color_margin"
+        app:image_color="@color/z_image_color_white" />
+
+    <com.zhongjh.imageedit.view.ImageColorRadio
+        android:layout_width="@dimen/z_image_color"
+        android:layout_height="@dimen/z_image_color"
+        android:layout_margin="@dimen/z_image_color_margin"
+        app:image_color="@color/z_image_color_black" />
+
+    <com.zhongjh.imageedit.view.ImageColorRadio
+        android:layout_width="@dimen/z_image_color"
+        android:layout_height="@dimen/z_image_color"
+        android:layout_margin="@dimen/z_image_color_margin"
+        app:image_color="@color/z_image_color_red" />
+
+    <com.zhongjh.imageedit.view.ImageColorRadio
+        android:layout_width="@dimen/z_image_color"
+        android:layout_height="@dimen/z_image_color"
+        android:layout_margin="@dimen/z_image_color_margin"
+        app:image_color="@color/z_image_color_cyan" />
+
+    <com.zhongjh.imageedit.view.ImageColorRadio
+        android:layout_width="@dimen/z_image_color"
+        android:layout_height="@dimen/z_image_color"
+        android:layout_margin="@dimen/z_image_color_margin"
+        app:image_color="@color/z_image_color_yellow" />
+
+    <com.zhongjh.imageedit.view.ImageColorRadio
+        android:layout_width="@dimen/z_image_color"
+        android:layout_height="@dimen/z_image_color"
+        android:layout_margin="@dimen/z_image_color_margin"
+        app:image_color="@color/z_image_color_blue" />
+
+</com.zhongjh.imageedit.view.ImageColorGroup>
diff --git a/...c/main/res/layout/image_edit_activity.xml → ...in/res/layout/image_edit_activity_zjh.xml b/...c/main/res/layout/image_edit_activity.xml → ...in/res/layout/image_edit_activity_zjh.xml
@@ -20,12 +20,12 @@
         android:id="@+id/vs_op"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:inAnimation="@anim/image_fade_in"
-        android:outAnimation="@anim/image_fade_out">
+        android:inAnimation="@anim/image_fade_in_zjh"
+        android:outAnimation="@anim/image_fade_out_zjh">
 
-        <include layout="@layout/image_edit_opt_layout" />
+        <include layout="@layout/image_edit_opt_layout_zjh" />
 
-        <include layout="@layout/image_edit_clip_layout" />
+        <include layout="@layout/image_edit_clip_layout_zjh" />
 
     </ViewSwitcher>
 

diff --git a/...ain/res/layout/image_edit_clip_layout.xml → ...res/layout/image_edit_clip_layout_zjh.xml b/...ain/res/layout/image_edit_clip_layout.xml → ...res/layout/image_edit_clip_layout_zjh.xml
@@ -22,7 +22,7 @@
             android:layout_marginLeft="20dp"
             android:layout_marginStart="20dp"
             android:background="@null"
-            android:contentDescription="@string/image_rotate"
+            android:contentDescription="@string/z_image_rotate"
             android:onClick="onClick"
             android:src="@drawable/image_btn_rotate" />
 
@@ -41,7 +41,7 @@
                 android:layout_marginLeft="40dp"
                 android:layout_marginStart="40dp"
                 android:background="@null"
-                android:contentDescription="@string/image_cancel"
+                android:contentDescription="@string/z_image_cancel"
                 android:onClick="onClick"
                 android:src="@drawable/image_btn_cancel" />
 
@@ -53,8 +53,8 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:onClick="onClick"
-                android:text="@string/image_reset"
-                android:textColor="@color/image_color_text"
+                android:text="@string/z_image_reset"
+                android:textColor="@color/image_color_text_zjh"
                 android:textSize="16sp" />
 
             <ImageButton
@@ -65,7 +65,7 @@
                 android:layout_marginEnd="40dp"
                 android:layout_marginRight="40dp"
                 android:background="@null"
-                android:contentDescription="@string/image_done"
+                android:contentDescription="@string/z_image_done"
                 android:onClick="onClick"
                 android:src="@drawable/image_btn_ok" />
 

diff --git a/...main/res/layout/image_edit_opt_layout.xml → .../res/layout/image_edit_opt_layout_zjh.xml b/...main/res/layout/image_edit_opt_layout.xml → .../res/layout/image_edit_opt_layout_zjh.xml
@@ -73,51 +73,51 @@
 
                 <com.zhongjh.imageedit.view.ImageColorRadio
                     android:id="@+id/cr_red"
-                    android:layout_width="@dimen/image_color"
-                    android:layout_height="@dimen/image_color"
-                    android:layout_margin="@dimen/image_color_margin"
+                    android:layout_width="@dimen/z_image_color"
+                    android:layout_height="@dimen/z_image_color"
+                    android:layout_margin="@dimen/z_image_color_margin"
                     android:button="@null"
-                    app:image_color="@color/image_color_red" />
+                    app:image_color="@color/z_image_color_red" />
 
                 <com.zhongjh.imageedit.view.ImageColorRadio
-                    android:layout_width="@dimen/image_color"
-                    android:layout_height="@dimen/image_color"
-                    android:layout_margin="@dimen/image_color_margin"
-                    app:image_color="@color/image_color_black" />
+                    android:layout_width="@dimen/z_image_color"
+                    android:layout_height="@dimen/z_image_color"
+                    android:layout_margin="@dimen/z_image_color_margin"
+                    app:image_color="@color/z_image_color_black" />
 
                 <com.zhongjh.imageedit.view.ImageColorRadio
-                    android:layout_width="@dimen/image_color"
-                    android:layout_height="@dimen/image_color"
-                    android:layout_margin="@dimen/image_color_margin"
+                    android:layout_width="@dimen/z_image_color"
+                    android:layout_height="@dimen/z_image_color"
+                    android:layout_margin="@dimen/z_image_color_margin"
 
-                    app:image_color="@color/image_color_white" />
+                    app:image_color="@color/z_image_color_white" />
 
                 <com.zhongjh.imageedit.view.ImageColorRadio
-                    android:layout_width="@dimen/image_color"
-                    android:layout_height="@dimen/image_color"
-                    android:layout_margin="@dimen/image_color_margin"
-                    app:image_color="@color/image_color_cyan" />
+                    android:layout_width="@dimen/z_image_color"
+                    android:layout_height="@dimen/z_image_color"
+                    android:layout_margin="@dimen/z_image_color_margin"
+                    app:image_color="@color/z_image_color_cyan" />
 
                 <com.zhongjh.imageedit.view.ImageColorRadio
-                    android:layout_width="@dimen/image_color"
-                    android:layout_height="@dimen/image_color"
-                    android:layout_margin="@dimen/image_color_margin"
-                    app:image_color="@color/image_color_yellow" />
+                    android:layout_width="@dimen/z_image_color"
+                    android:layout_height="@dimen/z_image_color"
+                    android:layout_margin="@dimen/z_image_color_margin"
+                    app:image_color="@color/z_image_color_yellow" />
 
                 <com.zhongjh.imageedit.view.ImageColorRadio
-                    android:layout_width="@dimen/image_color"
-                    android:layout_height="@dimen/image_color"
-                    android:layout_margin="@dimen/image_color_margin"
-                    app:image_color="@color/image_color_blue" />
+                    android:layout_width="@dimen/z_image_color"
+                    android:layout_height="@dimen/z_image_color"
+                    android:layout_margin="@dimen/z_image_color_margin"
+                    app:image_color="@color/z_image_color_blue" />
 
             </com.zhongjh.imageedit.view.ImageColorGroup>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="@string/image_mosaic_tip"
-                android:textColor="@color/image_color_white"
+                android:text="@string/z_image_mosaic_tip"
+                android:textColor="@color/z_image_color_white"
                 android:textSize="12sp" />
 
         </ViewSwitcher>
@@ -127,7 +127,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@null"
-            android:contentDescription="@string/image_undo"
+            android:contentDescription="@string/z_image_undo"
             android:onClick="onClick"
             android:src="@drawable/image_btn_undo" />
 
@@ -152,22 +152,22 @@
             android:textColor="#FFF" />
 
         <Space
-            android:layout_width="@dimen/image_mode_space"
+            android:layout_width="@dimen/z_image_mode_space"
             android:layout_height="wrap_content" />
 
         <ImageButton
             android:id="@+id/btn_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@null"
-            android:contentDescription="@string/image_text"
+            android:contentDescription="@string/z_image_text"
             android:gravity="center"
             android:onClick="onClick"
             android:src="@drawable/image_btn_text"
             android:textColor="#FFF" />
 
         <Space
-            android:layout_width="@dimen/image_mode_space"
+            android:layout_width="@dimen/z_image_mode_space"
             android:layout_height="wrap_content" />
 
         <RadioButton
@@ -180,15 +180,15 @@
             android:textColor="#FFF" />
 
         <Space
-            android:layout_width="@dimen/image_mode_space"
+            android:layout_width="@dimen/z_image_mode_space"
             android:layout_height="wrap_content" />
 
         <ImageButton
             android:id="@+id/btn_clip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@null"
-            android:contentDescription="@string/image_clip"
+            android:contentDescription="@string/z_image_clip"
             android:gravity="center"
             android:onClick="onClick"
             android:src="@drawable/image_btn_clip"

diff --git a/...src/main/res/layout/image_text_dialog.xml → ...main/res/layout/image_text_dialog_zjh.xml b/...src/main/res/layout/image_text_dialog.xml → ...main/res/layout/image_text_dialog_zjh.xml
@@ -48,10 +48,10 @@
         android:layout_weight="1"
         android:background="@null"
         android:gravity="top"
-        android:textColor="@color/image_color_primary"
+        android:textColor="@color/z_image_color_primary"
         android:textSize="24sp"
         tools:text="这里添加文字" />
 
-    <include layout="@layout/image_color_layout" />
+    <include layout="@layout/image_color_layout_zjh" />
 
 </LinearLayout>
diff --git a/imageedit/src/main/res/values-zh/image_strings.xml b/imageedit/src/main/res/values-zh/image_strings.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="image_doodle">涂鸦</string>
-    <string name="image_text">文字</string>
-    <string name="image_mosaic">马赛克</string>
-    <string name="image_clip">裁剪</string>
-    <string name="image_reset">还原</string>
-    <string name="image_done">完成</string>
-    <string name="image_cancel">取消</string>
-    <string name="image_rotate">旋转</string>
+    <string name="z_image_doodle">涂鸦</string>
+    <string name="z_image_text">文字</string>
+    <string name="z_image_mosaic">马赛克</string>
+    <string name="z_image_clip">裁剪</string>
+    <string name="z_image_reset">还原</string>
+    <string name="z_image_done">完成</string>
+    <string name="z_image_cancel">取消</string>
+    <string name="z_image_rotate">旋转</string>
 
-    <string name="image_mosaic_tip">请直接在图片上涂抹虚化</string>
-    <string name="image_undo">撤销</string>
-    <string name="image_all_photo">所有照片</string>
-    <string name="image_original">原图</string>
-    <string name="image_preview">预览</string>
+    <string name="z_image_mosaic_tip">请直接在图片上涂抹虚化</string>
+    <string name="z_image_undo">撤销</string>
+    <string name="z_image_all_photo">所有照片</string>
+    <string name="z_image_original">原图</string>
+    <string name="z_image_preview">预览</string>
 </resources>
diff --git a/imageedit/src/main/res/values-zh/strings.xml b/imageedit/src/main/res/values-zh/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="image_enable_storage_permission">Enable storage permissions</string>
-    <string name="image_enable_storage_tips">Album function needs to use the storage permissions, please in the Settings to enable the storage permissions of this application</string>
+    <string name="z_image_enable_storage_permission">Enable storage permissions</string>
+    <string name="z_image_enable_storage_tips">Album function needs to use the storage permissions, please in the Settings to enable the storage permissions of this application</string>
 
 </resources>