fix #30

fix  #27
fix  #23
fix #32

Author: crazycodeboy

README.md

@@ -25,9 +25,11 @@ GitHub地址： [https://github.com/crazycodeboy/TakePhoto](https://github.com/c
 - [安装说明](#安装说明)
 - [演示](#演示)
 - [使用说明](#使用说明)
+- [自定义UI](#自定义ui)
 - [API](#api)
 - [兼容性](#兼容性)
 - [贡献](#贡献)
+- [最后](#混淆)
 
 ## 安装说明  
 **Gradle:**  
@@ -118,6 +120,94 @@ GitHub地址： [https://github.com/crazycodeboy/TakePhoto](https://github.com/c
     }    
 ```
 
+## 自定义UI
+
+TakePhoto不仅支持对相关参数的自定义，也支持对UI的自定义，下面就像大家介绍如何自定义TakePhoto的相册与裁剪工具的UI。
+
+### 自定义相册
+如果TakePhoto自带相册的UI不符合你应用的主题的话，你可以对它进行自定义。方法如下：   
+
+#### 自定义Toolbar 
+
+在“res/layout”目录中创建一个名为“toolbar.xml”的布局文件，内容如下：   
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    app:theme="@style/CustomToolbarTheme"
+    android:background="#ffa352">
+</android.support.v7.widget.Toolbar>
+```
+
+在“toolbar.xml”文件中你可以指定TakePhoto自带相册的主题以及Toolbar的背景色。
+
+#### 自定义提示文字
+
+在“res/values”目录的“string.xml”文件冲添加如下代码：
+
+```xml
+<resources>    
+    <string name="album_view">选择图片</string>
+    <string name="image_view">单击选择</string>
+    <string name="add">确定</string>
+    <string name="selected">已选</string>
+    <string name="limit_exceeded">最多能选 %d 张</string>
+</resources>
+```
+
+重写上述代码，便可以自定义TakePhoto自带相册的提示文字。
+
+### 自定义裁切工具
+
+在“res/layout”目录中创建一个名为“crop__activity_crop.xml”与“crop__layout_done_cancel.xml”的布局文件，内容如下：  
+
+**crop__activity_crop.xml**  
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <com.soundcloud.android.crop.CropImageView
+        android:id="@+id/crop_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:background="@drawable/crop__texture"
+        android:layout_above="@+id/done_cancel_bar" />
+    <include
+        android:id="@+id/done_cancel_bar"
+        android:layout_alignParentBottom="true"
+        layout="@layout/crop__layout_done_cancel"
+        android:layout_height="50dp"
+        android:layout_width="match_parent" />
+</RelativeLayout>
+```
+
+**crop__layout_done_cancel.xml**  
+
+```xml
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Crop.DoneCancelBar">
+    <FrameLayout
+        android:id="@+id/btn_cancel"
+        style="@style/Crop.ActionButton">
+        <TextView style="@style/Crop.ActionButtonText.Cancel" />
+    </FrameLayout>
+    <FrameLayout
+        android:id="@+id/btn_done"
+        style="@style/Crop.ActionButton">
+        <TextView style="@style/Crop.ActionButtonText.Done" />
+    </FrameLayout>
+</LinearLayout>
+```
+
+重写上述代码，便可以自定义TakePhoto裁切工具的UI。
+
 ## API
 
 ### 获取图片
@@ -296,6 +386,22 @@ eg:
 </activity>
 ```
 
-
 ## 贡献  
-如果你在使用TakePhoto中遇到任何问题可以提[Issues](https://github.com/crazycodeboy/TakePhoto/issues)出来。另外欢迎大家为TakePhoto贡献智慧，欢迎大家[Fork and Pull requests](https://github.com/crazycodeboy/TakePhoto)。  
+如果你在使用TakePhoto中遇到任何问题可以提[Issues](https://github.com/crazycodeboy/TakePhoto/issues)出来。另外欢迎大家为TakePhoto贡献智慧，欢迎大家[Fork and Pull requests](https://github.com/crazycodeboy/TakePhoto)。     
+
+## 最后
+
+### 关于代码混淆
+如果你的项目中启用了代码混淆，可在混淆规则文件(如：proguard-rules.pro)中添加如下代码：   
+
+```
+-keep class com.jph.takephoto.** { *; }
+-dontwarn com.jph.takephoto.**
+
+-keep class com.darsh.multipleimageselect.** { *; }
+-dontwarn com.darsh.multipleimageselect.**
+
+-keep class com.soundcloud.android.crop.** { *; }
+-dontwarn com.soundcloud.android.crop.**
+
+```

simple/proguard-rules.pro

@@ -15,3 +15,10 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-dontwarn android.support.**
+-keep class android.support.** { *; }
+
+
+-keepattributes InnerClasses
+-dontoptimize

takephoto_library/proguard-rules.pro

@@ -15,3 +15,22 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+
+-dontwarn android.support.**
+-keep class android.support.** { *; }
+
+
+-keepattributes InnerClasses
+-dontoptimize
+
+
+-keep class com.jph.takephoto.** { *; }
+-dontwarn com.jph.takephoto.**
+
+-keep class com.darsh.multipleimageselect.** { *; }
+-dontwarn com.darsh.multipleimageselect.**
+
+-keep class com.soundcloud.android.crop.** { *; }
+-dontwarn com.soundcloud.android.crop.**
+

takephoto_library/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
         <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.jph.takephoto.fileprovider"
+            android:authorities="${applicationId}.fileprovider"
             android:grantUriPermissions="true"
             android:exported="false">
             <meta-data

takephoto_library/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java

@@ -154,9 +154,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 break;
             case TConstant.RC_PICK_PICTURE_FROM_CAPTURE_CROP://拍取照片,并裁剪
                 if (resultCode == Activity.RESULT_OK) {
-                    ImageRotateUtil.of().correctImage(tempUri);
+                    ImageRotateUtil.of().correctImage(contextWrap.getActivity(),tempUri);
                     try {
-                        onCrop(tempUri,Uri.fromFile(new File(TUriParse.parseOwnUri(outPutUri))), cropOptions);
+                        onCrop(tempUri,Uri.fromFile(new File(TUriParse.parseOwnUri(contextWrap.getActivity(),outPutUri))), cropOptions);
                     } catch (TException e) {
                         takeResult(TResult.of(TImage.of(outPutUri)), e.getDetailMessage());
                         e.printStackTrace();
@@ -167,7 +167,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 break;
             case TConstant.RC_PICK_PICTURE_FROM_CAPTURE://拍取照片
                 if (resultCode == Activity.RESULT_OK) {
-                    ImageRotateUtil.of().correctImage(outPutUri);
+                    ImageRotateUtil.of().correctImage(contextWrap.getActivity(),outPutUri);
                     try {
                         takeResult(TResult.of(TImage.of(TUriParse.getFilePathWithUri(outPutUri, contextWrap.getActivity()))));
                     } catch (TException e) {

takephoto_library/src/main/java/com/jph/takephoto/uitl/ImageRotateUtil.java

@@ -1,5 +1,6 @@
 package com.jph.takephoto.uitl;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
@@ -33,9 +34,9 @@ private ImageRotateUtil() {
      * 纠正照片的旋转角度
      * @param path
      */
-    public void correctImage(Uri path){
+    public void correctImage(Context context,Uri path){
 
-        String imagePath=TUriParse.parseOwnUri(path);
+        String imagePath=TUriParse.parseOwnUri(context,path);
         int degree;
         if((degree=getBitmapDegree(imagePath))!=0){
             Bitmap bitmap= BitmapFactory.decodeFile(imagePath);

takephoto_library/src/main/java/com/jph/takephoto/uitl/TConstant.java

@@ -1,13 +1,15 @@
 package com.jph.takephoto.uitl;
 
+import android.content.Context;
+
 /**
  * 常量类
  * @author JPH
  * Date 2016/6/7 0007 9:39
  */
 public class TConstant {
 
-    public final static String FILE_PROVIDER="com.jph.takephoto.fileprovider";
+
     /**
      * request Code 裁剪照片
      **/
@@ -46,4 +48,8 @@ public class TConstant {
      * requestCode 请求权限
      **/
     public final static int PERMISSION_REQUEST_TAKE_PHOTO = 2000;
+
+    public final static String getFileProviderName(Context context){
+        return context.getPackageName()+".fileprovider";
+    }
  }

takephoto_library/src/main/java/com/jph/takephoto/uitl/TUriParse.java

@@ -49,7 +49,7 @@ public static Uri convertFileUriToFileProviderUri(Context context,Uri uri){
      * @return
      */
     public static Uri getUriForFile(Context context, File file) {
-        return FileProvider.getUriForFile(context,TConstant.FILE_PROVIDER, file);
+        return FileProvider.getUriForFile(context,TConstant.getFileProviderName(context), file);
     }
 
     /**
@@ -69,10 +69,10 @@ public static Uri getTempUri(Context context){
      * @param uri
      * @return
      */
-    public static String parseOwnUri(Uri uri){
+    public static String parseOwnUri(Context context,Uri uri){
         if(uri==null)return null;
         String path;
-        if(TextUtils.equals(uri.getAuthority(),TConstant.FILE_PROVIDER)){
+        if(TextUtils.equals(uri.getAuthority(),TConstant.getFileProviderName(context))){
             path=new File(Environment.getExternalStorageDirectory(),uri.getPath().replace("camera_photos/","")).getAbsolutePath();
         }else {
             path=uri.getPath();
@@ -102,8 +102,8 @@ public static String getFilePathWithUri(Uri uri, Activity activity)throws TExcep
             int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
             if(columnIndex>=0){
                 picturePath = cursor.getString(columnIndex);  //获取照片路径
-            }else if(TextUtils.equals(uri.getAuthority(),TConstant.FILE_PROVIDER)){
-                picturePath=parseOwnUri(uri);
+            }else if(TextUtils.equals(uri.getAuthority(),TConstant.getFileProviderName(activity))){
+                picturePath=parseOwnUri(activity,uri);
             }
             cursor.close();
         }else if (ContentResolver.SCHEME_FILE.equals(scheme)){

takephoto_library/src/main/java/com/jph/takephoto/uitl/TUtils.java

@@ -43,7 +43,7 @@ public class TUtils {
     public static ArrayList<Uri> convertImageToUri(Context context,ArrayList<Image>images) throws TException {
         ArrayList<Uri>uris=new ArrayList();
         for(Image image:images){
-            uris.add(FileProvider.getUriForFile(context,TConstant.FILE_PROVIDER, new File(image.path)));
+            uris.add(FileProvider.getUriForFile(context,TConstant.getFileProviderName(context), new File(image.path)));
         }
         return uris;
     }