From 5d54acd01d176ce919ca0db3aee8aa2d55e422f3 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Thu, 23 Nov 2023 20:47:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4com.soundcloud.android?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android_crop_lib/build.gradle                                 | 3 ---
 android_crop_lib/src/main/AndroidManifest.xml                 | 2 +-
 .../src/main/java/com/soundcloud/{android => }/crop/Crop.java | 2 +-
 .../com/soundcloud/{android => }/crop/CropImageActivity.java  | 2 +-
 .../java/com/soundcloud/{android => }/crop/CropImageView.java | 2 +-
 .../main/java/com/soundcloud/{android => }/crop/CropUtil.java | 2 +-
 .../java/com/soundcloud/{android => }/crop/HighlightView.java | 2 +-
 .../com/soundcloud/{android => }/crop/ImageViewTouchBase.java | 2 +-
 .../src/main/java/com/soundcloud/{android => }/crop/Log.java  | 2 +-
 .../com/soundcloud/{android => }/crop/MonitoredActivity.java  | 2 +-
 .../java/com/soundcloud/{android => }/crop/RotateBitmap.java  | 2 +-
 .../main/java/com/soundcloud/{android => }/crop/UriUtil.java  | 2 +-
 android_crop_lib/src/main/res/layout/crop__activity_crop.xml  | 2 +-
 app/proguard-rules.pro                                        | 4 ++--
 app/src/main/AndroidManifest.xml                              | 2 +-
 app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java    | 2 +-
 app/src/main/java/com/jph/takephoto/uitl/TUtils.java          | 2 +-
 17 files changed, 17 insertions(+), 20 deletions(-)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/Crop.java (99%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/CropImageActivity.java (99%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/CropImageView.java (99%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/CropUtil.java (99%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/HighlightView.java (99%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/ImageViewTouchBase.java (99%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/Log.java (87%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/MonitoredActivity.java (98%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/RotateBitmap.java (98%)
 rename android_crop_lib/src/main/java/com/soundcloud/{android => }/crop/UriUtil.java (97%)

diff --git a/android_crop_lib/build.gradle b/android_crop_lib/build.gradle
index 71b8f1d5c..13b6e6967 100644
--- a/android_crop_lib/build.gradle
+++ b/android_crop_lib/build.gradle
@@ -7,9 +7,6 @@ android {
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
-
-        testApplicationId 'com.soundcloud.android.crop.test'
-        testInstrumentationRunner 'android.test.InstrumentationTestRunner'
     }
 
     buildTypes {
diff --git a/android_crop_lib/src/main/AndroidManifest.xml b/android_crop_lib/src/main/AndroidManifest.xml
index 0cb62bb6e..abc38ad0a 100644
--- a/android_crop_lib/src/main/AndroidManifest.xml
+++ b/android_crop_lib/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.soundcloud.android.crop" />
+<manifest package="com.soundcloud.crop" />
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java b/android_crop_lib/src/main/java/com/soundcloud/crop/Crop.java
similarity index 99%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/Crop.java
index 70a56e1a7..f3fcc2bb7 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/Crop.java
@@ -1,4 +1,4 @@
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java b/android_crop_lib/src/main/java/com/soundcloud/crop/CropImageActivity.java
similarity index 99%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/CropImageActivity.java
index 1cb31d04e..782cfe599 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/CropImageActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java b/android_crop_lib/src/main/java/com/soundcloud/crop/CropImageView.java
similarity index 99%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/CropImageView.java
index caa9841ee..4ad26c7d2 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/CropImageView.java
@@ -1,4 +1,4 @@
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java b/android_crop_lib/src/main/java/com/soundcloud/crop/CropUtil.java
similarity index 99%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/CropUtil.java
index 6056b8462..2f945e3f1 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/CropUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.app.ProgressDialog;
 import android.content.ContentResolver;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/HighlightView.java b/android_crop_lib/src/main/java/com/soundcloud/crop/HighlightView.java
similarity index 99%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/HighlightView.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/HighlightView.java
index 27cc10da5..ec0b7644f 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/HighlightView.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/HighlightView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/ImageViewTouchBase.java b/android_crop_lib/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java
similarity index 99%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/ImageViewTouchBase.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java
index 5e0d05f09..64dc8415c 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/ImageViewTouchBase.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/Log.java b/android_crop_lib/src/main/java/com/soundcloud/crop/Log.java
similarity index 87%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/Log.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/Log.java
index e5be72c55..0522a62e4 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/Log.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/Log.java
@@ -1,4 +1,4 @@
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 class Log {
 
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java b/android_crop_lib/src/main/java/com/soundcloud/crop/MonitoredActivity.java
similarity index 98%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/MonitoredActivity.java
index 8cdee5538..91e6e72ed 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/MonitoredActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.app.Activity;
 import android.os.Bundle;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/RotateBitmap.java b/android_crop_lib/src/main/java/com/soundcloud/crop/RotateBitmap.java
similarity index 98%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/RotateBitmap.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/RotateBitmap.java
index 22ef2b49d..1b1f9a2c8 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/RotateBitmap.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/RotateBitmap.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
diff --git a/android_crop_lib/src/main/java/com/soundcloud/android/crop/UriUtil.java b/android_crop_lib/src/main/java/com/soundcloud/crop/UriUtil.java
similarity index 97%
rename from android_crop_lib/src/main/java/com/soundcloud/android/crop/UriUtil.java
rename to android_crop_lib/src/main/java/com/soundcloud/crop/UriUtil.java
index dd673834e..271202feb 100644
--- a/android_crop_lib/src/main/java/com/soundcloud/android/crop/UriUtil.java
+++ b/android_crop_lib/src/main/java/com/soundcloud/crop/UriUtil.java
@@ -1,4 +1,4 @@
-package com.soundcloud.android.crop;
+package com.soundcloud.crop;
 
 import android.content.Context;
 import android.net.Uri;
diff --git a/android_crop_lib/src/main/res/layout/crop__activity_crop.xml b/android_crop_lib/src/main/res/layout/crop__activity_crop.xml
index b42483d5c..c133df012 100644
--- a/android_crop_lib/src/main/res/layout/crop__activity_crop.xml
+++ b/android_crop_lib/src/main/res/layout/crop__activity_crop.xml
@@ -9,7 +9,7 @@
         android:id="@+id/done_cancel_bar"
         layout="@layout/crop__layout_done_cancel" />
 
-    <com.soundcloud.android.crop.CropImageView
+    <com.soundcloud.crop.CropImageView
         android:id="@+id/crop_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 97d25b1d8..8cbe22dd4 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -177,8 +177,8 @@
 -keep class com.darsh.multipleimageselect.** { *; }
 -dontwarn com.darsh.multipleimageselect.**
 
--keep class com.soundcloud.android.crop.** { *; }
--dontwarn com.soundcloud.android.crop.**
+-keep class com.soundcloud.crop.** { *; }
+-dontwarn com.soundcloud.crop.**
 
 # glide4.0
 -keep public class * implements com.bumptech.glide.module.GlideModule
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 25ab946c3..4524a4bbd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -132,7 +132,7 @@
 <!--            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
         <!-- 小米 -->
         <activity
-            android:name="com.soundcloud.android.crop.CropImageActivity"
+            android:name="com.soundcloud.crop.CropImageActivity"
             android:screenOrientation="portrait" /> <!-- 华为 -->
         <activity
             android:name="com.darsh.multipleimageselect.activities.AlbumSelectActivity"
diff --git a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
index 43f543105..ed33b8589 100644
--- a/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
+++ b/app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java
@@ -34,7 +34,7 @@ import com.jph.takephoto.uitl.TImageFiles;
 import com.jph.takephoto.uitl.TUriParse;
 import com.jph.takephoto.uitl.TUtils;
 import com.orhanobut.logger.Logger;
-import com.soundcloud.android.crop.Crop;
+import com.soundcloud.crop.Crop;
 import com.chwl.app.R;
 import com.chwl.library.utils.SingleToastUtil;
 
diff --git a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java
index 8d61e4563..dc36ef98e 100644
--- a/app/src/main/java/com/jph/takephoto/uitl/TUtils.java
+++ b/app/src/main/java/com/jph/takephoto/uitl/TUtils.java
@@ -19,7 +19,7 @@ import com.jph.takephoto.model.TException;
 import com.jph.takephoto.model.TExceptionType;
 import com.jph.takephoto.model.TImage;
 import com.jph.takephoto.model.TIntentWap;
-import com.soundcloud.android.crop.Crop;
+import com.soundcloud.crop.Crop;
 import com.chwl.app.R;
 import com.chwl.library.utils.SingleToastUtil;