From 46ba8d2db30f3d6cd47f3f181e7c7d0a2f71f627 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 23 Nov 2023 20:52:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=A7=BB=E5=8A=A8crop=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- {android_crop_lib => libs/lib_crop}/.gitignore | 0 {android_crop_lib => libs/lib_crop}/build.gradle | 0 .../lib_crop}/src/main/AndroidManifest.xml | 0 .../src/main/java/com/soundcloud/crop/Crop.java | 0 .../java/com/soundcloud/crop/CropImageActivity.java | 0 .../java/com/soundcloud/crop/CropImageView.java | 0 .../src/main/java/com/soundcloud/crop/CropUtil.java | 0 .../java/com/soundcloud/crop/HighlightView.java | 0 .../com/soundcloud/crop/ImageViewTouchBase.java | 0 .../src/main/java/com/soundcloud/crop/Log.java | 0 .../java/com/soundcloud/crop/MonitoredActivity.java | 0 .../main/java/com/soundcloud/crop/RotateBitmap.java | 0 .../src/main/java/com/soundcloud/crop/UriUtil.java | 0 .../src/main/res/drawable-hdpi/crop__divider.9.png | Bin .../src/main/res/drawable-hdpi/crop__ic_cancel.webp | Bin .../src/main/res/drawable-hdpi/crop__ic_done.webp | Bin .../src/main/res/drawable-mdpi/crop__divider.9.png | Bin .../src/main/res/drawable-mdpi/crop__ic_cancel.webp | Bin .../src/main/res/drawable-mdpi/crop__ic_done.webp | Bin .../drawable-v21/crop__selectable_background.xml | 0 .../src/main/res/drawable-xhdpi/crop__divider.9.png | Bin .../main/res/drawable-xhdpi/crop__ic_cancel.webp | Bin .../src/main/res/drawable-xhdpi/crop__ic_done.webp | Bin .../src/main/res/drawable-xhdpi/crop__tile.webp | Bin .../res/drawable/crop__selectable_background.xml | 0 .../src/main/res/drawable/crop__texture.xml | 0 .../src/main/res/layout/crop__activity_crop.xml | 0 .../main/res/layout/crop__layout_done_cancel.xml | 0 .../lib_crop}/src/main/res/values-v21/colors.xml | 0 .../lib_crop}/src/main/res/values/attrs.xml | 0 .../lib_crop}/src/main/res/values/colors.xml | 0 .../lib_crop}/src/main/res/values/dimens.xml | 0 .../lib_crop}/src/main/res/values/strings.xml | 0 .../lib_crop}/src/main/res/values/styles.xml | 0 settings.gradle | 2 +- 36 files changed, 2 insertions(+), 2 deletions(-) rename {android_crop_lib => libs/lib_crop}/.gitignore (100%) rename {android_crop_lib => libs/lib_crop}/build.gradle (100%) rename {android_crop_lib => libs/lib_crop}/src/main/AndroidManifest.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/Crop.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/CropImageActivity.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/CropImageView.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/CropUtil.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/HighlightView.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/Log.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/MonitoredActivity.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/RotateBitmap.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/java/com/soundcloud/crop/UriUtil.java (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-hdpi/crop__divider.9.png (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-hdpi/crop__ic_cancel.webp (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-hdpi/crop__ic_done.webp (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-mdpi/crop__divider.9.png (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-mdpi/crop__ic_cancel.webp (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-mdpi/crop__ic_done.webp (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-v21/crop__selectable_background.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-xhdpi/crop__divider.9.png (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-xhdpi/crop__ic_cancel.webp (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-xhdpi/crop__ic_done.webp (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable-xhdpi/crop__tile.webp (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable/crop__selectable_background.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/drawable/crop__texture.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/layout/crop__activity_crop.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/layout/crop__layout_done_cancel.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/values-v21/colors.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/values/attrs.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/values/colors.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/values/dimens.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/values/strings.xml (100%) rename {android_crop_lib => libs/lib_crop}/src/main/res/values/styles.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index 4cdbc8aff..20c1f3000 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -253,7 +253,7 @@ dependencies { //数字滚动效果 implementation 'com.github.YvesCheung:RollingText:1.2.3' // 引入原有第三方裁图源码,方便修改 - api project(':android_crop_lib') + api project(':libs:lib_crop') //rx权限请求框架 implementation('com.github.tbruyelle:rxpermissions:0.10.2') { diff --git a/android_crop_lib/.gitignore b/libs/lib_crop/.gitignore similarity index 100% rename from android_crop_lib/.gitignore rename to libs/lib_crop/.gitignore diff --git a/android_crop_lib/build.gradle b/libs/lib_crop/build.gradle similarity index 100% rename from android_crop_lib/build.gradle rename to libs/lib_crop/build.gradle diff --git a/android_crop_lib/src/main/AndroidManifest.xml b/libs/lib_crop/src/main/AndroidManifest.xml similarity index 100% rename from android_crop_lib/src/main/AndroidManifest.xml rename to libs/lib_crop/src/main/AndroidManifest.xml diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/Crop.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/Crop.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/Crop.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/Crop.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/CropImageActivity.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/CropImageActivity.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/CropImageActivity.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/CropImageActivity.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/CropImageView.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/CropImageView.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/CropImageView.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/CropImageView.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/CropUtil.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/CropUtil.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/CropUtil.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/CropUtil.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/HighlightView.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/HighlightView.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/HighlightView.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/HighlightView.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/ImageViewTouchBase.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/Log.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/Log.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/Log.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/Log.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/MonitoredActivity.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/MonitoredActivity.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/MonitoredActivity.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/MonitoredActivity.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/RotateBitmap.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/RotateBitmap.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/RotateBitmap.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/RotateBitmap.java diff --git a/android_crop_lib/src/main/java/com/soundcloud/crop/UriUtil.java b/libs/lib_crop/src/main/java/com/soundcloud/crop/UriUtil.java similarity index 100% rename from android_crop_lib/src/main/java/com/soundcloud/crop/UriUtil.java rename to libs/lib_crop/src/main/java/com/soundcloud/crop/UriUtil.java diff --git a/android_crop_lib/src/main/res/drawable-hdpi/crop__divider.9.png b/libs/lib_crop/src/main/res/drawable-hdpi/crop__divider.9.png similarity index 100% rename from android_crop_lib/src/main/res/drawable-hdpi/crop__divider.9.png rename to libs/lib_crop/src/main/res/drawable-hdpi/crop__divider.9.png diff --git a/android_crop_lib/src/main/res/drawable-hdpi/crop__ic_cancel.webp b/libs/lib_crop/src/main/res/drawable-hdpi/crop__ic_cancel.webp similarity index 100% rename from android_crop_lib/src/main/res/drawable-hdpi/crop__ic_cancel.webp rename to libs/lib_crop/src/main/res/drawable-hdpi/crop__ic_cancel.webp diff --git a/android_crop_lib/src/main/res/drawable-hdpi/crop__ic_done.webp b/libs/lib_crop/src/main/res/drawable-hdpi/crop__ic_done.webp similarity index 100% rename from android_crop_lib/src/main/res/drawable-hdpi/crop__ic_done.webp rename to libs/lib_crop/src/main/res/drawable-hdpi/crop__ic_done.webp diff --git a/android_crop_lib/src/main/res/drawable-mdpi/crop__divider.9.png b/libs/lib_crop/src/main/res/drawable-mdpi/crop__divider.9.png similarity index 100% rename from android_crop_lib/src/main/res/drawable-mdpi/crop__divider.9.png rename to libs/lib_crop/src/main/res/drawable-mdpi/crop__divider.9.png diff --git a/android_crop_lib/src/main/res/drawable-mdpi/crop__ic_cancel.webp b/libs/lib_crop/src/main/res/drawable-mdpi/crop__ic_cancel.webp similarity index 100% rename from android_crop_lib/src/main/res/drawable-mdpi/crop__ic_cancel.webp rename to libs/lib_crop/src/main/res/drawable-mdpi/crop__ic_cancel.webp diff --git a/android_crop_lib/src/main/res/drawable-mdpi/crop__ic_done.webp b/libs/lib_crop/src/main/res/drawable-mdpi/crop__ic_done.webp similarity index 100% rename from android_crop_lib/src/main/res/drawable-mdpi/crop__ic_done.webp rename to libs/lib_crop/src/main/res/drawable-mdpi/crop__ic_done.webp diff --git a/android_crop_lib/src/main/res/drawable-v21/crop__selectable_background.xml b/libs/lib_crop/src/main/res/drawable-v21/crop__selectable_background.xml similarity index 100% rename from android_crop_lib/src/main/res/drawable-v21/crop__selectable_background.xml rename to libs/lib_crop/src/main/res/drawable-v21/crop__selectable_background.xml diff --git a/android_crop_lib/src/main/res/drawable-xhdpi/crop__divider.9.png b/libs/lib_crop/src/main/res/drawable-xhdpi/crop__divider.9.png similarity index 100% rename from android_crop_lib/src/main/res/drawable-xhdpi/crop__divider.9.png rename to libs/lib_crop/src/main/res/drawable-xhdpi/crop__divider.9.png diff --git a/android_crop_lib/src/main/res/drawable-xhdpi/crop__ic_cancel.webp b/libs/lib_crop/src/main/res/drawable-xhdpi/crop__ic_cancel.webp similarity index 100% rename from android_crop_lib/src/main/res/drawable-xhdpi/crop__ic_cancel.webp rename to libs/lib_crop/src/main/res/drawable-xhdpi/crop__ic_cancel.webp diff --git a/android_crop_lib/src/main/res/drawable-xhdpi/crop__ic_done.webp b/libs/lib_crop/src/main/res/drawable-xhdpi/crop__ic_done.webp similarity index 100% rename from android_crop_lib/src/main/res/drawable-xhdpi/crop__ic_done.webp rename to libs/lib_crop/src/main/res/drawable-xhdpi/crop__ic_done.webp diff --git a/android_crop_lib/src/main/res/drawable-xhdpi/crop__tile.webp b/libs/lib_crop/src/main/res/drawable-xhdpi/crop__tile.webp similarity index 100% rename from android_crop_lib/src/main/res/drawable-xhdpi/crop__tile.webp rename to libs/lib_crop/src/main/res/drawable-xhdpi/crop__tile.webp diff --git a/android_crop_lib/src/main/res/drawable/crop__selectable_background.xml b/libs/lib_crop/src/main/res/drawable/crop__selectable_background.xml similarity index 100% rename from android_crop_lib/src/main/res/drawable/crop__selectable_background.xml rename to libs/lib_crop/src/main/res/drawable/crop__selectable_background.xml diff --git a/android_crop_lib/src/main/res/drawable/crop__texture.xml b/libs/lib_crop/src/main/res/drawable/crop__texture.xml similarity index 100% rename from android_crop_lib/src/main/res/drawable/crop__texture.xml rename to libs/lib_crop/src/main/res/drawable/crop__texture.xml diff --git a/android_crop_lib/src/main/res/layout/crop__activity_crop.xml b/libs/lib_crop/src/main/res/layout/crop__activity_crop.xml similarity index 100% rename from android_crop_lib/src/main/res/layout/crop__activity_crop.xml rename to libs/lib_crop/src/main/res/layout/crop__activity_crop.xml diff --git a/android_crop_lib/src/main/res/layout/crop__layout_done_cancel.xml b/libs/lib_crop/src/main/res/layout/crop__layout_done_cancel.xml similarity index 100% rename from android_crop_lib/src/main/res/layout/crop__layout_done_cancel.xml rename to libs/lib_crop/src/main/res/layout/crop__layout_done_cancel.xml diff --git a/android_crop_lib/src/main/res/values-v21/colors.xml b/libs/lib_crop/src/main/res/values-v21/colors.xml similarity index 100% rename from android_crop_lib/src/main/res/values-v21/colors.xml rename to libs/lib_crop/src/main/res/values-v21/colors.xml diff --git a/android_crop_lib/src/main/res/values/attrs.xml b/libs/lib_crop/src/main/res/values/attrs.xml similarity index 100% rename from android_crop_lib/src/main/res/values/attrs.xml rename to libs/lib_crop/src/main/res/values/attrs.xml diff --git a/android_crop_lib/src/main/res/values/colors.xml b/libs/lib_crop/src/main/res/values/colors.xml similarity index 100% rename from android_crop_lib/src/main/res/values/colors.xml rename to libs/lib_crop/src/main/res/values/colors.xml diff --git a/android_crop_lib/src/main/res/values/dimens.xml b/libs/lib_crop/src/main/res/values/dimens.xml similarity index 100% rename from android_crop_lib/src/main/res/values/dimens.xml rename to libs/lib_crop/src/main/res/values/dimens.xml diff --git a/android_crop_lib/src/main/res/values/strings.xml b/libs/lib_crop/src/main/res/values/strings.xml similarity index 100% rename from android_crop_lib/src/main/res/values/strings.xml rename to libs/lib_crop/src/main/res/values/strings.xml diff --git a/android_crop_lib/src/main/res/values/styles.xml b/libs/lib_crop/src/main/res/values/styles.xml similarity index 100% rename from android_crop_lib/src/main/res/values/styles.xml rename to libs/lib_crop/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle index 48d85bdd3..c9c97c1cc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,4 @@ include ':app' -include ':android_crop_lib' include ':core' include ':library' include ':nim_uikit' @@ -8,3 +7,4 @@ include ':modules:module_google' include ':modules:module_base' include ':libs:lib_core' include ':libs:lib_utils' +include ':libs:lib_crop'