diff --git a/app/build.gradle b/app/build.gradle index 5e4eaea91..c51cb2841 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -108,8 +108,6 @@ android { 'src/module_treasure_box/java', 'src/module_community/java', 'src/module_album/java', - 'src/module_easypermission/java', - 'src/module_luban/java', ] @@ -130,7 +128,6 @@ android { 'src/module_treasure_box/res', 'src/module_community/res', 'src/module_album/res', - 'src/module_easypermission/res', ] @@ -264,9 +261,6 @@ dependencies { //Google Play Referrer API implementation 'com.android.installreferrer:installreferrer:2.2' - // 引入easyphotos，方便修改 - api project(':easyphotos') - //mmkv implementation 'com.tencent:mmkv:1.2.13' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index fb9ce500a..521d46ab5 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -467,4 +467,4 @@ -keep public class com.android.installreferrer.**{ *; } ## EasyPhotos --keep class com.huantansheng.easyphotos.models.** { *; } \ No newline at end of file +-keep class com.yizhuan.xchat_android_library.models.** { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f9d07e82e..e77ec1818 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -995,11 +995,6 @@ - \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/common/dialog/PhotoDialog.kt b/app/src/main/java/com/yizhuan/erban/common/dialog/PhotoDialog.kt index ea5c66ec4..7f74e4b4e 100644 --- a/app/src/main/java/com/yizhuan/erban/common/dialog/PhotoDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/common/dialog/PhotoDialog.kt @@ -11,7 +11,7 @@ import android.view.Window import android.view.WindowManager import com.hjq.toast.ToastUtils import kotlinx.coroutines.Job -import com.yizhuan.erban.EasyPermissions +import com.yizhuan.xchat_android_library.EasyPermissions import com.yizhuan.erban.R import com.yizhuan.erban.application.XChatApplication import com.yizhuan.erban.base.BaseDialogFragment @@ -20,9 +20,7 @@ import com.yizhuan.erban.common.util.PhotoCompressCallback import com.yizhuan.erban.common.util.PhotoCompressUtil import com.yizhuan.erban.common.util.PhotosCompressCallback import com.yizhuan.erban.databinding.PhotoDialogBinding -import com.yizhuan.erban.ui.setting.ModifyPwdActivity import com.yizhuan.erban.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_library.utils.ResUtil /** * 该对话框的功能提供拍摄和选择图片 diff --git a/app/src/main/java/com/yizhuan/erban/common/glide/GlideEngine.java b/app/src/main/java/com/yizhuan/erban/common/glide/GlideEngine.java index d7abf143c..955cab738 100644 --- a/app/src/main/java/com/yizhuan/erban/common/glide/GlideEngine.java +++ b/app/src/main/java/com/yizhuan/erban/common/glide/GlideEngine.java @@ -5,7 +5,7 @@ import android.graphics.Bitmap; import android.net.Uri; import android.widget.ImageView; import androidx.annotation.NonNull; -import com.huantansheng.easyphotos.engine.ImageEngine; +import com.yizhuan.xchat_android_library.engine.ImageEngine; /** * Created by wushaocheng on 2021/3/29 15:18. diff --git a/app/src/main/java/com/yizhuan/erban/common/photo/PhotoProvider.kt b/app/src/main/java/com/yizhuan/erban/common/photo/PhotoProvider.kt index 7cd4be99b..6b25a1bf2 100644 --- a/app/src/main/java/com/yizhuan/erban/common/photo/PhotoProvider.kt +++ b/app/src/main/java/com/yizhuan/erban/common/photo/PhotoProvider.kt @@ -7,9 +7,9 @@ import android.os.Build import android.os.Environment import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity -import com.huantansheng.easyphotos.EasyPhotos -import com.huantansheng.easyphotos.constant.Type.* -import com.huantansheng.easyphotos.models.album.entity.Photo +import com.yizhuan.xchat_android_library.EasyPhotos +import com.yizhuan.xchat_android_library.constant.Type.* +import com.yizhuan.xchat_android_library.models.album.entity.Photo import com.yizhuan.erban.application.XChatApplication import com.yizhuan.erban.common.delegate.SpDelegate import com.yizhuan.erban.common.file.FileHelper diff --git a/app/src/main/java/com/yizhuan/erban/common/util/PhotoCompressUtil.kt b/app/src/main/java/com/yizhuan/erban/common/util/PhotoCompressUtil.kt index 2e7425460..dab04e7a4 100644 --- a/app/src/main/java/com/yizhuan/erban/common/util/PhotoCompressUtil.kt +++ b/app/src/main/java/com/yizhuan/erban/common/util/PhotoCompressUtil.kt @@ -4,7 +4,7 @@ import android.content.Context import android.os.Environment import android.text.TextUtils import android.util.Log -import com.yizhuan.erban.Luban +import com.yizhuan.xchat_android_library.Luban import com.yizhuan.erban.application.XChatApplication import com.yizhuan.erban.common.file.FileHelper import com.yizhuan.xchat_android_core.Constants diff --git a/app/src/main/res/drawable/shape_dialog_btn_white_bg.xml b/app/src/main/res/drawable/shape_dialog_btn_white_bg.xml index d0ace5f08..ba241141f 100644 --- a/app/src/main/res/drawable/shape_dialog_btn_white_bg.xml +++ b/app/src/main/res/drawable/shape_dialog_btn_white_bg.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/easyphotos/.gitignore b/easyphotos/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/easyphotos/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/easyphotos/build.gradle b/easyphotos/build.gradle deleted file mode 100644 index ccb6b998a..000000000 --- a/easyphotos/build.gradle +++ /dev/null @@ -1,38 +0,0 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' - -android { - compileSdk COMPILE_SDK_VERSION.toInteger() - - defaultConfig { - targetSdk TARGET_SDK_VERSION.toInteger() - minSdk MIN_SDK_VERSION.toInteger() - - testApplicationId 'com.soundcloud.android.crop.test' - testInstrumentationRunner 'android.test.InstrumentationTestRunner' - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - buildTypes { - release { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - buildToolsVersion = '30.0.3' -} - -dependencies { - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.appcompat:appcompat:1.4.2' - implementation 'com.google.android.material:material:1.6.1' - implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0' - implementation 'com.github.chrisbanes:PhotoView:2.3.0' -} \ No newline at end of file diff --git a/easyphotos/src/main/AndroidManifest.xml b/easyphotos/src/main/AndroidManifest.xml deleted file mode 100644 index 157ddb6ea..000000000 --- a/easyphotos/src/main/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 50ce294ca..b13ac30a2 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -18,6 +18,30 @@ android { dataBinding { enabled = true } + viewBinding { + enabled = true + } + + sourceSets { + + main { + java.srcDirs = [ + 'src/main/java', + 'src/module_easypermission/java', + 'src/module_luban/java', + 'src/module_easyphoto/java', + + ] + + res.srcDirs = [ + 'src/main/res', + 'src/module_easypermission/res', + 'src/module_easyphoto/res', + + ] + + } + } buildTypes { release { @@ -64,7 +88,7 @@ dependencies { api 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' api 'androidx.lifecycle:lifecycle-extensions:2.2.0' - api 'com.google.android.material:material:1.5.0' + api 'com.google.android.material:material:1.6.1' api "com.squareup.retrofit2:retrofit:${retrofitVersion}" api "com.squareup.okhttp3:okhttp:${okhttp3}" @@ -94,6 +118,10 @@ dependencies { api 'com.github.getActivity:ToastUtils:10.3' + api 'androidx.legacy:legacy-support-v4:1.0.0' + api 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0' + api 'com.github.chrisbanes:PhotoView:2.3.0' + } repositories { mavenCentral() diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 79c45707d..203031fdd 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,3 +1,43 @@ - + + + + + + + + + + + + + diff --git a/library/src/main/res/drawable/shape_dialog_btn_white_bg.xml b/library/src/main/res/drawable/shape_dialog_btn_white_bg.xml new file mode 100644 index 000000000..ba241141f --- /dev/null +++ b/library/src/main/res/drawable/shape_dialog_btn_white_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml index 045e125f3..18ab94a02 100644 --- a/library/src/main/res/values/colors.xml +++ b/library/src/main/res/values/colors.xml @@ -1,3 +1,4 @@ + #FFFFFF diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index 3d96bf153..eb549de13 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ +]> - XChat_Android_Library + &app_name; 剛剛 今天 diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/AfterPermissionGranted.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AfterPermissionGranted.java similarity index 95% rename from app/src/module_easypermission/java/com/yizhuan/erban/AfterPermissionGranted.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AfterPermissionGranted.java index e83b4a00a..46ad2840a 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/AfterPermissionGranted.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AfterPermissionGranted.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/AppSettingsDialog.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialog.java similarity index 99% rename from app/src/module_easypermission/java/com/yizhuan/erban/AppSettingsDialog.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialog.java index 144892e68..489de54ad 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/AppSettingsDialog.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.app.Activity; import android.content.Context; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/AppSettingsDialogHolderActivity.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialogHolderActivity.java similarity index 98% rename from app/src/module_easypermission/java/com/yizhuan/erban/AppSettingsDialogHolderActivity.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialogHolderActivity.java index f55b66aeb..ba41e3a02 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/AppSettingsDialogHolderActivity.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialogHolderActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.app.Activity; import android.app.Dialog; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/EasyPermissions.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/EasyPermissions.java similarity index 99% rename from app/src/module_easypermission/java/com/yizhuan/erban/EasyPermissions.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/EasyPermissions.java index d020ebf20..bf6047b73 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/EasyPermissions.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/EasyPermissions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.Manifest; import android.app.Activity; @@ -31,7 +31,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import com.yizhuan.erban.helper.PermissionHelper; +import com.yizhuan.xchat_android_library.helper.PermissionHelper; /** * Utility to request and check System permissions for apps targeting Android M (API >= 23). diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/PermissionRequest.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/PermissionRequest.java similarity index 98% rename from app/src/module_easypermission/java/com/yizhuan/erban/PermissionRequest.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/PermissionRequest.java index 4d534580a..ecfead639 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/PermissionRequest.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/PermissionRequest.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.app.Activity; import androidx.annotation.NonNull; @@ -11,7 +11,7 @@ import androidx.fragment.app.Fragment; import java.util.Arrays; -import com.yizhuan.erban.helper.PermissionHelper; +import com.yizhuan.xchat_android_library.helper.PermissionHelper; /** * An immutable model object that holds all of the parameters associated with a permission request, @@ -156,7 +156,6 @@ public final class PermissionRequest { * at least once, but has not yet permanently denied your permissions. Should the user * permanently deny your permissions, use the {@link AppSettingsDialog} instead. *

- * The default rationale text is {@link R.string#rationale_ask}. * * @param rationale the rationale to be displayed to the user should they deny your * permission at least once diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogClickListener.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogClickListener.java similarity index 96% rename from app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogClickListener.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogClickListener.java index dc1fa5015..9b1e59186 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogClickListener.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.app.Activity; import android.app.Dialog; @@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment; import java.util.Arrays; -import com.yizhuan.erban.helper.PermissionHelper; +import com.yizhuan.xchat_android_library.helper.PermissionHelper; /** * Click listener for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}. diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogConfig.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogConfig.java similarity index 99% rename from app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogConfig.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogConfig.java index 36c57a3f3..26e83437d 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogConfig.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.app.Dialog; import android.content.Context; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogFragment.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragment.java similarity index 98% rename from app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogFragment.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragment.java index eb9d04738..1ecc1f050 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogFragment.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.app.Dialog; import android.app.DialogFragment; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogFragmentCompat.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragmentCompat.java similarity index 98% rename from app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogFragmentCompat.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragmentCompat.java index e23ddc6bc..65b1c788e 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/RationaleDialogFragmentCompat.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragmentCompat.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.app.Dialog; import android.content.Context; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/helper/ActivityPermissionHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/ActivityPermissionHelper.java similarity index 94% rename from app/src/module_easypermission/java/com/yizhuan/erban/helper/ActivityPermissionHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/ActivityPermissionHelper.java index c7a7b45cf..5e106826d 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/helper/ActivityPermissionHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/ActivityPermissionHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.helper; +package com.yizhuan.xchat_android_library.helper; import android.app.Activity; import android.app.Fragment; @@ -9,7 +9,7 @@ import androidx.annotation.StyleRes; import androidx.core.app.ActivityCompat; import android.util.Log; -import com.yizhuan.erban.RationaleDialogFragment; +import com.yizhuan.xchat_android_library.RationaleDialogFragment; /** * Permissions helper for {@link Activity}. diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/helper/AppCompatActivityPermissionsHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/AppCompatActivityPermissionsHelper.java similarity index 95% rename from app/src/module_easypermission/java/com/yizhuan/erban/helper/AppCompatActivityPermissionsHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/AppCompatActivityPermissionsHelper.java index f324042ae..c5ff4f22d 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/helper/AppCompatActivityPermissionsHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/AppCompatActivityPermissionsHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.helper; +package com.yizhuan.xchat_android_library.helper; import android.content.Context; import androidx.annotation.NonNull; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/helper/BaseSupportPermissionsHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/BaseSupportPermissionsHelper.java similarity index 92% rename from app/src/module_easypermission/java/com/yizhuan/erban/helper/BaseSupportPermissionsHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/BaseSupportPermissionsHelper.java index 55ba05168..92ad85d89 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/helper/BaseSupportPermissionsHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/BaseSupportPermissionsHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.helper; +package com.yizhuan.xchat_android_library.helper; import androidx.annotation.NonNull; import androidx.annotation.StyleRes; @@ -6,7 +6,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import android.util.Log; -import com.yizhuan.erban.RationaleDialogFragmentCompat; +import com.yizhuan.xchat_android_library.RationaleDialogFragmentCompat; /** * Implementation of {@link PermissionHelper} for Support Library host classes. diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/helper/LowApiPermissionsHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/LowApiPermissionsHelper.java similarity index 97% rename from app/src/module_easypermission/java/com/yizhuan/erban/helper/LowApiPermissionsHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/LowApiPermissionsHelper.java index 0bd60387c..b19b7b4e8 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/helper/LowApiPermissionsHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/LowApiPermissionsHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.helper; +package com.yizhuan.xchat_android_library.helper; import android.app.Activity; import android.content.Context; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/helper/PermissionHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/PermissionHelper.java similarity index 98% rename from app/src/module_easypermission/java/com/yizhuan/erban/helper/PermissionHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/PermissionHelper.java index 4ff87fd57..f1d2768bd 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/helper/PermissionHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/PermissionHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.helper; +package com.yizhuan.xchat_android_library.helper; import android.app.Activity; import android.content.Context; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/helper/SupportFragmentPermissionHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/SupportFragmentPermissionHelper.java similarity index 95% rename from app/src/module_easypermission/java/com/yizhuan/erban/helper/SupportFragmentPermissionHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/SupportFragmentPermissionHelper.java index 4afa4ceb5..f86359af9 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/helper/SupportFragmentPermissionHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/SupportFragmentPermissionHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.helper; +package com.yizhuan.xchat_android_library.helper; import android.content.Context; import androidx.annotation.NonNull; diff --git a/app/src/module_easypermission/java/com/yizhuan/erban/helper/package-info.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/package-info.java similarity index 62% rename from app/src/module_easypermission/java/com/yizhuan/erban/helper/package-info.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/package-info.java index 4dad8370f..8d7e0f8f4 100644 --- a/app/src/module_easypermission/java/com/yizhuan/erban/helper/package-info.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/package-info.java @@ -1,4 +1,4 @@ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -package com.yizhuan.erban.helper; +package com.yizhuan.xchat_android_library.helper; import androidx.annotation.RestrictTo; diff --git a/app/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml b/library/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml similarity index 100% rename from app/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml rename to library/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml diff --git a/app/src/module_easypermission/res/values/colors.xml b/library/src/module_easypermission/res/values/colors.xml similarity index 100% rename from app/src/module_easypermission/res/values/colors.xml rename to library/src/module_easypermission/res/values/colors.xml diff --git a/app/src/module_easypermission/res/values/strings.xml b/library/src/module_easypermission/res/values/strings.xml similarity index 100% rename from app/src/module_easypermission/res/values/strings.xml rename to library/src/module_easypermission/res/values/strings.xml diff --git a/app/src/module_easypermission/res/values/styles.xml b/library/src/module_easypermission/res/values/styles.xml similarity index 100% rename from app/src/module_easypermission/res/values/styles.xml rename to library/src/module_easypermission/res/values/styles.xml diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/EasyPhotos.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/EasyPhotos.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/EasyPhotos.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/EasyPhotos.java index f659710e4..1a8ffc4a0 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/EasyPhotos.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/EasyPhotos.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos; +package com.yizhuan.xchat_android_library; import android.app.Activity; import android.app.Fragment; @@ -9,19 +9,19 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.fragment.app.FragmentActivity; -import com.huantansheng.easyphotos.builder.AlbumBuilder; -import com.huantansheng.easyphotos.callback.PuzzleCallback; -import com.huantansheng.easyphotos.engine.ImageEngine; -import com.huantansheng.easyphotos.models.ad.AdListener; -import com.huantansheng.easyphotos.models.album.AlbumModel; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.models.sticker.StickerModel; -import com.huantansheng.easyphotos.models.sticker.entity.TextStickerData; -import com.huantansheng.easyphotos.ui.PuzzleActivity; -import com.huantansheng.easyphotos.utils.bitmap.BitmapUtils; -import com.huantansheng.easyphotos.utils.bitmap.SaveBitmapCallBack; -import com.huantansheng.easyphotos.utils.media.MediaScannerConnectionUtils; -import com.huantansheng.easyphotos.utils.result.EasyResult; +import com.yizhuan.xchat_android_library.builder.AlbumBuilder; +import com.yizhuan.xchat_android_library.callback.PuzzleCallback; +import com.yizhuan.xchat_android_library.engine.ImageEngine; +import com.yizhuan.xchat_android_library.models.ad.AdListener; +import com.yizhuan.xchat_android_library.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.models.sticker.StickerModel; +import com.yizhuan.xchat_android_library.models.sticker.entity.TextStickerData; +import com.yizhuan.xchat_android_library.ui.PuzzleActivity; +import com.yizhuan.xchat_android_library.utils.bitmap.BitmapUtils; +import com.yizhuan.xchat_android_library.utils.bitmap.SaveBitmapCallBack; +import com.yizhuan.xchat_android_library.utils.media.MediaScannerConnectionUtils; +import com.yizhuan.xchat_android_library.utils.result.EasyResult; import java.io.File; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/builder/AlbumBuilder.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/builder/AlbumBuilder.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/builder/AlbumBuilder.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/builder/AlbumBuilder.java index f3f446666..f14243936 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/builder/AlbumBuilder.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/builder/AlbumBuilder.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.builder; +package com.yizhuan.xchat_android_library.builder; import android.app.Activity; import android.net.Uri; @@ -8,16 +8,16 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; -import com.huantansheng.easyphotos.callback.SelectCallback; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.engine.ImageEngine; -import com.huantansheng.easyphotos.models.ad.AdListener; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.result.Result; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.ui.EasyPhotosActivity; -import com.huantansheng.easyphotos.utils.result.EasyResult; -import com.huantansheng.easyphotos.utils.uri.UriUtils; +import com.yizhuan.xchat_android_library.callback.SelectCallback; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.engine.ImageEngine; +import com.yizhuan.xchat_android_library.models.ad.AdListener; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.result.Result; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.ui.EasyPhotosActivity; +import com.yizhuan.xchat_android_library.utils.result.EasyResult; +import com.yizhuan.xchat_android_library.utils.uri.UriUtils; import java.io.File; import java.lang.ref.WeakReference; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/callback/PuzzleCallback.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/PuzzleCallback.java similarity index 78% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/callback/PuzzleCallback.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/PuzzleCallback.java index eeae7597f..e687db6bf 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/callback/PuzzleCallback.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/PuzzleCallback.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.callback; +package com.yizhuan.xchat_android_library.callback; -import com.huantansheng.easyphotos.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; /** * PuzzleCallback diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/callback/SelectCallback.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/SelectCallback.java similarity index 84% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/callback/SelectCallback.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/SelectCallback.java index c91b3a7fa..2852933f0 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/callback/SelectCallback.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/SelectCallback.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.callback; +package com.yizhuan.xchat_android_library.callback; -import com.huantansheng.easyphotos.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Code.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Code.java similarity index 91% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Code.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Code.java index 92629f10f..ae20dd2c6 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Code.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Code.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.constant; +package com.yizhuan.xchat_android_library.constant; /** * Code常量 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Key.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Key.java similarity index 94% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Key.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Key.java index 4502f6a7e..c7b276dd9 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Key.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Key.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.constant; +package com.yizhuan.xchat_android_library.constant; /** * key的常量 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Type.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Type.java similarity index 87% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Type.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Type.java index f6e39cff9..b4a8a6142 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/constant/Type.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Type.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.constant; +package com.yizhuan.xchat_android_library.constant; /** * Created by huan on 2018/1/9. diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/engine/ImageEngine.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/engine/ImageEngine.java similarity index 97% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/engine/ImageEngine.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/engine/ImageEngine.java index 49226d426..bf4e0f54b 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/engine/ImageEngine.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/engine/ImageEngine.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.engine; +package com.yizhuan.xchat_android_library.engine; import android.content.Context; import android.graphics.Bitmap; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdEntity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdEntity.java similarity index 84% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdEntity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdEntity.java index 0d624c57c..1058d5665 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdEntity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdEntity.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.ad; +package com.yizhuan.xchat_android_library.models.ad; import android.view.View; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdListener.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdListener.java similarity index 74% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdListener.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdListener.java index ab5ed7687..3f36faec5 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdListener.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdListener.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.ad; +package com.yizhuan.xchat_android_library.models.ad; /** * 广告监听 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdViewHolder.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdViewHolder.java similarity index 81% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdViewHolder.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdViewHolder.java index 9b96e3d00..a1f29674a 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/ad/AdViewHolder.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdViewHolder.java @@ -1,10 +1,10 @@ -package com.huantansheng.easyphotos.models.ad; +package com.yizhuan.xchat_android_library.models.ad; import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.FrameLayout; -import com.huantansheng.easyphotos.R; +import com.yizhuan.xchat_android_library.R; /** * 广告viewolder diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/AlbumModel.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/AlbumModel.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/AlbumModel.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/AlbumModel.java index 1b1aff250..d2ee8e5aa 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/AlbumModel.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/AlbumModel.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.album; +package com.yizhuan.xchat_android_library.models.album; import android.Manifest; import android.content.ContentResolver; @@ -12,14 +12,14 @@ import android.text.TextUtils; import androidx.core.content.PermissionChecker; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.models.album.entity.Album; -import com.huantansheng.easyphotos.models.album.entity.AlbumItem; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.result.Result; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.utils.string.StringUtils; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.models.album.entity.Album; +import com.yizhuan.xchat_android_library.models.album.entity.AlbumItem; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.result.Result; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.utils.string.StringUtils; import java.io.File; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/Album.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Album.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/Album.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Album.java index d3aa004ed..aff63ce5a 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/Album.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Album.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.album.entity; +package com.yizhuan.xchat_android_library.models.album.entity; import android.net.Uri; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/AlbumItem.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/AlbumItem.java similarity index 92% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/AlbumItem.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/AlbumItem.java index 2208275fe..c3a3a95af 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/AlbumItem.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/AlbumItem.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.album.entity; +package com.yizhuan.xchat_android_library.models.album.entity; import android.net.Uri; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/Photo.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Photo.java similarity index 98% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/Photo.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Photo.java index 0d3d6ed7d..67cf5f89e 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/album/entity/Photo.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Photo.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.album.entity; +package com.yizhuan.xchat_android_library.models.album.entity; import android.net.Uri; import android.os.Parcel; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/Area.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Area.java similarity index 94% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/Area.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Area.java index 6f48cda25..aea68d0e9 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/Area.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Area.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.graphics.Path; import android.graphics.PointF; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/DegreeSeekBar.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/DegreeSeekBar.java similarity index 99% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/DegreeSeekBar.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/DegreeSeekBar.java index cfd7b5bb7..60d4b022c 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/DegreeSeekBar.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/DegreeSeekBar.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.annotation.TargetApi; import android.content.Context; @@ -14,7 +14,7 @@ import android.view.View; import androidx.core.content.ContextCompat; -import com.huantansheng.easyphotos.R; +import com.yizhuan.xchat_android_library.R; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/Line.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Line.java similarity index 92% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/Line.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Line.java index 79ab74fcc..830919db3 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/Line.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Line.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.graphics.PointF; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/MatrixUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/MatrixUtils.java similarity index 99% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/MatrixUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/MatrixUtils.java index 52e89a614..e1b733088 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/MatrixUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/MatrixUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.graphics.Matrix; import android.graphics.RectF; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleLayout.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleLayout.java index 615e4426e..5bd869830 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleLayout.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.graphics.RectF; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzlePiece.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzlePiece.java similarity index 97% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzlePiece.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzlePiece.java index ff76f25a8..b44b3e5ca 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzlePiece.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzlePiece.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.animation.ValueAnimator; import android.graphics.Bitmap; @@ -18,9 +18,9 @@ import android.view.MotionEvent; import android.view.View; import android.view.animation.DecelerateInterpolator; -import static com.huantansheng.easyphotos.models.puzzle.MatrixUtils.calculateImageIndents; -import static com.huantansheng.easyphotos.models.puzzle.MatrixUtils.getMinMatrixScale; -import static com.huantansheng.easyphotos.models.puzzle.MatrixUtils.judgeIsImageContainsBorder; +import static com.yizhuan.xchat_android_library.models.puzzle.MatrixUtils.calculateImageIndents; +import static com.yizhuan.xchat_android_library.models.puzzle.MatrixUtils.getMinMatrixScale; +import static com.yizhuan.xchat_android_library.models.puzzle.MatrixUtils.judgeIsImageContainsBorder; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleUtils.java similarity index 67% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleUtils.java index c80982bd3..85a42cd2d 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleUtils.java @@ -1,20 +1,20 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; -import com.huantansheng.easyphotos.models.puzzle.template.slant.OneSlantLayout; -import com.huantansheng.easyphotos.models.puzzle.template.slant.SlantLayoutHelper; -import com.huantansheng.easyphotos.models.puzzle.template.slant.ThreeSlantLayout; -import com.huantansheng.easyphotos.models.puzzle.template.slant.TwoSlantLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.EightStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.FiveStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.FourStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.NineStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.OneStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.SevenStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.SixStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.StraightLayoutHelper; -import com.huantansheng.easyphotos.models.puzzle.template.straight.ThreeStraightLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.TwoStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.slant.OneSlantLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.slant.SlantLayoutHelper; +import com.yizhuan.xchat_android_library.models.puzzle.template.slant.ThreeSlantLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.slant.TwoSlantLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.EightStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.FiveStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.FourStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.NineStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.OneStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.SevenStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.SixStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.StraightLayoutHelper; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.ThreeStraightLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.TwoStraightLayout; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleView.java similarity index 99% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleView.java index 44e82c08c..ebe00b85c 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/PuzzleView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleView.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.annotation.SuppressLint; import android.content.Context; @@ -18,7 +18,7 @@ import android.view.View; import androidx.core.content.ContextCompat; -import com.huantansheng.easyphotos.R; +import com.yizhuan.xchat_android_library.R; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/SquarePuzzleView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/SquarePuzzleView.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/SquarePuzzleView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/SquarePuzzleView.java index 1c2c4437a..9e9d91950 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/SquarePuzzleView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/SquarePuzzleView.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle; +package com.yizhuan.xchat_android_library.models.puzzle; import android.content.Context; import android.util.AttributeSet; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/CrossoverPointF.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/CrossoverPointF.java similarity index 90% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/CrossoverPointF.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/CrossoverPointF.java index 372b4a59b..1a9bd1648 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/CrossoverPointF.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/CrossoverPointF.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.puzzle.slant; +package com.yizhuan.xchat_android_library.models.puzzle.slant; import android.graphics.PointF; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantArea.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantArea.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantArea.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantArea.java index 72676c81c..66b411f95 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantArea.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantArea.java @@ -1,20 +1,20 @@ -package com.huantansheng.easyphotos.models.puzzle.slant; +package com.yizhuan.xchat_android_library.models.puzzle.slant; import android.graphics.Path; import android.graphics.PointF; import android.graphics.RectF; -import com.huantansheng.easyphotos.models.puzzle.Area; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Area; +import com.yizhuan.xchat_android_library.models.puzzle.Line; import java.util.Arrays; import java.util.Comparator; import java.util.List; -import static com.huantansheng.easyphotos.models.puzzle.slant.SlantUtils.distance; -import static com.huantansheng.easyphotos.models.puzzle.slant.SlantUtils.getPoint; -import static com.huantansheng.easyphotos.models.puzzle.slant.SlantUtils.intersectionOfLines; +import static com.yizhuan.xchat_android_library.models.puzzle.slant.SlantUtils.distance; +import static com.yizhuan.xchat_android_library.models.puzzle.slant.SlantUtils.getPoint; +import static com.yizhuan.xchat_android_library.models.puzzle.slant.SlantUtils.intersectionOfLines; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantLine.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantLine.java similarity index 94% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantLine.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantLine.java index 1032a1b5f..4891a8b13 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantLine.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantLine.java @@ -1,10 +1,10 @@ -package com.huantansheng.easyphotos.models.puzzle.slant; +package com.yizhuan.xchat_android_library.models.puzzle.slant; import android.graphics.PointF; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; -import static com.huantansheng.easyphotos.models.puzzle.slant.SlantUtils.intersectionOfLines; +import static com.yizhuan.xchat_android_library.models.puzzle.slant.SlantUtils.intersectionOfLines; import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.pow; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantPuzzleLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantPuzzleLayout.java similarity index 94% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantPuzzleLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantPuzzleLayout.java index e9c0a6084..5398254a8 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantPuzzleLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantPuzzleLayout.java @@ -1,20 +1,20 @@ -package com.huantansheng.easyphotos.models.puzzle.slant; +package com.yizhuan.xchat_android_library.models.puzzle.slant; import android.graphics.RectF; import android.util.Pair; -import com.huantansheng.easyphotos.models.puzzle.Area; -import com.huantansheng.easyphotos.models.puzzle.Line; -import com.huantansheng.easyphotos.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.Area; +import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import static com.huantansheng.easyphotos.models.puzzle.slant.SlantUtils.createLine; -import static com.huantansheng.easyphotos.models.puzzle.slant.SlantUtils.cutAreaCross; -import static com.huantansheng.easyphotos.models.puzzle.slant.SlantUtils.cutAreaWith; +import static com.yizhuan.xchat_android_library.models.puzzle.slant.SlantUtils.createLine; +import static com.yizhuan.xchat_android_library.models.puzzle.slant.SlantUtils.cutAreaCross; +import static com.yizhuan.xchat_android_library.models.puzzle.slant.SlantUtils.cutAreaWith; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantUtils.java similarity index 99% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantUtils.java index e7c79d0bb..7e3a1cd9c 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/slant/SlantUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantUtils.java @@ -1,10 +1,10 @@ -package com.huantansheng.easyphotos.models.puzzle.slant; +package com.yizhuan.xchat_android_library.models.puzzle.slant; import android.graphics.PointF; import android.util.Pair; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightArea.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightArea.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightArea.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightArea.java index 2adfcdea2..7c8dc4444 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightArea.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightArea.java @@ -1,11 +1,11 @@ -package com.huantansheng.easyphotos.models.puzzle.straight; +package com.yizhuan.xchat_android_library.models.puzzle.straight; import android.graphics.Path; import android.graphics.PointF; import android.graphics.RectF; -import com.huantansheng.easyphotos.models.puzzle.Area; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Area; +import com.yizhuan.xchat_android_library.models.puzzle.Line; import java.util.Arrays; import java.util.Comparator; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightLine.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightLine.java similarity index 97% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightLine.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightLine.java index a86e4b3cd..e2b861b65 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightLine.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightLine.java @@ -1,10 +1,10 @@ -package com.huantansheng.easyphotos.models.puzzle.straight; +package com.yizhuan.xchat_android_library.models.puzzle.straight; import android.graphics.PointF; import android.graphics.RectF; import android.util.Log; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightPuzzleLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightPuzzleLayout.java similarity index 94% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightPuzzleLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightPuzzleLayout.java index 73d3b91ad..116289638 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightPuzzleLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightPuzzleLayout.java @@ -1,21 +1,21 @@ -package com.huantansheng.easyphotos.models.puzzle.straight; +package com.yizhuan.xchat_android_library.models.puzzle.straight; import android.graphics.PointF; import android.graphics.RectF; import android.util.Pair; -import com.huantansheng.easyphotos.models.puzzle.Area; -import com.huantansheng.easyphotos.models.puzzle.Line; -import com.huantansheng.easyphotos.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.Area; +import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import static com.huantansheng.easyphotos.models.puzzle.straight.StraightUtils.createLine; -import static com.huantansheng.easyphotos.models.puzzle.straight.StraightUtils.cutAreaCross; -import static com.huantansheng.easyphotos.models.puzzle.straight.StraightUtils.cutAreaSpiral; +import static com.yizhuan.xchat_android_library.models.puzzle.straight.StraightUtils.createLine; +import static com.yizhuan.xchat_android_library.models.puzzle.straight.StraightUtils.cutAreaCross; +import static com.yizhuan.xchat_android_library.models.puzzle.straight.StraightUtils.cutAreaSpiral; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightUtils.java similarity index 98% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightUtils.java index 47d1411b6..6482bab71 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/straight/StraightUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightUtils.java @@ -1,10 +1,10 @@ -package com.huantansheng.easyphotos.models.puzzle.straight; +package com.yizhuan.xchat_android_library.models.puzzle.straight; import android.graphics.PointF; import android.util.Pair; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/NumberSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/NumberSlantLayout.java similarity index 81% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/NumberSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/NumberSlantLayout.java index 6e2cd19f4..0421bb04b 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/NumberSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/NumberSlantLayout.java @@ -1,8 +1,8 @@ -package com.huantansheng.easyphotos.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.models.puzzle.template.slant; import android.util.Log; -import com.huantansheng.easyphotos.models.puzzle.slant.SlantPuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.slant.SlantPuzzleLayout; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/OneSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/OneSlantLayout.java similarity index 84% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/OneSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/OneSlantLayout.java index 2f6f06df8..4a6183a2b 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/OneSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/OneSlantLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.models.puzzle.template.slant; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/SlantLayoutHelper.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/SlantLayoutHelper.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/SlantLayoutHelper.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/SlantLayoutHelper.java index 2a24f95fb..0f68e2a07 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/SlantLayoutHelper.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/SlantLayoutHelper.java @@ -1,7 +1,7 @@ -package com.huantansheng.easyphotos.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.models.puzzle.template.slant; -import com.huantansheng.easyphotos.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/ThreeSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/ThreeSlantLayout.java similarity index 91% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/ThreeSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/ThreeSlantLayout.java index 015f63853..b7e54b502 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/ThreeSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/ThreeSlantLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.models.puzzle.template.slant; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/TwoSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/TwoSlantLayout.java similarity index 80% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/TwoSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/TwoSlantLayout.java index 951114424..2cdc90d31 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/slant/TwoSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/TwoSlantLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.models.puzzle.template.slant; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/EightStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/EightStraightLayout.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/EightStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/EightStraightLayout.java index 6560547c3..eeecaa53d 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/EightStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/EightStraightLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/FiveStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FiveStraightLayout.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/FiveStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FiveStraightLayout.java index 098265145..b4c93672a 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/FiveStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FiveStraightLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/FourStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FourStraightLayout.java similarity index 91% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/FourStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FourStraightLayout.java index 6a56173a1..b2937dac1 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/FourStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FourStraightLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/NineStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NineStraightLayout.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/NineStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NineStraightLayout.java index 28500d978..c5d236c0a 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/NineStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NineStraightLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/NumberStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NumberStraightLayout.java similarity index 80% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/NumberStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NumberStraightLayout.java index aa6f4ea52..fa631e3fa 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/NumberStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NumberStraightLayout.java @@ -1,8 +1,8 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; import android.util.Log; -import com.huantansheng.easyphotos.models.puzzle.straight.StraightPuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.straight.StraightPuzzleLayout; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/OneStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/OneStraightLayout.java similarity index 87% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/OneStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/OneStraightLayout.java index e742aace4..05edd3fef 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/OneStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/OneStraightLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/SevenStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SevenStraightLayout.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/SevenStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SevenStraightLayout.java index 4be036e70..20ec11202 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/SevenStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SevenStraightLayout.java @@ -1,6 +1,6 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/SixStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SixStraightLayout.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/SixStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SixStraightLayout.java index 420a92255..6dcd26e29 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/SixStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SixStraightLayout.java @@ -1,7 +1,7 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/StraightLayoutHelper.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/StraightLayoutHelper.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/StraightLayoutHelper.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/StraightLayoutHelper.java index 32c492034..79bd8cd69 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/StraightLayoutHelper.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/StraightLayoutHelper.java @@ -1,7 +1,7 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/ThreeStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/ThreeStraightLayout.java similarity index 90% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/ThreeStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/ThreeStraightLayout.java index 8c1575ed9..433bdae8e 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/ThreeStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/ThreeStraightLayout.java @@ -1,7 +1,7 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** * @author wupanjie diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/TwoStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/TwoStraightLayout.java similarity index 90% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/TwoStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/TwoStraightLayout.java index 793ee0b35..cd9cdf0c1 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/puzzle/template/straight/TwoStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/TwoStraightLayout.java @@ -1,8 +1,8 @@ -package com.huantansheng.easyphotos.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.models.puzzle.template.straight; import android.util.Log; -import com.huantansheng.easyphotos.models.puzzle.Line; +import com.yizhuan.xchat_android_library.models.puzzle.Line; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/StickerModel.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/StickerModel.java similarity index 90% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/StickerModel.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/StickerModel.java index dcca408b0..c78f1cbb0 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/StickerModel.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/StickerModel.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.sticker; +package com.yizhuan.xchat_android_library.models.sticker; import android.app.Activity; import android.content.Context; @@ -9,15 +9,15 @@ import android.view.ViewGroup; import androidx.fragment.app.FragmentManager; -import com.huantansheng.easyphotos.EasyPhotos; -import com.huantansheng.easyphotos.models.sticker.cache.StickerCache; -import com.huantansheng.easyphotos.models.sticker.entity.TextStickerData; -import com.huantansheng.easyphotos.models.sticker.listener.OnStickerClickListener; -import com.huantansheng.easyphotos.models.sticker.view.BitmapSticker; -import com.huantansheng.easyphotos.models.sticker.view.EditFragment; -import com.huantansheng.easyphotos.models.sticker.view.TextSticker; -import com.huantansheng.easyphotos.utils.bitmap.BitmapUtils; -import com.huantansheng.easyphotos.utils.bitmap.SaveBitmapCallBack; +import com.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.models.sticker.cache.StickerCache; +import com.yizhuan.xchat_android_library.models.sticker.entity.TextStickerData; +import com.yizhuan.xchat_android_library.models.sticker.listener.OnStickerClickListener; +import com.yizhuan.xchat_android_library.models.sticker.view.BitmapSticker; +import com.yizhuan.xchat_android_library.models.sticker.view.EditFragment; +import com.yizhuan.xchat_android_library.models.sticker.view.TextSticker; +import com.yizhuan.xchat_android_library.utils.bitmap.BitmapUtils; +import com.yizhuan.xchat_android_library.utils.bitmap.SaveBitmapCallBack; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/cache/StickerCache.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/cache/StickerCache.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/cache/StickerCache.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/cache/StickerCache.java index a88282e78..7a10c9bd6 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/cache/StickerCache.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/cache/StickerCache.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.sticker.cache; +package com.yizhuan.xchat_android_library.models.sticker.cache; import android.content.res.Resources; import android.graphics.Bitmap; @@ -7,7 +7,7 @@ import android.graphics.Matrix; import androidx.annotation.IdRes; -import com.huantansheng.easyphotos.EasyPhotos; +import com.yizhuan.xchat_android_library.EasyPhotos; import java.util.LinkedHashMap; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/entity/TextStickerData.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/entity/TextStickerData.java similarity index 94% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/entity/TextStickerData.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/entity/TextStickerData.java index 6a362e8f2..03eaba4ae 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/entity/TextStickerData.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/entity/TextStickerData.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.sticker.entity; +package com.yizhuan.xchat_android_library.models.sticker.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/listener/OnStickerClickListener.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/listener/OnStickerClickListener.java similarity index 74% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/listener/OnStickerClickListener.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/listener/OnStickerClickListener.java index f7be75d87..b6b208311 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/listener/OnStickerClickListener.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/listener/OnStickerClickListener.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.sticker.listener; +package com.yizhuan.xchat_android_library.models.sticker.listener; /** * 贴纸的点击监听 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/BitmapSticker.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/BitmapSticker.java similarity index 98% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/BitmapSticker.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/BitmapSticker.java index 73c057636..eb47fad08 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/BitmapSticker.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/BitmapSticker.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.sticker.view; +package com.yizhuan.xchat_android_library.models.sticker.view; import android.content.Context; import android.graphics.Bitmap; @@ -17,9 +17,9 @@ import android.view.View; import androidx.core.content.ContextCompat; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.models.sticker.cache.StickerCache; -import com.huantansheng.easyphotos.models.sticker.listener.OnStickerClickListener; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.models.sticker.cache.StickerCache; +import com.yizhuan.xchat_android_library.models.sticker.listener.OnStickerClickListener; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/EditFragment.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/EditFragment.java similarity index 98% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/EditFragment.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/EditFragment.java index 0d4210919..925aa9fba 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/EditFragment.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/EditFragment.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.sticker.view; +package com.yizhuan.xchat_android_library.models.sticker.view; import android.content.Context; import android.graphics.drawable.ColorDrawable; @@ -21,7 +21,7 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; -import com.huantansheng.easyphotos.R; +import com.yizhuan.xchat_android_library.R; /** * 文字贴纸，编辑界面 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/TextSticker.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/TextSticker.java similarity index 98% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/TextSticker.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/TextSticker.java index 38bf580f8..199bb9d60 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/models/sticker/view/TextSticker.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/TextSticker.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.models.sticker.view; +package com.yizhuan.xchat_android_library.models.sticker.view; import android.content.Context; import android.graphics.Bitmap; @@ -22,9 +22,9 @@ import android.view.View; import androidx.core.content.ContextCompat; -import com.huantansheng.easyphotos.EasyPhotos; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.models.sticker.listener.OnStickerClickListener; +import com.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.models.sticker.listener.OnStickerClickListener; /** diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/result/Result.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/result/Result.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/result/Result.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/result/Result.java index 4fda5e8b6..e7f71107b 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/result/Result.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/result/Result.java @@ -1,10 +1,10 @@ -package com.huantansheng.easyphotos.result; +package com.yizhuan.xchat_android_library.result; import android.net.Uri; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.setting.Setting; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.setting.Setting; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/setting/Setting.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/setting/Setting.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/setting/Setting.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/setting/Setting.java index ad48c8fc6..9fe605745 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/setting/Setting.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/setting/Setting.java @@ -1,12 +1,12 @@ -package com.huantansheng.easyphotos.setting; +package com.yizhuan.xchat_android_library.setting; import android.view.View; import androidx.annotation.IntDef; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.engine.ImageEngine; -import com.huantansheng.easyphotos.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.engine.ImageEngine; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/EasyPhotosActivity.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/EasyPhotosActivity.java index ab1767d09..1367e8ee4 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/EasyPhotosActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/EasyPhotosActivity.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui; +package com.yizhuan.xchat_android_library.ui; import android.Manifest; import android.animation.Animator; @@ -44,27 +44,27 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; -import com.huantansheng.easyphotos.EasyPhotos; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Code; -import com.huantansheng.easyphotos.constant.Key; -import com.huantansheng.easyphotos.models.ad.AdListener; -import com.huantansheng.easyphotos.models.album.AlbumModel; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.result.Result; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.ui.adapter.AlbumItemsAdapter; -import com.huantansheng.easyphotos.ui.adapter.PhotosAdapter; -import com.huantansheng.easyphotos.ui.dialog.LoadingDialog; -import com.huantansheng.easyphotos.ui.widget.PressedTextView; -import com.huantansheng.easyphotos.utils.color.ColorUtils; -import com.huantansheng.easyphotos.utils.media.DurationUtils; -import com.huantansheng.easyphotos.utils.media.MediaScannerConnectionUtils; -import com.huantansheng.easyphotos.utils.permission.PermissionUtil; -import com.huantansheng.easyphotos.utils.settings.SettingsUtils; -import com.huantansheng.easyphotos.utils.string.StringUtils; -import com.huantansheng.easyphotos.utils.system.SystemUtils; -import com.huantansheng.easyphotos.utils.uri.UriUtils; +import com.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Code; +import com.yizhuan.xchat_android_library.constant.Key; +import com.yizhuan.xchat_android_library.models.ad.AdListener; +import com.yizhuan.xchat_android_library.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.result.Result; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.ui.adapter.AlbumItemsAdapter; +import com.yizhuan.xchat_android_library.ui.adapter.PhotosAdapter; +import com.yizhuan.xchat_android_library.ui.dialog.LoadingDialog; +import com.yizhuan.xchat_android_library.ui.widget.PressedTextView; +import com.yizhuan.xchat_android_library.utils.color.ColorUtils; +import com.yizhuan.xchat_android_library.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.utils.media.MediaScannerConnectionUtils; +import com.yizhuan.xchat_android_library.utils.permission.PermissionUtil; +import com.yizhuan.xchat_android_library.utils.settings.SettingsUtils; +import com.yizhuan.xchat_android_library.utils.string.StringUtils; +import com.yizhuan.xchat_android_library.utils.system.SystemUtils; +import com.yizhuan.xchat_android_library.utils.uri.UriUtils; import java.io.File; import java.io.IOException; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewActivity.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewActivity.java index 680d3f925..35cc354bf 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewActivity.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui; +package com.yizhuan.xchat_android_library.ui; import android.app.Activity; import android.content.Intent; @@ -26,17 +26,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Code; -import com.huantansheng.easyphotos.constant.Key; -import com.huantansheng.easyphotos.models.album.AlbumModel; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.result.Result; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.ui.adapter.PreviewPhotosAdapter; -import com.huantansheng.easyphotos.ui.widget.PressedTextView; -import com.huantansheng.easyphotos.utils.color.ColorUtils; -import com.huantansheng.easyphotos.utils.system.SystemUtils; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Code; +import com.yizhuan.xchat_android_library.constant.Key; +import com.yizhuan.xchat_android_library.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.result.Result; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.ui.adapter.PreviewPhotosAdapter; +import com.yizhuan.xchat_android_library.ui.widget.PressedTextView; +import com.yizhuan.xchat_android_library.utils.color.ColorUtils; +import com.yizhuan.xchat_android_library.utils.system.SystemUtils; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewFragment.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewFragment.java similarity index 92% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewFragment.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewFragment.java index fbdc293e6..4d7336c91 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PreviewFragment.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewFragment.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui; +package com.yizhuan.xchat_android_library.ui; import android.content.Context; import android.os.Bundle; @@ -10,8 +10,8 @@ import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.ui.adapter.PreviewPhotosFragmentAdapter; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.ui.adapter.PreviewPhotosFragmentAdapter; public class PreviewFragment extends Fragment implements PreviewPhotosFragmentAdapter.OnClickListener { diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleActivity.java similarity index 94% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleActivity.java index 76c8aa8e1..3564c8b91 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleActivity.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui; +package com.yizhuan.xchat_android_library.ui; import android.Manifest; import android.app.Activity; @@ -7,7 +7,6 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.view.View; import android.view.WindowManager; @@ -27,27 +26,27 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; -import com.huantansheng.easyphotos.EasyPhotos; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Code; -import com.huantansheng.easyphotos.constant.Key; -import com.huantansheng.easyphotos.engine.ImageEngine; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.models.puzzle.Area; -import com.huantansheng.easyphotos.models.puzzle.DegreeSeekBar; -import com.huantansheng.easyphotos.models.puzzle.PuzzleLayout; -import com.huantansheng.easyphotos.models.puzzle.PuzzlePiece; -import com.huantansheng.easyphotos.models.puzzle.PuzzleUtils; -import com.huantansheng.easyphotos.models.puzzle.PuzzleView; -import com.huantansheng.easyphotos.models.sticker.StickerModel; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.ui.adapter.PuzzleAdapter; -import com.huantansheng.easyphotos.ui.adapter.TextStickerAdapter; -import com.huantansheng.easyphotos.utils.bitmap.SaveBitmapCallBack; -import com.huantansheng.easyphotos.utils.media.DurationUtils; -import com.huantansheng.easyphotos.utils.permission.PermissionUtil; -import com.huantansheng.easyphotos.utils.settings.SettingsUtils; -import com.huantansheng.easyphotos.utils.uri.UriUtils; +import com.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Code; +import com.yizhuan.xchat_android_library.constant.Key; +import com.yizhuan.xchat_android_library.engine.ImageEngine; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.models.puzzle.Area; +import com.yizhuan.xchat_android_library.models.puzzle.DegreeSeekBar; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzlePiece; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleUtils; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleView; +import com.yizhuan.xchat_android_library.models.sticker.StickerModel; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.ui.adapter.PuzzleAdapter; +import com.yizhuan.xchat_android_library.ui.adapter.TextStickerAdapter; +import com.yizhuan.xchat_android_library.utils.bitmap.SaveBitmapCallBack; +import com.yizhuan.xchat_android_library.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.utils.permission.PermissionUtil; +import com.yizhuan.xchat_android_library.utils.settings.SettingsUtils; +import com.yizhuan.xchat_android_library.utils.uri.UriUtils; import java.io.File; import java.io.IOException; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleSelectorActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleSelectorActivity.java similarity index 92% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleSelectorActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleSelectorActivity.java index 1d218ada2..50b184f78 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/PuzzleSelectorActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleSelectorActivity.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui; +package com.yizhuan.xchat_android_library.ui; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -24,17 +24,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Code; -import com.huantansheng.easyphotos.models.album.AlbumModel; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.ui.adapter.AlbumItemsAdapter; -import com.huantansheng.easyphotos.ui.adapter.PuzzleSelectorAdapter; -import com.huantansheng.easyphotos.ui.adapter.PuzzleSelectorPreviewAdapter; -import com.huantansheng.easyphotos.ui.widget.PressedTextView; -import com.huantansheng.easyphotos.utils.color.ColorUtils; -import com.huantansheng.easyphotos.utils.system.SystemUtils; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Code; +import com.yizhuan.xchat_android_library.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.ui.adapter.AlbumItemsAdapter; +import com.yizhuan.xchat_android_library.ui.adapter.PuzzleSelectorAdapter; +import com.yizhuan.xchat_android_library.ui.adapter.PuzzleSelectorPreviewAdapter; +import com.yizhuan.xchat_android_library.ui.widget.PressedTextView; +import com.yizhuan.xchat_android_library.utils.color.ColorUtils; +import com.yizhuan.xchat_android_library.utils.system.SystemUtils; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/AlbumItemsAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/AlbumItemsAdapter.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/AlbumItemsAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/AlbumItemsAdapter.java index ca2477659..413c75641 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/AlbumItemsAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/AlbumItemsAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -11,10 +11,10 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.models.ad.AdViewHolder; -import com.huantansheng.easyphotos.models.album.entity.AlbumItem; -import com.huantansheng.easyphotos.setting.Setting; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.models.ad.AdViewHolder; +import com.yizhuan.xchat_android_library.models.album.entity.AlbumItem; +import com.yizhuan.xchat_android_library.setting.Setting; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PhotosAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PhotosAdapter.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PhotosAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PhotosAdapter.java index fece2252e..40ffd01b5 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PhotosAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PhotosAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.content.Context; import android.net.Uri; @@ -13,14 +13,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.models.ad.AdViewHolder; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.result.Result; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.ui.widget.PressedImageView; -import com.huantansheng.easyphotos.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.models.ad.AdViewHolder; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.result.Result; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.ui.widget.PressedImageView; +import com.yizhuan.xchat_android_library.utils.media.DurationUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PreviewPhotosAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosAdapter.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PreviewPhotosAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosAdapter.java index 62b5d4317..b8f1224a0 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PreviewPhotosAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.content.Context; import android.content.Intent; @@ -17,10 +17,10 @@ import com.davemorrissey.labs.subscaleview.ImageSource; import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; import com.github.chrisbanes.photoview.OnScaleChangedListener; import com.github.chrisbanes.photoview.PhotoView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.setting.Setting; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.setting.Setting; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PreviewPhotosFragmentAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosFragmentAdapter.java similarity index 88% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PreviewPhotosFragmentAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosFragmentAdapter.java index d077c8652..c8dd5b3cf 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PreviewPhotosFragmentAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosFragmentAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.content.Context; import android.net.Uri; @@ -9,12 +9,12 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.result.Result; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.ui.widget.PressedImageView; -import com.huantansheng.easyphotos.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.result.Result; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.ui.widget.PressedImageView; +import com.yizhuan.xchat_android_library.utils.media.DurationUtils; /** * 预览所有选中图片集合的适配器 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleAdapter.java similarity index 88% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleAdapter.java index 209f9e6c2..a094ce64b 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.view.LayoutInflater; import android.view.View; @@ -6,11 +6,11 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.models.puzzle.PuzzleLayout; -import com.huantansheng.easyphotos.models.puzzle.SquarePuzzleView; -import com.huantansheng.easyphotos.models.puzzle.template.slant.NumberSlantLayout; -import com.huantansheng.easyphotos.models.puzzle.template.straight.NumberStraightLayout; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.models.puzzle.SquarePuzzleView; +import com.yizhuan.xchat_android_library.models.puzzle.template.slant.NumberSlantLayout; +import com.yizhuan.xchat_android_library.models.puzzle.template.straight.NumberStraightLayout; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleSelectorAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorAdapter.java similarity index 90% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleSelectorAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorAdapter.java index 9674c28b4..f92e073eb 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleSelectorAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.content.Context; import android.net.Uri; @@ -10,11 +10,11 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.utils.media.DurationUtils; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleSelectorPreviewAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorPreviewAdapter.java similarity index 90% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleSelectorPreviewAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorPreviewAdapter.java index 67cd39156..3bd2a1647 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/PuzzleSelectorPreviewAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorPreviewAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.content.Context; import android.net.Uri; @@ -10,11 +10,11 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.constant.Type; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.setting.Setting; -import com.huantansheng.easyphotos.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.constant.Type; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.utils.media.DurationUtils; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/TextStickerAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/TextStickerAdapter.java similarity index 90% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/TextStickerAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/TextStickerAdapter.java index 3872df506..29a618040 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/adapter/TextStickerAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/TextStickerAdapter.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.adapter; +package com.yizhuan.xchat_android_library.ui.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -8,9 +8,9 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; -import com.huantansheng.easyphotos.R; -import com.huantansheng.easyphotos.models.sticker.StickerModel; -import com.huantansheng.easyphotos.models.sticker.entity.TextStickerData; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.models.sticker.StickerModel; +import com.yizhuan.xchat_android_library.models.sticker.entity.TextStickerData; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/dialog/LoadingDialog.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/dialog/LoadingDialog.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/dialog/LoadingDialog.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/dialog/LoadingDialog.java index 3658498ff..579afe11d 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/dialog/LoadingDialog.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/dialog/LoadingDialog.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.dialog; +package com.yizhuan.xchat_android_library.ui.dialog; import android.app.Dialog; import android.content.Context; @@ -10,7 +10,7 @@ import android.view.WindowManager; import androidx.annotation.NonNull; -import com.huantansheng.easyphotos.R; +import com.yizhuan.xchat_android_library.R; public class LoadingDialog extends Dialog { diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PressedImageView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedImageView.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PressedImageView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedImageView.java index 3c48f8c5c..b9119b7d6 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PressedImageView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedImageView.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.widget; +package com.yizhuan.xchat_android_library.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PressedTextView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedTextView.java similarity index 97% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PressedTextView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedTextView.java index ec1b80090..d64f7a4ab 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PressedTextView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedTextView.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.widget; +package com.yizhuan.xchat_android_library.ui.widget; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PreviewRecyclerView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PreviewRecyclerView.java similarity index 97% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PreviewRecyclerView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PreviewRecyclerView.java index 88949febd..78423e561 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/ui/widget/PreviewRecyclerView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PreviewRecyclerView.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.ui.widget; +package com.yizhuan.xchat_android_library.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/bitmap/BitmapUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/BitmapUtils.java similarity index 98% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/bitmap/BitmapUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/BitmapUtils.java index 47dc57506..bebf8c6e3 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/bitmap/BitmapUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.bitmap; +package com.yizhuan.xchat_android_library.utils.bitmap; import android.app.Activity; import android.content.ContentResolver; @@ -20,9 +20,9 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.exifinterface.media.ExifInterface; -import com.huantansheng.easyphotos.EasyPhotos; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.utils.uri.UriUtils; +import com.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.utils.uri.UriUtils; import java.io.File; import java.io.FileOutputStream; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/bitmap/SaveBitmapCallBack.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/SaveBitmapCallBack.java similarity index 83% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/bitmap/SaveBitmapCallBack.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/SaveBitmapCallBack.java index 9d01f4033..3b32dc1b5 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/bitmap/SaveBitmapCallBack.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/SaveBitmapCallBack.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.bitmap; +package com.yizhuan.xchat_android_library.utils.bitmap; import java.io.File; import java.io.IOException; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/color/ColorUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/color/ColorUtils.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/color/ColorUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/color/ColorUtils.java index 581c5cfa7..25ffb090d 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/color/ColorUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/color/ColorUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.color; +package com.yizhuan.xchat_android_library.utils.color; /** * Created by huan on 2018/1/9. diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/media/DurationUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/DurationUtils.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/media/DurationUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/DurationUtils.java index 7b150ceaf..6e4390849 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/media/DurationUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/DurationUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.media; +package com.yizhuan.xchat_android_library.utils.media; import android.media.MediaMetadataRetriever; import android.text.format.DateUtils; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/media/MediaScannerConnectionUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/MediaScannerConnectionUtils.java similarity index 93% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/media/MediaScannerConnectionUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/MediaScannerConnectionUtils.java index 6dc0cfe55..194075476 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/media/MediaScannerConnectionUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/MediaScannerConnectionUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.media; +package com.yizhuan.xchat_android_library.utils.media; import android.content.Context; import android.media.MediaScannerConnection; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/permission/PermissionUtil.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/permission/PermissionUtil.java similarity index 96% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/permission/PermissionUtil.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/permission/PermissionUtil.java index 0acab380c..cb3fd50e3 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/permission/PermissionUtil.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/permission/PermissionUtil.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.permission; +package com.yizhuan.xchat_android_library.utils.permission; import android.app.Activity; import android.content.pm.PackageManager; @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; import androidx.core.content.PermissionChecker; -import com.huantansheng.easyphotos.constant.Code; +import com.yizhuan.xchat_android_library.constant.Code; import java.util.ArrayList; import java.util.List; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/result/EasyResult.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/EasyResult.java similarity index 95% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/result/EasyResult.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/EasyResult.java index a17de5d16..e92acd692 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/result/EasyResult.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/EasyResult.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.result; +package com.yizhuan.xchat_android_library.utils.result; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/result/HolderFragment.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/HolderFragment.java similarity index 85% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/result/HolderFragment.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/HolderFragment.java index ebad4dfd9..239d8f587 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/result/HolderFragment.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/HolderFragment.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.result; +package com.yizhuan.xchat_android_library.utils.result; import android.app.Activity; import android.content.Intent; @@ -7,13 +7,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import com.huantansheng.easyphotos.EasyPhotos; -import com.huantansheng.easyphotos.callback.PuzzleCallback; -import com.huantansheng.easyphotos.callback.SelectCallback; -import com.huantansheng.easyphotos.engine.ImageEngine; -import com.huantansheng.easyphotos.models.album.entity.Photo; -import com.huantansheng.easyphotos.ui.EasyPhotosActivity; -import com.huantansheng.easyphotos.ui.PuzzleActivity; +import com.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.callback.PuzzleCallback; +import com.yizhuan.xchat_android_library.callback.SelectCallback; +import com.yizhuan.xchat_android_library.engine.ImageEngine; +import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.ui.EasyPhotosActivity; +import com.yizhuan.xchat_android_library.ui.PuzzleActivity; import java.util.ArrayList; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/settings/SettingsUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/settings/SettingsUtils.java similarity index 85% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/settings/SettingsUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/settings/SettingsUtils.java index 55084916f..1eeaae342 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/settings/SettingsUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/settings/SettingsUtils.java @@ -1,11 +1,11 @@ -package com.huantansheng.easyphotos.utils.settings; +package com.yizhuan.xchat_android_library.utils.settings; import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.provider.Settings; -import com.huantansheng.easyphotos.constant.Code; +import com.yizhuan.xchat_android_library.constant.Code; /** * 系统设置界面启动器 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/string/StringUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/string/StringUtils.java similarity index 88% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/string/StringUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/string/StringUtils.java index 2313d28d6..adc88c811 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/string/StringUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/string/StringUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.string; +package com.yizhuan.xchat_android_library.utils.string; /** * 字符串工具类 diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/system/MeiZuStatusUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/MeiZuStatusUtils.java similarity index 99% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/system/MeiZuStatusUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/MeiZuStatusUtils.java index d6c927135..e079696d1 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/system/MeiZuStatusUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/MeiZuStatusUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.system; +package com.yizhuan.xchat_android_library.utils.system; import android.app.Activity; import android.os.Build; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/system/SystemUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/SystemUtils.java similarity index 99% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/system/SystemUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/SystemUtils.java index d548c86ed..62e06edbb 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/system/SystemUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/SystemUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.system; +package com.yizhuan.xchat_android_library.utils.system; import android.app.Activity; import android.content.Context; diff --git a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/uri/UriUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/uri/UriUtils.java similarity index 98% rename from easyphotos/src/main/java/com/huantansheng/easyphotos/utils/uri/UriUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/uri/UriUtils.java index afda83545..3b425aabc 100644 --- a/easyphotos/src/main/java/com/huantansheng/easyphotos/utils/uri/UriUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/uri/UriUtils.java @@ -1,4 +1,4 @@ -package com.huantansheng.easyphotos.utils.uri; +package com.yizhuan.xchat_android_library.utils.uri; import android.content.ContentResolver; import android.content.ContentUris; @@ -14,7 +14,7 @@ import android.util.Log; import androidx.core.content.FileProvider; -import com.huantansheng.easyphotos.setting.Setting; +import com.yizhuan.xchat_android_library.setting.Setting; import java.io.File; import java.util.Locale; diff --git a/easyphotos/src/main/res/drawable-xhdpi/ic_controller_easy_photos.png b/library/src/module_easyphoto/res/drawable-xhdpi/ic_controller_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xhdpi/ic_controller_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xhdpi/ic_controller_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xhdpi/ic_delete_easy_photos.png b/library/src/module_easyphoto/res/drawable-xhdpi/ic_delete_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xhdpi/ic_delete_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xhdpi/ic_delete_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xhdpi/ic_editor_easy_photos.png b/library/src/module_easyphoto/res/drawable-xhdpi/ic_editor_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xhdpi/ic_editor_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xhdpi/ic_editor_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xhdpi/ic_mirror_easy_photos.png b/library/src/module_easyphoto/res/drawable-xhdpi/ic_mirror_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xhdpi/ic_mirror_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xhdpi/ic_mirror_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xhdpi/ic_rotate_easy_photos.png b/library/src/module_easyphoto/res/drawable-xhdpi/ic_rotate_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xhdpi/ic_rotate_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xhdpi/ic_rotate_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xxhdpi/ic_controller_easy_photos.png b/library/src/module_easyphoto/res/drawable-xxhdpi/ic_controller_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xxhdpi/ic_controller_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xxhdpi/ic_controller_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xxhdpi/ic_delete_easy_photos.png b/library/src/module_easyphoto/res/drawable-xxhdpi/ic_delete_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xxhdpi/ic_delete_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xxhdpi/ic_delete_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xxhdpi/ic_editor_easy_photos.png b/library/src/module_easyphoto/res/drawable-xxhdpi/ic_editor_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xxhdpi/ic_editor_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xxhdpi/ic_editor_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xxhdpi/ic_mirror_easy_photos.png b/library/src/module_easyphoto/res/drawable-xxhdpi/ic_mirror_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xxhdpi/ic_mirror_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xxhdpi/ic_mirror_easy_photos.png diff --git a/easyphotos/src/main/res/drawable-xxhdpi/ic_rotate_easy_photos.png b/library/src/module_easyphoto/res/drawable-xxhdpi/ic_rotate_easy_photos.png similarity index 100% rename from easyphotos/src/main/res/drawable-xxhdpi/ic_rotate_easy_photos.png rename to library/src/module_easyphoto/res/drawable-xxhdpi/ic_rotate_easy_photos.png diff --git a/easyphotos/src/main/res/drawable/bg_dialog_album_items_background_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_dialog_album_items_background_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_dialog_album_items_background_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_dialog_album_items_background_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_dialog_loading_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_dialog_loading_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_dialog_loading_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_dialog_loading_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_menu_done_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_menu_done_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_menu_done_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_menu_done_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_second_level_menu_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_second_level_menu_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_second_level_menu_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_second_level_menu_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_seek_bar_alpha_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_seek_bar_alpha_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_seek_bar_alpha_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_seek_bar_alpha_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_select_false_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_select_false_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_select_false_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_select_false_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_select_false_unable_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_select_false_unable_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_select_false_unable_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_select_false_unable_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_select_true_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_select_true_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_select_true_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_select_true_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_selected_frame_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_selected_frame_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_selected_frame_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_selected_frame_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_selected_frame_puzzle_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_selected_frame_puzzle_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_selected_frame_puzzle_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_selected_frame_puzzle_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/bg_text_sticker_editor_easy_photos.xml b/library/src/module_easyphoto/res/drawable/bg_text_sticker_editor_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/bg_text_sticker_editor_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/bg_text_sticker_editor_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_album_item_choose_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_album_item_choose_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_album_item_choose_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_album_item_choose_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_album_items_name_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_album_items_name_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_album_items_name_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_album_items_name_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_arrow_back_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_arrow_back_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_arrow_back_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_arrow_back_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_arrow_back_preview_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_arrow_back_preview_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_arrow_back_preview_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_arrow_back_preview_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_arrow_down_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_arrow_down_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_arrow_down_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_arrow_down_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_arrow_up_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_arrow_up_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_arrow_up_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_arrow_up_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_black_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_black_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_black_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_black_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_blue_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_blue_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_blue_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_blue_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_camera_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_camera_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_camera_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_camera_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_clear_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_clear_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_clear_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_clear_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_cyan_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_cyan_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_cyan_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_cyan_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_delete_easyy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_delete_easyy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_delete_easyy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_delete_easyy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_edit_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_edit_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_edit_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_edit_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_gray_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_gray_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_gray_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_gray_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_green_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_green_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_green_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_green_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_notifications_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_notifications_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_notifications_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_notifications_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_orange_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_orange_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_orange_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_orange_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_play_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_play_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_play_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_play_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_purple_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_purple_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_purple_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_purple_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_puzzle_corner_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_puzzle_corner_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_puzzle_corner_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_puzzle_corner_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_puzzle_flip_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_puzzle_flip_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_puzzle_flip_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_puzzle_flip_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_puzzle_mirror_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_puzzle_mirror_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_puzzle_mirror_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_puzzle_mirror_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_puzzle_padding_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_puzzle_padding_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_puzzle_padding_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_puzzle_padding_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_puzzle_replace_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_puzzle_replace_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_puzzle_replace_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_puzzle_replace_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_puzzle_rotate_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_puzzle_rotate_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_puzzle_rotate_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_puzzle_rotate_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_red_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_red_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_red_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_red_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_selector_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_selector_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_selector_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_selector_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_selector_true_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_selector_true_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_selector_true_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_selector_true_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_settings_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_settings_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_settings_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_settings_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_white_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_white_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_white_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_white_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/ic_yelow_easy_photos.xml b/library/src/module_easyphoto/res/drawable/ic_yelow_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/ic_yelow_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/ic_yelow_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/progress_bar_easy_photos.xml b/library/src/module_easyphoto/res/drawable/progress_bar_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/progress_bar_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/progress_bar_easy_photos.xml diff --git a/easyphotos/src/main/res/drawable/thumb_seek_bar_alpha_easy_photos.xml b/library/src/module_easyphoto/res/drawable/thumb_seek_bar_alpha_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/drawable/thumb_seek_bar_alpha_easy_photos.xml rename to library/src/module_easyphoto/res/drawable/thumb_seek_bar_alpha_easy_photos.xml diff --git a/easyphotos/src/main/res/layout/activity_easy_photos.xml b/library/src/module_easyphoto/res/layout/activity_easy_photos.xml similarity index 97% rename from easyphotos/src/main/res/layout/activity_easy_photos.xml rename to library/src/module_easyphoto/res/layout/activity_easy_photos.xml index 6cbc239ff..0967a8eeb 100644 --- a/easyphotos/src/main/res/layout/activity_easy_photos.xml +++ b/library/src/module_easyphoto/res/layout/activity_easy_photos.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/easy_photos_bg_primary" - tools:context="com.huantansheng.easyphotos.ui.EasyPhotosActivity"> + tools:context="com.yizhuan.xchat_android_library.ui.EasyPhotosActivity"> - - - - - @@ -52,7 +52,7 @@ android:layout_gravity="center_vertical" android:background="@color/easy_photos_bar_preview_primary_dark" /> - - - - - - + tools:context="com.yizhuan.xchat_android_library.ui.PuzzleSelectorActivity"> - - - + tools:context="com.yizhuan.xchat_android_library.ui.PreviewFragment"> - - diff --git a/easyphotos/src/main/res/layout/item_puzzle_selector_easy_photos.xml b/library/src/module_easyphoto/res/layout/item_puzzle_selector_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/layout/item_puzzle_selector_easy_photos.xml rename to library/src/module_easyphoto/res/layout/item_puzzle_selector_easy_photos.xml diff --git a/easyphotos/src/main/res/layout/item_puzzle_selector_preview_easy_photos.xml b/library/src/module_easyphoto/res/layout/item_puzzle_selector_preview_easy_photos.xml similarity index 100% rename from easyphotos/src/main/res/layout/item_puzzle_selector_preview_easy_photos.xml rename to library/src/module_easyphoto/res/layout/item_puzzle_selector_preview_easy_photos.xml diff --git a/easyphotos/src/main/res/layout/item_rv_photos_easy_photos.xml b/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml similarity index 97% rename from easyphotos/src/main/res/layout/item_rv_photos_easy_photos.xml rename to library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml index c208ab327..ede2e6c3c 100644 --- a/easyphotos/src/main/res/layout/item_rv_photos_easy_photos.xml +++ b/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" xmlns:tools="http://schemas.android.com/tools"> - ]> + - &app_name; 所有圖片 diff --git a/easyphotos/src/main/res/values/styles.xml b/library/src/module_easyphoto/res/values/styles.xml similarity index 100% rename from easyphotos/src/main/res/values/styles.xml rename to library/src/module_easyphoto/res/values/styles.xml diff --git a/app/src/module_luban/java/com/yizhuan/erban/Checker.java b/library/src/module_luban/java/com/yizhuan/xchat_android_library/Checker.java similarity index 99% rename from app/src/module_luban/java/com/yizhuan/erban/Checker.java rename to library/src/module_luban/java/com/yizhuan/xchat_android_library/Checker.java index badf89a44..6cd033f41 100644 --- a/app/src/module_luban/java/com/yizhuan/erban/Checker.java +++ b/library/src/module_luban/java/com/yizhuan/xchat_android_library/Checker.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.graphics.BitmapFactory; import android.util.Log; diff --git a/app/src/module_luban/java/com/yizhuan/erban/CompressionPredicate.java b/library/src/module_luban/java/com/yizhuan/xchat_android_library/CompressionPredicate.java similarity index 90% rename from app/src/module_luban/java/com/yizhuan/erban/CompressionPredicate.java rename to library/src/module_luban/java/com/yizhuan/xchat_android_library/CompressionPredicate.java index 01855c4ae..6cb84338f 100644 --- a/app/src/module_luban/java/com/yizhuan/erban/CompressionPredicate.java +++ b/library/src/module_luban/java/com/yizhuan/xchat_android_library/CompressionPredicate.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; /** * Created on 2018/1/3 19:43 diff --git a/app/src/module_luban/java/com/yizhuan/erban/Engine.java b/library/src/module_luban/java/com/yizhuan/xchat_android_library/Engine.java similarity index 99% rename from app/src/module_luban/java/com/yizhuan/erban/Engine.java rename to library/src/module_luban/java/com/yizhuan/xchat_android_library/Engine.java index 6a83fa05c..61dc5e363 100644 --- a/app/src/module_luban/java/com/yizhuan/erban/Engine.java +++ b/library/src/module_luban/java/com/yizhuan/xchat_android_library/Engine.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/app/src/module_luban/java/com/yizhuan/erban/InputStreamProvider.java b/library/src/module_luban/java/com/yizhuan/xchat_android_library/InputStreamProvider.java similarity index 89% rename from app/src/module_luban/java/com/yizhuan/erban/InputStreamProvider.java rename to library/src/module_luban/java/com/yizhuan/xchat_android_library/InputStreamProvider.java index bcf9aadcc..cd3947900 100644 --- a/app/src/module_luban/java/com/yizhuan/erban/InputStreamProvider.java +++ b/library/src/module_luban/java/com/yizhuan/xchat_android_library/InputStreamProvider.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/module_luban/java/com/yizhuan/erban/Luban.java b/library/src/module_luban/java/com/yizhuan/xchat_android_library/Luban.java similarity index 99% rename from app/src/module_luban/java/com/yizhuan/erban/Luban.java rename to library/src/module_luban/java/com/yizhuan/xchat_android_library/Luban.java index e140103d0..626f74a20 100644 --- a/app/src/module_luban/java/com/yizhuan/erban/Luban.java +++ b/library/src/module_luban/java/com/yizhuan/xchat_android_library/Luban.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import android.content.Context; import android.net.Uri; diff --git a/app/src/module_luban/java/com/yizhuan/erban/OnCompressListener.java b/library/src/module_luban/java/com/yizhuan/xchat_android_library/OnCompressListener.java similarity index 91% rename from app/src/module_luban/java/com/yizhuan/erban/OnCompressListener.java rename to library/src/module_luban/java/com/yizhuan/xchat_android_library/OnCompressListener.java index 9efe69203..e98e3009f 100644 --- a/app/src/module_luban/java/com/yizhuan/erban/OnCompressListener.java +++ b/library/src/module_luban/java/com/yizhuan/xchat_android_library/OnCompressListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; import java.io.File; diff --git a/app/src/module_luban/java/com/yizhuan/erban/OnRenameListener.java b/library/src/module_luban/java/com/yizhuan/xchat_android_library/OnRenameListener.java similarity index 92% rename from app/src/module_luban/java/com/yizhuan/erban/OnRenameListener.java rename to library/src/module_luban/java/com/yizhuan/xchat_android_library/OnRenameListener.java index f26b4fe5e..6b14b9e4b 100644 --- a/app/src/module_luban/java/com/yizhuan/erban/OnRenameListener.java +++ b/library/src/module_luban/java/com/yizhuan/xchat_android_library/OnRenameListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban; +package com.yizhuan.xchat_android_library; /** * Author: zibin