From 9e433435049266aa9ee7b22403ef4ccc32847318 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Fri, 18 Nov 2022 11:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4library=E5=8C=85=E5=92=8C?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A1=B5=E9=9D=A2=E5=A4=B4=E5=83=8F=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 + app/proguard-rules.pro | 16 ++++- app/src/main/AndroidManifest.xml | 6 ++ .../com/yizhuan/erban/base/BaseActivity.java | 6 +- .../erban/common/dialog/PhotoDialog.kt | 4 +- .../erban/common/glide/GlideEngine.java | 2 +- .../yizhuan/erban/common/glide/GlideUtils.kt | 2 +- .../erban/common/photo/PhotoProvider.kt | 6 +- .../erban/common/util/AppLifeCycleHelper.java | 2 +- .../yizhuan/erban/common/util/BitmapUtil.java | 2 +- .../common/util/DialogFragmentUtils.java | 6 +- .../erban/common/util/PauseWorkerHandler.java | 2 +- .../erban/common/util/PhotoCompressUtil.kt | 2 +- .../erban/ui/user/UserInfoModifyActivity.kt | 2 +- app/src/main/res/values/styles.xml | 4 ++ library/build.gradle | 2 - library/proguard-rules.pro | 2 +- library/src/main/AndroidManifest.xml | 10 +-- .../common}/base/BaseActivity.java | 11 ++-- .../common}/base/BaseDialogFragment.java | 16 ++--- .../common}/base/BaseViewTag.java | 4 +- .../fragmentation/ISupportActivity.java | 2 +- .../fragmentation/ISupportFragment.java | 2 +- .../SupportActivityDelegate.java | 4 +- .../SupportFragmentDelegate.java | 6 +- .../common}/fragmentation/SupportHelper.java | 2 +- .../fragmentation/TransactionDelegate.java | 10 +-- .../fragmentation/internal/ResultRecord.java | 2 +- .../internal/TransactionRecord.java | 2 +- .../common}/fragmentation/queue/Action.java | 2 +- .../fragmentation/queue/ActionQueue.java | 2 +- .../windowcallback/IWindowCallbackProxy.kt | 2 +- .../windowcallback/WindowCallbackProxyUtil.kt | 2 +- .../common}/util/ActivityHelper.java | 2 +- .../common}/util/CoreUtils.java | 2 +- .../common}/util/Logger.java | 2 +- .../common}/util/ReflectionUtils.java | 2 +- .../common}/util/Utils.java | 2 +- .../common}/util/ViewBindingUtil.kt | 2 +- .../AfterPermissionGranted.java | 2 +- .../AppSettingsDialog.java | 4 +- .../AppSettingsDialogHolderActivity.java | 2 +- .../EasyPermissions.java | 4 +- .../PermissionRequest.java | 5 +- .../RationaleDialogClickListener.java | 4 +- .../RationaleDialogConfig.java | 4 +- .../RationaleDialogFragment.java | 2 +- .../RationaleDialogFragmentCompat.java | 2 +- .../helper/ActivityPermissionHelper.java | 4 +- .../AppCompatActivityPermissionsHelper.java | 2 +- .../helper/BaseSupportPermissionsHelper.java | 4 +- .../helper/LowApiPermissionsHelper.java | 2 +- .../helper/PermissionHelper.java | 2 +- .../SupportFragmentPermissionHelper.java | 2 +- .../helper/package-info.java | 2 +- .../{ => easyphoto}/EasyPhotos.java | 28 ++++----- .../{ => easyphoto}/builder/AlbumBuilder.java | 22 +++---- .../callback/PuzzleCallback.java | 4 +- .../callback/SelectCallback.java | 4 +- .../{ => easyphoto}/constant/Code.java | 2 +- .../{ => easyphoto}/constant/Key.java | 2 +- .../{ => easyphoto}/constant/Type.java | 2 +- .../{ => easyphoto}/engine/ImageEngine.java | 2 +- .../{ => easyphoto}/models/ad/AdEntity.java | 2 +- .../{ => easyphoto}/models/ad/AdListener.java | 2 +- .../models/ad/AdViewHolder.java | 2 +- .../models/album/AlbumModel.java | 16 ++--- .../models/album/entity/Album.java | 2 +- .../models/album/entity/AlbumItem.java | 2 +- .../models/album/entity/Photo.java | 2 +- .../{ => easyphoto}/models/puzzle/Area.java | 2 +- .../models/puzzle/DegreeSeekBar.java | 2 +- .../{ => easyphoto}/models/puzzle/Line.java | 2 +- .../models/puzzle/MatrixUtils.java | 2 +- .../models/puzzle/PuzzleLayout.java | 2 +- .../models/puzzle/PuzzlePiece.java | 8 +-- .../models/puzzle/PuzzleUtils.java | 30 ++++----- .../models/puzzle/PuzzleView.java | 2 +- .../models/puzzle/SquarePuzzleView.java | 2 +- .../models/puzzle/slant/CrossoverPointF.java | 2 +- .../models/puzzle/slant/SlantArea.java | 62 +++++++++---------- .../models/puzzle/slant/SlantLine.java | 9 ++- .../puzzle/slant/SlantPuzzleLayout.java | 24 ++++--- .../models/puzzle/slant/SlantUtils.java | 4 +- .../models/puzzle/straight/StraightArea.java | 6 +- .../models/puzzle/straight/StraightLine.java | 4 +- .../puzzle/straight/StraightPuzzleLayout.java | 14 ++--- .../models/puzzle/straight/StraightUtils.java | 4 +- .../template/slant/NumberSlantLayout.java | 4 +- .../puzzle/template/slant/OneSlantLayout.java | 4 +- .../template/slant/SlantLayoutHelper.java | 4 +- .../template/slant/ThreeSlantLayout.java | 4 +- .../puzzle/template/slant/TwoSlantLayout.java | 4 +- .../straight/EightStraightLayout.java | 4 +- .../template/straight/FiveStraightLayout.java | 4 +- .../template/straight/FourStraightLayout.java | 4 +- .../template/straight/NineStraightLayout.java | 4 +- .../straight/NumberStraightLayout.java | 4 +- .../template/straight/OneStraightLayout.java | 4 +- .../straight/SevenStraightLayout.java | 4 +- .../template/straight/SixStraightLayout.java | 4 +- .../straight/StraightLayoutHelper.java | 4 +- .../straight/ThreeStraightLayout.java | 4 +- .../template/straight/TwoStraightLayout.java | 4 +- .../models/sticker/StickerModel.java | 20 +++--- .../models/sticker/cache/StickerCache.java | 4 +- .../sticker/entity/TextStickerData.java | 2 +- .../listener/OnStickerClickListener.java | 2 +- .../models/sticker/view/BitmapSticker.java | 6 +- .../models/sticker/view/EditFragment.java | 2 +- .../models/sticker/view/TextSticker.java | 6 +- .../{ => easyphoto}/result/Result.java | 8 +-- .../{ => easyphoto}/setting/Setting.java | 8 +-- .../ui/EasyPhotosActivity.java | 42 ++++++------- .../{ => easyphoto}/ui/PreviewActivity.java | 22 +++---- .../{ => easyphoto}/ui/PreviewFragment.java | 4 +- .../{ => easyphoto}/ui/PuzzleActivity.java | 42 ++++++------- .../ui/PuzzleSelectorActivity.java | 22 +++---- .../ui/adapter/AlbumItemsAdapter.java | 8 +-- .../ui/adapter/PhotosAdapter.java | 16 ++--- .../ui/adapter/PreviewPhotosAdapter.java | 8 +-- .../adapter/PreviewPhotosFragmentAdapter.java | 12 ++-- .../ui/adapter/PuzzleAdapter.java | 10 +-- .../ui/adapter/PuzzleSelectorAdapter.java | 10 +-- .../adapter/PuzzleSelectorPreviewAdapter.java | 10 +-- .../ui/adapter/TextStickerAdapter.java | 6 +- .../ui/dialog/LoadingDialog.java | 2 +- .../ui/widget/PressedImageView.java | 2 +- .../ui/widget/PressedTextView.java | 2 +- .../ui/widget/PreviewRecyclerView.java | 2 +- .../utils/bitmap/BitmapUtils.java | 8 +-- .../utils/bitmap/SaveBitmapCallBack.java | 2 +- .../utils/color/ColorUtils.java | 2 +- .../utils/media/DurationUtils.java | 2 +- .../media/MediaScannerConnectionUtils.java | 2 +- .../utils/permission/PermissionUtil.java | 4 +- .../utils/result/EasyResult.java | 2 +- .../utils/result/HolderFragment.java | 16 ++--- .../utils/settings/SettingsUtils.java | 4 +- .../utils/string/StringUtils.java | 2 +- .../utils/system/MeiZuStatusUtils.java | 2 +- .../utils/system/SystemUtils.java | 2 +- .../{ => easyphoto}/utils/uri/UriUtils.java | 4 +- .../res/layout/activity_easy_photos.xml | 10 +-- .../layout/activity_preview_easy_photos.xml | 10 +-- .../layout/activity_puzzle_easy_photos.xml | 6 +- .../activity_puzzle_selector_easy_photos.xml | 8 +-- .../layout/fragment_preview_easy_photos.xml | 2 +- ...em_preview_selected_photos_easy_photos.xml | 2 +- .../res/layout/item_puzzle_easy_photos.xml | 2 +- .../res/layout/item_rv_photos_easy_photos.xml | 2 +- .../{ => luban}/Checker.java | 2 +- .../{ => luban}/CompressionPredicate.java | 2 +- .../{ => luban}/Engine.java | 2 +- .../{ => luban}/InputStreamProvider.java | 2 +- .../{ => luban}/Luban.java | 2 +- .../{ => luban}/OnCompressListener.java | 2 +- .../{ => luban}/OnRenameListener.java | 2 +- 158 files changed, 476 insertions(+), 455 deletions(-) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/base/BaseActivity.java (94%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/base/BaseDialogFragment.java (92%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/base/BaseViewTag.java (97%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/ISupportActivity.java (75%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/ISupportFragment.java (91%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/SupportActivityDelegate.java (96%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/SupportFragmentDelegate.java (96%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/SupportHelper.java (99%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/TransactionDelegate.java (96%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/internal/ResultRecord.java (93%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/internal/TransactionRecord.java (68%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/queue/Action.java (92%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/queue/ActionQueue.java (96%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/windowcallback/IWindowCallbackProxy.kt (75%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/fragmentation/windowcallback/WindowCallbackProxyUtil.kt (88%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/util/ActivityHelper.java (96%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/util/CoreUtils.java (96%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/util/Logger.java (99%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/util/ReflectionUtils.java (95%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/util/Utils.java (99%) rename library/src/module_common/java/{ => com/yizhuan/xchat_android_library/common}/util/ViewBindingUtil.kt (98%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/AfterPermissionGranted.java (93%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/AppSettingsDialog.java (99%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/AppSettingsDialogHolderActivity.java (97%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/EasyPermissions.java (99%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/PermissionRequest.java (97%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/RationaleDialogClickListener.java (95%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/RationaleDialogConfig.java (98%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/RationaleDialogFragment.java (98%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/RationaleDialogFragmentCompat.java (98%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/helper/ActivityPermissionHelper.java (93%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/helper/AppCompatActivityPermissionsHelper.java (94%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/helper/BaseSupportPermissionsHelper.java (91%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/helper/LowApiPermissionsHelper.java (96%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/helper/PermissionHelper.java (98%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/helper/SupportFragmentPermissionHelper.java (93%) rename library/src/module_easypermission/java/com/yizhuan/xchat_android_library/{ => easypermisssion}/helper/package-info.java (56%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/EasyPhotos.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/builder/AlbumBuilder.java (96%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/callback/PuzzleCallback.java (76%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/callback/SelectCallback.java (82%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/constant/Code.java (90%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/constant/Key.java (93%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/constant/Type.java (85%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/engine/ImageEngine.java (97%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/ad/AdEntity.java (81%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/ad/AdListener.java (70%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/ad/AdViewHolder.java (88%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/album/AlbumModel.java (96%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/album/entity/Album.java (94%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/album/entity/AlbumItem.java (91%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/album/entity/Photo.java (98%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/Area.java (93%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/DegreeSeekBar.java (99%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/Line.java (91%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/MatrixUtils.java (98%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/PuzzleLayout.java (96%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/PuzzlePiece.java (96%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/PuzzleUtils.java (65%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/PuzzleView.java (99%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/SquarePuzzleView.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/slant/CrossoverPointF.java (89%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/slant/SlantArea.java (73%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/slant/SlantLine.java (91%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/slant/SlantPuzzleLayout.java (89%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/slant/SlantUtils.java (99%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/straight/StraightArea.java (96%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/straight/StraightLine.java (97%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/straight/StraightPuzzleLayout.java (93%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/straight/StraightUtils.java (98%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/slant/NumberSlantLayout.java (79%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/slant/OneSlantLayout.java (82%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/slant/SlantLayoutHelper.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/slant/ThreeSlantLayout.java (89%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/slant/TwoSlantLayout.java (77%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/EightStraightLayout.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/FiveStraightLayout.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/FourStraightLayout.java (90%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/NineStraightLayout.java (94%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/NumberStraightLayout.java (79%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/OneStraightLayout.java (86%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/SevenStraightLayout.java (94%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/SixStraightLayout.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/StraightLayoutHelper.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/ThreeStraightLayout.java (89%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/puzzle/template/straight/TwoStraightLayout.java (89%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/sticker/StickerModel.java (89%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/sticker/cache/StickerCache.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/sticker/entity/TextStickerData.java (94%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/sticker/listener/OnStickerClickListener.java (71%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/sticker/view/BitmapSticker.java (98%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/sticker/view/EditFragment.java (98%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/models/sticker/view/TextSticker.java (98%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/result/Result.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/setting/Setting.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/EasyPhotosActivity.java (96%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/PreviewActivity.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/PreviewFragment.java (93%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/PuzzleActivity.java (94%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/PuzzleSelectorActivity.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/AlbumItemsAdapter.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/PhotosAdapter.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/PreviewPhotosAdapter.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/PreviewPhotosFragmentAdapter.java (88%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/PuzzleAdapter.java (88%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/PuzzleSelectorAdapter.java (89%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/PuzzleSelectorPreviewAdapter.java (90%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/adapter/TextStickerAdapter.java (91%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/dialog/LoadingDialog.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/widget/PressedImageView.java (94%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/widget/PressedTextView.java (97%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/ui/widget/PreviewRecyclerView.java (96%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/bitmap/BitmapUtils.java (98%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/bitmap/SaveBitmapCallBack.java (80%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/color/ColorUtils.java (91%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/media/DurationUtils.java (94%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/media/MediaScannerConnectionUtils.java (92%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/permission/PermissionUtil.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/result/EasyResult.java (95%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/result/HolderFragment.java (83%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/settings/SettingsUtils.java (83%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/string/StringUtils.java (86%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/system/MeiZuStatusUtils.java (99%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/system/SystemUtils.java (99%) rename library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/{ => easyphoto}/utils/uri/UriUtils.java (98%) rename library/src/module_luban/java/com/yizhuan/xchat_android_library/{ => luban}/Checker.java (99%) rename library/src/module_luban/java/com/yizhuan/xchat_android_library/{ => luban}/CompressionPredicate.java (89%) rename library/src/module_luban/java/com/yizhuan/xchat_android_library/{ => luban}/Engine.java (99%) rename library/src/module_luban/java/com/yizhuan/xchat_android_library/{ => luban}/InputStreamProvider.java (88%) rename library/src/module_luban/java/com/yizhuan/xchat_android_library/{ => luban}/Luban.java (99%) rename library/src/module_luban/java/com/yizhuan/xchat_android_library/{ => luban}/OnCompressListener.java (90%) rename library/src/module_luban/java/com/yizhuan/xchat_android_library/{ => luban}/OnRenameListener.java (91%) diff --git a/app/build.gradle b/app/build.gradle index c51cb2841..520fe5616 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -264,6 +264,8 @@ dependencies { //mmkv implementation 'com.tencent:mmkv:1.2.13' + implementation 'com.github.yalantis:ucrop:2.2.7' + } channel { diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 521d46ab5..1e0dd0768 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -466,5 +466,19 @@ } -keep public class com.android.installreferrer.**{ *; } +## Appsflyer +-keep class com.appsflyer.** { *; } +-dontwarn com.android.installreferrer + +## easypermissions +-keepclassmembers class * { + @pub.devrel.easypermissions.AfterPermissionGranted ; +} + ## EasyPhotos --keep class com.yizhuan.xchat_android_library.models.** { *; } \ No newline at end of file +-keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; } + +## 图片裁剪UCrop +-dontwarn com.yalantis.ucrop.** +-keep class com.yalantis.ucrop.** { *; } +-keep interface com.yalantis.ucrop.** { *; } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e77ec1818..bde71b805 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -995,6 +995,12 @@ + \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java index e1d61a65b..b2857f3e2 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseActivity.java @@ -19,12 +19,10 @@ import android.graphics.Color; import android.graphics.Typeface; import android.os.Build; import android.os.Bundle; -import android.os.Handler; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; import android.text.style.StyleSpan; -import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -117,8 +115,8 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import fragmentation.ISupportActivity; -import fragmentation.SupportActivityDelegate; +import com.yizhuan.xchat_android_library.common.fragmentation.ISupportActivity; +import com.yizhuan.xchat_android_library.common.fragmentation.SupportActivityDelegate; import io.reactivex.Observable; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; 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 97032d7ca..e4d2ca97c 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,10 +11,10 @@ import android.view.Window import android.view.WindowManager import com.hjq.toast.ToastUtils import kotlinx.coroutines.Job -import com.yizhuan.xchat_android_library.EasyPermissions +import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions import com.yizhuan.erban.R import com.yizhuan.erban.application.XChatApplication -import base.BaseDialogFragment +import com.yizhuan.xchat_android_library.common.base.BaseDialogFragment import com.yizhuan.erban.common.photo.PhotoProvider import com.yizhuan.erban.common.util.PhotoCompressCallback import com.yizhuan.erban.common.util.PhotoCompressUtil 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 955cab738..ac1168816 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.yizhuan.xchat_android_library.engine.ImageEngine; +import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine; /** * Created by wushaocheng on 2021/3/29 15:18. diff --git a/app/src/main/java/com/yizhuan/erban/common/glide/GlideUtils.kt b/app/src/main/java/com/yizhuan/erban/common/glide/GlideUtils.kt index ebf14903f..759fa91ef 100644 --- a/app/src/main/java/com/yizhuan/erban/common/glide/GlideUtils.kt +++ b/app/src/main/java/com/yizhuan/erban/common/glide/GlideUtils.kt @@ -29,7 +29,7 @@ import com.bumptech.glide.request.target.DrawableImageViewTarget import com.bumptech.glide.request.target.Target import com.yizhuan.erban.common.transform.AssignScaleTransformation import com.yizhuan.erban.common.transform.ComplexTransformation -import util.ActivityHelper +import com.yizhuan.xchat_android_library.common.util.ActivityHelper import com.yizhuan.erban.common.util.Utils import com.yizhuan.xchat_android_core.utils.Logger import jp.wasabeef.glide.transformations.RoundedCornersTransformation 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 6b25a1bf2..1ebeabc3a 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.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.xchat_android_library.easyphoto.EasyPhotos +import com.yizhuan.xchat_android_library.easyphoto.constant.Type.* +import com.yizhuan.xchat_android_library.easyphoto.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/AppLifeCycleHelper.java b/app/src/main/java/com/yizhuan/erban/common/util/AppLifeCycleHelper.java index f7aa849c2..4f1ca77a5 100644 --- a/app/src/main/java/com/yizhuan/erban/common/util/AppLifeCycleHelper.java +++ b/app/src/main/java/com/yizhuan/erban/common/util/AppLifeCycleHelper.java @@ -11,7 +11,7 @@ import com.yizhuan.erban.application.XChatApplication; import com.yizhuan.erban.location.LocationManager; import com.yizhuan.xchat_android_core.auth.AuthModel; -import util.CoreUtils; +import com.yizhuan.xchat_android_library.common.util.CoreUtils; /** * Activity生命周期工具类 diff --git a/app/src/main/java/com/yizhuan/erban/common/util/BitmapUtil.java b/app/src/main/java/com/yizhuan/erban/common/util/BitmapUtil.java index db0396072..783f045b5 100644 --- a/app/src/main/java/com/yizhuan/erban/common/util/BitmapUtil.java +++ b/app/src/main/java/com/yizhuan/erban/common/util/BitmapUtil.java @@ -14,7 +14,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import util.Logger; +import com.yizhuan.xchat_android_library.common.util.Logger; /** * Created by wushaocheng diff --git a/app/src/main/java/com/yizhuan/erban/common/util/DialogFragmentUtils.java b/app/src/main/java/com/yizhuan/erban/common/util/DialogFragmentUtils.java index 4454ece70..d7efc9400 100644 --- a/app/src/main/java/com/yizhuan/erban/common/util/DialogFragmentUtils.java +++ b/app/src/main/java/com/yizhuan/erban/common/util/DialogFragmentUtils.java @@ -13,9 +13,9 @@ import com.yizhuan.xchat_android_core.utils.Logger; import java.util.List; -import base.BaseDialogFragment; -import util.ActivityHelper; -import util.ReflectionUtils; +import com.yizhuan.xchat_android_library.common.base.BaseDialogFragment; +import com.yizhuan.xchat_android_library.common.util.ActivityHelper; +import com.yizhuan.xchat_android_library.common.util.ReflectionUtils; /** diff --git a/app/src/main/java/com/yizhuan/erban/common/util/PauseWorkerHandler.java b/app/src/main/java/com/yizhuan/erban/common/util/PauseWorkerHandler.java index 2b42c1fac..477f46081 100644 --- a/app/src/main/java/com/yizhuan/erban/common/util/PauseWorkerHandler.java +++ b/app/src/main/java/com/yizhuan/erban/common/util/PauseWorkerHandler.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Vector; -import util.CoreUtils; +import com.yizhuan.xchat_android_library.common.util.CoreUtils; /** * Created by logwee on 2019/4/9. 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 dab04e7a4..e1cba7cb0 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.xchat_android_library.Luban +import com.yizhuan.xchat_android_library.luban.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/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt index 53e352c2b..fe8d97365 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoModifyActivity.kt @@ -44,7 +44,7 @@ import com.yizhuan.xchat_android_core.user.UserModel import com.yizhuan.xchat_android_core.user.bean.UserInfo import com.yizhuan.xchat_android_core.user.bean.UserPhoto import com.yizhuan.xchat_android_core.utils.Logger -import com.yizhuan.xchat_android_library.EasyPermissions +import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions import com.yizhuan.xchat_android_library.utils.ResUtil import com.yizhuan.xchat_android_library.utils.TimeUtils import com.yizhuan.xchat_android_library.utils.log.MLog diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 7287d6354..0cb627f05 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -566,4 +566,8 @@ @anim/anim_right_out + + diff --git a/library/build.gradle b/library/build.gradle index c156a1dbc..c20c6582f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -124,8 +124,6 @@ dependencies { api 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0' api 'com.github.chrisbanes:PhotoView:2.3.0' - api 'com.github.yalantis:ucrop:2.2.7' - } repositories { mavenCentral() diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro index f1b424510..481bb4348 100644 --- a/library/proguard-rules.pro +++ b/library/proguard-rules.pro @@ -18,4 +18,4 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 203031fdd..e5b7519f6 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -9,24 +9,24 @@ extends AppCompatActivity implements ISupportActivity { private final String TAG = getClass().getSimpleName(); diff --git a/library/src/module_common/java/base/BaseDialogFragment.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseDialogFragment.java similarity index 92% rename from library/src/module_common/java/base/BaseDialogFragment.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseDialogFragment.java index ddbd004d9..285741046 100644 --- a/library/src/module_common/java/base/BaseDialogFragment.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseDialogFragment.java @@ -1,4 +1,4 @@ -package base; +package com.yizhuan.xchat_android_library.common.base; import android.content.Context; import android.os.Bundle; @@ -14,13 +14,13 @@ import androidx.annotation.Nullable; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; import androidx.viewbinding.ViewBinding; -import fragmentation.ISupportActivity; -import fragmentation.ISupportFragment; -import fragmentation.SupportFragmentDelegate; -import fragmentation.windowcallback.WindowCallbackProxyUtil; -import util.ActivityHelper; -import util.Logger; -import util.ViewBindingUtil; +import com.yizhuan.xchat_android_library.common.fragmentation.ISupportActivity; +import com.yizhuan.xchat_android_library.common.fragmentation.ISupportFragment; +import com.yizhuan.xchat_android_library.common.fragmentation.SupportFragmentDelegate; +import com.yizhuan.xchat_android_library.common.fragmentation.windowcallback.WindowCallbackProxyUtil; +import com.yizhuan.xchat_android_library.common.util.ActivityHelper; +import com.yizhuan.xchat_android_library.common.util.Logger; +import com.yizhuan.xchat_android_library.common.util.ViewBindingUtil; public abstract class BaseDialogFragment extends DialogFragment implements ISupportFragment { private final String TAG = getClass().getSimpleName(); diff --git a/library/src/module_common/java/base/BaseViewTag.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseViewTag.java similarity index 97% rename from library/src/module_common/java/base/BaseViewTag.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseViewTag.java index 10382e0a6..33de1d5cd 100644 --- a/library/src/module_common/java/base/BaseViewTag.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/base/BaseViewTag.java @@ -1,4 +1,4 @@ -package base; +package com.yizhuan.xchat_android_library.common.base; import android.view.View; import android.view.ViewGroup; @@ -7,7 +7,7 @@ import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleOwner; import com.yizhuan.xchat_android_library.R; -import util.Logger; +import com.yizhuan.xchat_android_library.common.util.Logger; /** * author: wushaocheng diff --git a/library/src/module_common/java/fragmentation/ISupportActivity.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportActivity.java similarity index 75% rename from library/src/module_common/java/fragmentation/ISupportActivity.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportActivity.java index 28af6ef93..bbb4e3d72 100644 --- a/library/src/module_common/java/fragmentation/ISupportActivity.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportActivity.java @@ -1,4 +1,4 @@ -package fragmentation; +package com.yizhuan.xchat_android_library.common.fragmentation; /** * Created by YoKey on 17/6/13. diff --git a/library/src/module_common/java/fragmentation/ISupportFragment.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportFragment.java similarity index 91% rename from library/src/module_common/java/fragmentation/ISupportFragment.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportFragment.java index cb6a2eca2..2c04b25e0 100644 --- a/library/src/module_common/java/fragmentation/ISupportFragment.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/ISupportFragment.java @@ -1,4 +1,4 @@ -package fragmentation; +package com.yizhuan.xchat_android_library.common.fragmentation; import android.os.Bundle; diff --git a/library/src/module_common/java/fragmentation/SupportActivityDelegate.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportActivityDelegate.java similarity index 96% rename from library/src/module_common/java/fragmentation/SupportActivityDelegate.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportActivityDelegate.java index 790c82719..67e66c3db 100644 --- a/library/src/module_common/java/fragmentation/SupportActivityDelegate.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportActivityDelegate.java @@ -1,10 +1,10 @@ -package fragmentation; +package com.yizhuan.xchat_android_library.common.fragmentation; import androidx.core.app.ActivityCompat; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; -import fragmentation.queue.Action; +import com.yizhuan.xchat_android_library.common.fragmentation.queue.Action; public class SupportActivityDelegate { private final ISupportActivity mSupport; diff --git a/library/src/module_common/java/fragmentation/SupportFragmentDelegate.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportFragmentDelegate.java similarity index 96% rename from library/src/module_common/java/fragmentation/SupportFragmentDelegate.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportFragmentDelegate.java index 7c4559066..fb22809e9 100644 --- a/library/src/module_common/java/fragmentation/SupportFragmentDelegate.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportFragmentDelegate.java @@ -1,4 +1,4 @@ -package fragmentation; +package com.yizhuan.xchat_android_library.common.fragmentation; import android.app.Activity; import android.content.Intent; @@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; -import fragmentation.internal.ResultRecord; -import fragmentation.internal.TransactionRecord; +import com.yizhuan.xchat_android_library.common.fragmentation.internal.ResultRecord; +import com.yizhuan.xchat_android_library.common.fragmentation.internal.TransactionRecord; public class SupportFragmentDelegate { int mContainerId; diff --git a/library/src/module_common/java/fragmentation/SupportHelper.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportHelper.java similarity index 99% rename from library/src/module_common/java/fragmentation/SupportHelper.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportHelper.java index 41c71d202..3f267d61c 100644 --- a/library/src/module_common/java/fragmentation/SupportHelper.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/SupportHelper.java @@ -1,4 +1,4 @@ -package fragmentation; +package com.yizhuan.xchat_android_library.common.fragmentation; import android.content.Context; import android.view.View; diff --git a/library/src/module_common/java/fragmentation/TransactionDelegate.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/TransactionDelegate.java similarity index 96% rename from library/src/module_common/java/fragmentation/TransactionDelegate.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/TransactionDelegate.java index b5cef63b9..f79af3e49 100644 --- a/library/src/module_common/java/fragmentation/TransactionDelegate.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/TransactionDelegate.java @@ -1,4 +1,4 @@ -package fragmentation; +package com.yizhuan.xchat_android_library.common.fragmentation; import android.os.Bundle; import android.os.Handler; @@ -9,10 +9,10 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; -import fragmentation.internal.ResultRecord; -import fragmentation.internal.TransactionRecord; -import fragmentation.queue.Action; -import fragmentation.queue.ActionQueue; +import com.yizhuan.xchat_android_library.common.fragmentation.internal.ResultRecord; +import com.yizhuan.xchat_android_library.common.fragmentation.internal.TransactionRecord; +import com.yizhuan.xchat_android_library.common.fragmentation.queue.Action; +import com.yizhuan.xchat_android_library.common.fragmentation.queue.ActionQueue; import java.util.List; diff --git a/library/src/module_common/java/fragmentation/internal/ResultRecord.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/ResultRecord.java similarity index 93% rename from library/src/module_common/java/fragmentation/internal/ResultRecord.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/ResultRecord.java index 9b208a819..2d6b78a4a 100644 --- a/library/src/module_common/java/fragmentation/internal/ResultRecord.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/ResultRecord.java @@ -1,4 +1,4 @@ -package fragmentation.internal; +package com.yizhuan.xchat_android_library.common.fragmentation.internal; import android.os.Bundle; import android.os.Parcel; diff --git a/library/src/module_common/java/fragmentation/internal/TransactionRecord.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/TransactionRecord.java similarity index 68% rename from library/src/module_common/java/fragmentation/internal/TransactionRecord.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/TransactionRecord.java index ae7500b07..df7ae377d 100644 --- a/library/src/module_common/java/fragmentation/internal/TransactionRecord.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/internal/TransactionRecord.java @@ -1,4 +1,4 @@ -package fragmentation.internal; +package com.yizhuan.xchat_android_library.common.fragmentation.internal; /** * @hide Created by YoKey on 16/11/25. diff --git a/library/src/module_common/java/fragmentation/queue/Action.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/Action.java similarity index 92% rename from library/src/module_common/java/fragmentation/queue/Action.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/Action.java index ee160f1fd..da267a861 100644 --- a/library/src/module_common/java/fragmentation/queue/Action.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/Action.java @@ -1,4 +1,4 @@ -package fragmentation.queue; +package com.yizhuan.xchat_android_library.common.fragmentation.queue; import androidx.fragment.app.FragmentManager; diff --git a/library/src/module_common/java/fragmentation/queue/ActionQueue.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/ActionQueue.java similarity index 96% rename from library/src/module_common/java/fragmentation/queue/ActionQueue.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/ActionQueue.java index 3e1c98c24..4bb54a96a 100644 --- a/library/src/module_common/java/fragmentation/queue/ActionQueue.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/queue/ActionQueue.java @@ -1,4 +1,4 @@ -package fragmentation.queue; +package com.yizhuan.xchat_android_library.common.fragmentation.queue; import android.os.Handler; import android.os.Looper; diff --git a/library/src/module_common/java/fragmentation/windowcallback/IWindowCallbackProxy.kt b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt similarity index 75% rename from library/src/module_common/java/fragmentation/windowcallback/IWindowCallbackProxy.kt rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt index 9140b8e81..2e3aa1817 100644 --- a/library/src/module_common/java/fragmentation/windowcallback/IWindowCallbackProxy.kt +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/IWindowCallbackProxy.kt @@ -1,4 +1,4 @@ -package fragmentation.windowcallback +package com.yizhuan.xchat_android_library.common.fragmentation.windowcallback import android.view.Window diff --git a/library/src/module_common/java/fragmentation/windowcallback/WindowCallbackProxyUtil.kt b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt similarity index 88% rename from library/src/module_common/java/fragmentation/windowcallback/WindowCallbackProxyUtil.kt rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt index d3cf32d51..f23a9504f 100644 --- a/library/src/module_common/java/fragmentation/windowcallback/WindowCallbackProxyUtil.kt +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/fragmentation/windowcallback/WindowCallbackProxyUtil.kt @@ -1,4 +1,4 @@ -package fragmentation.windowcallback +package com.yizhuan.xchat_android_library.common.fragmentation.windowcallback import android.view.Window diff --git a/library/src/module_common/java/util/ActivityHelper.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ActivityHelper.java similarity index 96% rename from library/src/module_common/java/util/ActivityHelper.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ActivityHelper.java index 908668450..89015a5f3 100644 --- a/library/src/module_common/java/util/ActivityHelper.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ActivityHelper.java @@ -1,4 +1,4 @@ -package util; +package com.yizhuan.xchat_android_library.common.util; import android.app.Activity; import android.content.Context; diff --git a/library/src/module_common/java/util/CoreUtils.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/CoreUtils.java similarity index 96% rename from library/src/module_common/java/util/CoreUtils.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/CoreUtils.java index 5aec4f09d..2f46e5361 100644 --- a/library/src/module_common/java/util/CoreUtils.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/CoreUtils.java @@ -1,4 +1,4 @@ -package util; +package com.yizhuan.xchat_android_library.common.util; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBusException; diff --git a/library/src/module_common/java/util/Logger.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Logger.java similarity index 99% rename from library/src/module_common/java/util/Logger.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Logger.java index 94c53606f..663c4ae31 100644 --- a/library/src/module_common/java/util/Logger.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Logger.java @@ -4,7 +4,7 @@ * 使用前需要先调用init初始化 * 内部使用android的Log类实现，并支持写入文件 */ -package util; +package com.yizhuan.xchat_android_library.common.util; import android.annotation.SuppressLint; import android.os.Bundle; diff --git a/library/src/module_common/java/util/ReflectionUtils.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ReflectionUtils.java similarity index 95% rename from library/src/module_common/java/util/ReflectionUtils.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ReflectionUtils.java index 7798442d0..c5e348830 100644 --- a/library/src/module_common/java/util/ReflectionUtils.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package util; +package com.yizhuan.xchat_android_library.common.util; import java.lang.reflect.Field; diff --git a/library/src/module_common/java/util/Utils.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Utils.java similarity index 99% rename from library/src/module_common/java/util/Utils.java rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Utils.java index d019929ad..300c265d1 100644 --- a/library/src/module_common/java/util/Utils.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/Utils.java @@ -1,4 +1,4 @@ -package util; +package com.yizhuan.xchat_android_library.common.util; import android.annotation.TargetApi; import android.content.Context; diff --git a/library/src/module_common/java/util/ViewBindingUtil.kt b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ViewBindingUtil.kt similarity index 98% rename from library/src/module_common/java/util/ViewBindingUtil.kt rename to library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ViewBindingUtil.kt index 40809ce15..ad004b2aa 100644 --- a/library/src/module_common/java/util/ViewBindingUtil.kt +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/util/ViewBindingUtil.kt @@ -1,4 +1,4 @@ -package util +package com.yizhuan.xchat_android_library.common.util import android.view.LayoutInflater import android.view.ViewGroup diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AfterPermissionGranted.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AfterPermissionGranted.java similarity index 93% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AfterPermissionGranted.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AfterPermissionGranted.java index 46ad2840a..31bd907e3 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AfterPermissionGranted.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AfterPermissionGranted.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialog.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialog.java similarity index 99% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialog.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialog.java index 489de54ad..84e5f35a7 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialog.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import android.app.Activity; import android.content.Context; @@ -17,6 +17,8 @@ import androidx.annotation.StyleRes; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import com.yizhuan.xchat_android_library.R; + /** * Dialog to prompt the user to go to the app's settings screen and enable permissions. If the user * clicks 'OK' on the dialog, they are sent to the settings screen. The result is returned to the diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialogHolderActivity.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialogHolderActivity.java similarity index 97% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialogHolderActivity.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialogHolderActivity.java index ba41e3a02..592d4c59a 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/AppSettingsDialogHolderActivity.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/AppSettingsDialogHolderActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import android.app.Activity; import android.app.Dialog; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/EasyPermissions.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/EasyPermissions.java similarity index 99% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/EasyPermissions.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/EasyPermissions.java index bf6047b73..4e9f9603c 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/EasyPermissions.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/EasyPermissions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; 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.xchat_android_library.helper.PermissionHelper; +import com.yizhuan.xchat_android_library.easypermisssion.helper.PermissionHelper; /** * Utility to request and check System permissions for apps targeting Android M (API >= 23). diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/PermissionRequest.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/PermissionRequest.java similarity index 97% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/PermissionRequest.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/PermissionRequest.java index ecfead639..8cd6c16e0 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/PermissionRequest.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/PermissionRequest.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import android.app.Activity; import androidx.annotation.NonNull; @@ -11,7 +11,8 @@ import androidx.fragment.app.Fragment; import java.util.Arrays; -import com.yizhuan.xchat_android_library.helper.PermissionHelper; +import com.yizhuan.xchat_android_library.R; +import com.yizhuan.xchat_android_library.easypermisssion.helper.PermissionHelper; /** * An immutable model object that holds all of the parameters associated with a permission request, diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogClickListener.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogClickListener.java similarity index 95% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogClickListener.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogClickListener.java index 9b1e59186..dd0a1d21b 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogClickListener.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import android.app.Activity; import android.app.Dialog; @@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment; import java.util.Arrays; -import com.yizhuan.xchat_android_library.helper.PermissionHelper; +import com.yizhuan.xchat_android_library.easypermisssion.helper.PermissionHelper; /** * Click listener for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}. diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogConfig.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogConfig.java similarity index 98% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogConfig.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogConfig.java index 26e83437d..143a9c5a9 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogConfig.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import android.app.Dialog; import android.content.Context; @@ -13,6 +13,8 @@ import androidx.annotation.NonNull; import androidx.annotation.StyleRes; import androidx.appcompat.app.AlertDialog; +import com.yizhuan.xchat_android_library.R; + /** * Configuration for either {@link RationaleDialogFragment} or {@link RationaleDialogFragmentCompat}. */ diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragment.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragment.java similarity index 98% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragment.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragment.java index 1ecc1f050..546c2b1b7 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragment.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import android.app.Dialog; import android.app.DialogFragment; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragmentCompat.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragmentCompat.java similarity index 98% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragmentCompat.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragmentCompat.java index 65b1c788e..837a619f0 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/RationaleDialogFragmentCompat.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/RationaleDialogFragmentCompat.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easypermisssion; import android.app.Dialog; import android.content.Context; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/ActivityPermissionHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/ActivityPermissionHelper.java similarity index 93% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/ActivityPermissionHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/ActivityPermissionHelper.java index 5e106826d..a38e23cd6 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/ActivityPermissionHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/ActivityPermissionHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.helper; +package com.yizhuan.xchat_android_library.easypermisssion.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.xchat_android_library.RationaleDialogFragment; +import com.yizhuan.xchat_android_library.easypermisssion.RationaleDialogFragment; /** * Permissions helper for {@link Activity}. diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/AppCompatActivityPermissionsHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java similarity index 94% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/AppCompatActivityPermissionsHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java index c5ff4f22d..bc637f721 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/AppCompatActivityPermissionsHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/AppCompatActivityPermissionsHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.helper; +package com.yizhuan.xchat_android_library.easypermisssion.helper; import android.content.Context; import androidx.annotation.NonNull; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/BaseSupportPermissionsHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/BaseSupportPermissionsHelper.java similarity index 91% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/BaseSupportPermissionsHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/BaseSupportPermissionsHelper.java index 92ad85d89..5874fd3da 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/BaseSupportPermissionsHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/BaseSupportPermissionsHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.helper; +package com.yizhuan.xchat_android_library.easypermisssion.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.xchat_android_library.RationaleDialogFragmentCompat; +import com.yizhuan.xchat_android_library.easypermisssion.RationaleDialogFragmentCompat; /** * Implementation of {@link PermissionHelper} for Support Library host classes. diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/LowApiPermissionsHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/LowApiPermissionsHelper.java similarity index 96% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/LowApiPermissionsHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/LowApiPermissionsHelper.java index b19b7b4e8..550d926f9 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/LowApiPermissionsHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/LowApiPermissionsHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.helper; +package com.yizhuan.xchat_android_library.easypermisssion.helper; import android.app.Activity; import android.content.Context; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/PermissionHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/PermissionHelper.java similarity index 98% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/PermissionHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/PermissionHelper.java index f1d2768bd..fd5ab8ae8 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/PermissionHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/PermissionHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.helper; +package com.yizhuan.xchat_android_library.easypermisssion.helper; import android.app.Activity; import android.content.Context; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/SupportFragmentPermissionHelper.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/SupportFragmentPermissionHelper.java similarity index 93% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/SupportFragmentPermissionHelper.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/SupportFragmentPermissionHelper.java index f86359af9..b5ea04d45 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/SupportFragmentPermissionHelper.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/SupportFragmentPermissionHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.helper; +package com.yizhuan.xchat_android_library.easypermisssion.helper; import android.content.Context; import androidx.annotation.NonNull; diff --git a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/package-info.java b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/package-info.java similarity index 56% rename from library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/package-info.java rename to library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/package-info.java index 8d7e0f8f4..80acd7fd8 100644 --- a/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/helper/package-info.java +++ b/library/src/module_easypermission/java/com/yizhuan/xchat_android_library/easypermisssion/helper/package-info.java @@ -1,4 +1,4 @@ @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) -package com.yizhuan.xchat_android_library.helper; +package com.yizhuan.xchat_android_library.easypermisssion.helper; import androidx.annotation.RestrictTo; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/EasyPhotos.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/EasyPhotos.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/EasyPhotos.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/EasyPhotos.java index 1a8ffc4a0..3806a477d 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/EasyPhotos.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/EasyPhotos.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library; +package com.yizhuan.xchat_android_library.easyphoto; 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.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 com.yizhuan.xchat_android_library.easyphoto.builder.AlbumBuilder; +import com.yizhuan.xchat_android_library.easyphoto.callback.PuzzleCallback; +import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine; +import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdListener; +import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.StickerModel; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity.TextStickerData; +import com.yizhuan.xchat_android_library.easyphoto.ui.PuzzleActivity; +import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.BitmapUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.SaveBitmapCallBack; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.MediaScannerConnectionUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.result.EasyResult; import java.io.File; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/builder/AlbumBuilder.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/builder/AlbumBuilder.java similarity index 96% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/builder/AlbumBuilder.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/builder/AlbumBuilder.java index f14243936..b4bd86249 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/builder/AlbumBuilder.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/builder/AlbumBuilder.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.builder; +package com.yizhuan.xchat_android_library.easyphoto.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.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 com.yizhuan.xchat_android_library.easyphoto.callback.SelectCallback; +import com.yizhuan.xchat_android_library.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine; +import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdListener; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.result.Result; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.ui.EasyPhotosActivity; +import com.yizhuan.xchat_android_library.easyphoto.utils.result.EasyResult; +import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils; import java.io.File; import java.lang.ref.WeakReference; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/PuzzleCallback.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/PuzzleCallback.java similarity index 76% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/PuzzleCallback.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/PuzzleCallback.java index e687db6bf..1f701edcc 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/PuzzleCallback.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/PuzzleCallback.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.callback; +package com.yizhuan.xchat_android_library.easyphoto.callback; -import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; /** * PuzzleCallback diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/SelectCallback.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/SelectCallback.java similarity index 82% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/SelectCallback.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/SelectCallback.java index 2852933f0..c24d83f34 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/callback/SelectCallback.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/callback/SelectCallback.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.callback; +package com.yizhuan.xchat_android_library.easyphoto.callback; -import com.yizhuan.xchat_android_library.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Code.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Code.java similarity index 90% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Code.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Code.java index ae20dd2c6..3b78f0e62 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Code.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Code.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.constant; +package com.yizhuan.xchat_android_library.easyphoto.constant; /** * Code常量 diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Key.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Key.java similarity index 93% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Key.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Key.java index c7b276dd9..66fcaec34 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Key.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Key.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.constant; +package com.yizhuan.xchat_android_library.easyphoto.constant; /** * key的常量 diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Type.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Type.java similarity index 85% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Type.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Type.java index b4a8a6142..6bf095b5c 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/constant/Type.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/constant/Type.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.constant; +package com.yizhuan.xchat_android_library.easyphoto.constant; /** * Created by huan on 2018/1/9. diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/engine/ImageEngine.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/engine/ImageEngine.java similarity index 97% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/engine/ImageEngine.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/engine/ImageEngine.java index bf4e0f54b..0422b9a2f 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/engine/ImageEngine.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/engine/ImageEngine.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.engine; +package com.yizhuan.xchat_android_library.easyphoto.engine; import android.content.Context; import android.graphics.Bitmap; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdEntity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdEntity.java similarity index 81% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdEntity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdEntity.java index 1058d5665..046536455 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdEntity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdEntity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.ad; +package com.yizhuan.xchat_android_library.easyphoto.models.ad; import android.view.View; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdListener.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdListener.java similarity index 70% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdListener.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdListener.java index 3f36faec5..479a0a1ff 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdListener.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.ad; +package com.yizhuan.xchat_android_library.easyphoto.models.ad; /** * 广告监听 diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdViewHolder.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdViewHolder.java similarity index 88% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdViewHolder.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdViewHolder.java index a1f29674a..928592fd6 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/ad/AdViewHolder.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/ad/AdViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.ad; +package com.yizhuan.xchat_android_library.easyphoto.models.ad; import androidx.recyclerview.widget.RecyclerView; import android.view.View; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/AlbumModel.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java similarity index 96% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/AlbumModel.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java index d2ee8e5aa..8d003de31 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/AlbumModel.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/AlbumModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.album; +package com.yizhuan.xchat_android_library.easyphoto.models.album; import android.Manifest; import android.content.ContentResolver; @@ -13,13 +13,13 @@ import android.text.TextUtils; import androidx.core.content.PermissionChecker; 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 com.yizhuan.xchat_android_library.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Album; +import com.yizhuan.xchat_android_library.easyphoto.result.Result; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.utils.string.StringUtils; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.AlbumItem; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; import java.io.File; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Album.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Album.java similarity index 94% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Album.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Album.java index aff63ce5a..6b561acbc 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Album.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Album.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.album.entity; +package com.yizhuan.xchat_android_library.easyphoto.models.album.entity; import android.net.Uri; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/AlbumItem.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/AlbumItem.java similarity index 91% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/AlbumItem.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/AlbumItem.java index c3a3a95af..24ad1f283 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/AlbumItem.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/AlbumItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.album.entity; +package com.yizhuan.xchat_android_library.easyphoto.models.album.entity; import android.net.Uri; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Photo.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Photo.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Photo.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Photo.java index 67cf5f89e..d62dd79dc 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/album/entity/Photo.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/album/entity/Photo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.album.entity; +package com.yizhuan.xchat_android_library.easyphoto.models.album.entity; import android.net.Uri; import android.os.Parcel; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Area.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Area.java similarity index 93% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Area.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Area.java index aea68d0e9..83667ab55 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Area.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Area.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; import android.graphics.Path; import android.graphics.PointF; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/DegreeSeekBar.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/DegreeSeekBar.java similarity index 99% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/DegreeSeekBar.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/DegreeSeekBar.java index 60d4b022c..15bde7bb7 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/DegreeSeekBar.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/DegreeSeekBar.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; import android.annotation.TargetApi; import android.content.Context; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Line.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Line.java similarity index 91% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Line.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Line.java index 830919db3..93fd37441 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/Line.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/Line.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; import android.graphics.PointF; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/MatrixUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/MatrixUtils.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/MatrixUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/MatrixUtils.java index e1b733088..456a4543e 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/MatrixUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/MatrixUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; import android.graphics.Matrix; import android.graphics.RectF; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleLayout.java similarity index 96% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleLayout.java index 5bd869830..73ff7a555 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; import android.graphics.RectF; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzlePiece.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzlePiece.java similarity index 96% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzlePiece.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzlePiece.java index b44b3e5ca..401b8f1a4 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzlePiece.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzlePiece.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.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.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; +import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.MatrixUtils.calculateImageIndents; +import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.MatrixUtils.getMinMatrixScale; +import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.MatrixUtils.judgeIsImageContainsBorder; /** diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleUtils.java similarity index 65% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleUtils.java index 85a42cd2d..939346209 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleUtils.java @@ -1,20 +1,20 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; -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 com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.OneSlantLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.SlantLayoutHelper; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.ThreeSlantLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.TwoSlantLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.EightStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.FiveStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.FourStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.NineStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.OneStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.SevenStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.SixStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.StraightLayoutHelper; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.ThreeStraightLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.TwoStraightLayout; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleView.java similarity index 99% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleView.java index ebe00b85c..3e8b1b4b2 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/PuzzleView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/PuzzleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; import android.annotation.SuppressLint; import android.content.Context; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/SquarePuzzleView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/SquarePuzzleView.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/SquarePuzzleView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/SquarePuzzleView.java index 9e9d91950..04f790401 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/SquarePuzzleView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/SquarePuzzleView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle; import android.content.Context; import android.util.AttributeSet; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/CrossoverPointF.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/CrossoverPointF.java similarity index 89% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/CrossoverPointF.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/CrossoverPointF.java index 1a9bd1648..901324b2f 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/CrossoverPointF.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/CrossoverPointF.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.puzzle.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant; import android.graphics.PointF; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantArea.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantArea.java similarity index 73% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantArea.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantArea.java index 66b411f95..5844fb22a 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantArea.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantArea.java @@ -1,21 +1,17 @@ -package com.yizhuan.xchat_android_library.models.puzzle.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant; import android.graphics.Path; import android.graphics.PointF; import android.graphics.RectF; -import com.yizhuan.xchat_android_library.models.puzzle.Area; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; import java.util.Arrays; import java.util.Comparator; import java.util.List; -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; - /** * @author wupanjie @@ -119,48 +115,48 @@ class SlantArea implements Area { areaPath.reset(); if (radian > 0) { - float tempRatio = radian / distance(leftTop, leftBottom); - getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio); + float tempRatio = radian / SlantUtils.distance(leftTop, leftBottom); + SlantUtils.getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio); tempPoint.offset(paddingLeft, paddingTop); areaPath.moveTo(tempPoint.x, tempPoint.y); - tempRatio = radian / distance(leftTop, rightTop); - getPoint(tempPoint, leftTop, rightTop, Line.Direction.HORIZONTAL, tempRatio); + tempRatio = radian / SlantUtils.distance(leftTop, rightTop); + SlantUtils.getPoint(tempPoint, leftTop, rightTop, Line.Direction.HORIZONTAL, tempRatio); tempPoint.offset(paddingLeft, paddingTop); areaPath.quadTo(leftTop.x + paddingLeft, leftTop.y + paddingTop, tempPoint.x, tempPoint.y); tempRatio = 1 - tempRatio; - getPoint(tempPoint, leftTop, rightTop, Line.Direction.HORIZONTAL, tempRatio); + SlantUtils.getPoint(tempPoint, leftTop, rightTop, Line.Direction.HORIZONTAL, tempRatio); tempPoint.offset(-paddingRight, paddingTop); areaPath.lineTo(tempPoint.x, tempPoint.y); - tempRatio = radian / distance(rightTop, rightBottom); - getPoint(tempPoint, rightTop, rightBottom, Line.Direction.VERTICAL, tempRatio); + tempRatio = radian / SlantUtils.distance(rightTop, rightBottom); + SlantUtils.getPoint(tempPoint, rightTop, rightBottom, Line.Direction.VERTICAL, tempRatio); tempPoint.offset(-paddingRight, paddingTop); areaPath.quadTo(rightTop.x - paddingLeft, rightTop.y + paddingTop, tempPoint.x, tempPoint.y); tempRatio = 1 - tempRatio; - getPoint(tempPoint, rightTop, rightBottom, Line.Direction.VERTICAL, tempRatio); + SlantUtils.getPoint(tempPoint, rightTop, rightBottom, Line.Direction.VERTICAL, tempRatio); tempPoint.offset(-paddingRight, -paddingBottom); areaPath.lineTo(tempPoint.x, tempPoint.y); - tempRatio = 1 - radian / distance(leftBottom, rightBottom); - getPoint(tempPoint, leftBottom, rightBottom, Line.Direction.HORIZONTAL, tempRatio); + tempRatio = 1 - radian / SlantUtils.distance(leftBottom, rightBottom); + SlantUtils.getPoint(tempPoint, leftBottom, rightBottom, Line.Direction.HORIZONTAL, tempRatio); tempPoint.offset(-paddingRight, -paddingBottom); areaPath.quadTo(rightBottom.x - paddingRight, rightBottom.y - paddingTop, tempPoint.x, tempPoint.y); tempRatio = 1 - tempRatio; - getPoint(tempPoint, leftBottom, rightBottom, Line.Direction.HORIZONTAL, tempRatio); + SlantUtils.getPoint(tempPoint, leftBottom, rightBottom, Line.Direction.HORIZONTAL, tempRatio); tempPoint.offset(paddingLeft, -paddingBottom); areaPath.lineTo(tempPoint.x, tempPoint.y); - tempRatio = 1 - radian / distance(leftTop, leftBottom); - getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio); + tempRatio = 1 - radian / SlantUtils.distance(leftTop, leftBottom); + SlantUtils.getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio); tempPoint.offset(paddingLeft, -paddingBottom); areaPath.quadTo(leftBottom.x + paddingLeft, leftBottom.y - paddingBottom, tempPoint.x, tempPoint.y); tempRatio = 1 - tempRatio; - getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio); + SlantUtils.getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio); tempPoint.offset(paddingLeft, paddingTop); areaPath.lineTo(tempPoint.x, tempPoint.y); } else { @@ -201,23 +197,23 @@ class SlantArea implements Area { @Override public PointF[] getHandleBarPoints(Line line) { if (line == lineLeft) { - getPoint(handleBarPoints[0], leftTop, leftBottom, line.direction(), 0.25f); - getPoint(handleBarPoints[1], leftTop, leftBottom, line.direction(), 0.75f); + SlantUtils.getPoint(handleBarPoints[0], leftTop, leftBottom, line.direction(), 0.25f); + SlantUtils.getPoint(handleBarPoints[1], leftTop, leftBottom, line.direction(), 0.75f); handleBarPoints[0].offset(paddingLeft, 0); handleBarPoints[1].offset(paddingLeft, 0); } else if (line == lineTop) { - getPoint(handleBarPoints[0], leftTop, rightTop, line.direction(), 0.25f); - getPoint(handleBarPoints[1], leftTop, rightTop, line.direction(), 0.75f); + SlantUtils.getPoint(handleBarPoints[0], leftTop, rightTop, line.direction(), 0.25f); + SlantUtils.getPoint(handleBarPoints[1], leftTop, rightTop, line.direction(), 0.75f); handleBarPoints[0].offset(0, paddingTop); handleBarPoints[1].offset(0, paddingTop); } else if (line == lineRight) { - getPoint(handleBarPoints[0], rightTop, rightBottom, line.direction(), 0.25f); - getPoint(handleBarPoints[1], rightTop, rightBottom, line.direction(), 0.75f); + SlantUtils.getPoint(handleBarPoints[0], rightTop, rightBottom, line.direction(), 0.25f); + SlantUtils.getPoint(handleBarPoints[1], rightTop, rightBottom, line.direction(), 0.75f); handleBarPoints[0].offset(-paddingRight, 0); handleBarPoints[1].offset(-paddingRight, 0); } else if (line == lineBottom) { - getPoint(handleBarPoints[0], leftBottom, rightBottom, line.direction(), 0.25f); - getPoint(handleBarPoints[1], leftBottom, rightBottom, line.direction(), 0.75f); + SlantUtils.getPoint(handleBarPoints[0], leftBottom, rightBottom, line.direction(), 0.25f); + SlantUtils.getPoint(handleBarPoints[1], leftBottom, rightBottom, line.direction(), 0.75f); handleBarPoints[0].offset(0, -paddingBottom); handleBarPoints[1].offset(0, -paddingBottom); } @@ -268,10 +264,10 @@ class SlantArea implements Area { } void updateCornerPoints() { - intersectionOfLines(leftTop, lineLeft, lineTop); - intersectionOfLines(leftBottom, lineLeft, lineBottom); - intersectionOfLines(rightTop, lineRight, lineTop); - intersectionOfLines(rightBottom, lineRight, lineBottom); + SlantUtils.intersectionOfLines(leftTop, lineLeft, lineTop); + SlantUtils.intersectionOfLines(leftBottom, lineLeft, lineBottom); + SlantUtils.intersectionOfLines(rightTop, lineRight, lineTop); + SlantUtils.intersectionOfLines(rightBottom, lineRight, lineBottom); } static class AreaComparator implements Comparator { diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantLine.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantLine.java similarity index 91% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantLine.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantLine.java index 4891a8b13..eabdecf9e 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantLine.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantLine.java @@ -1,10 +1,9 @@ -package com.yizhuan.xchat_android_library.models.puzzle.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant; import android.graphics.PointF; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; -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; @@ -136,8 +135,8 @@ class SlantLine implements Line { @Override public void update(float layoutWidth, float layoutHeight) { - intersectionOfLines(start, this, attachLineStart); - intersectionOfLines(end, this, attachLineEnd); + SlantUtils.intersectionOfLines(start, this, attachLineStart); + SlantUtils.intersectionOfLines(end, this, attachLineEnd); } @Override diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantPuzzleLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java similarity index 89% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantPuzzleLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java index 5398254a8..3031c0cc1 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantPuzzleLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantPuzzleLayout.java @@ -1,20 +1,18 @@ -package com.yizhuan.xchat_android_library.models.puzzle.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant; import android.graphics.RectF; import android.util.Pair; -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 com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -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; +import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant.SlantUtils.cutAreaWith; /** @@ -254,10 +252,10 @@ public abstract class SlantPuzzleLayout implements PuzzleLayout { float endRatio) { SlantArea area = areas.get(position); areas.remove(area); - SlantLine line = createLine(area, direction, startRatio, endRatio); + SlantLine line = SlantUtils.createLine(area, direction, startRatio, endRatio); lines.add(line); - List increasedAreas = cutAreaWith(area, line); + List increasedAreas = SlantUtils.cutAreaWith(area, line); areas.addAll(increasedAreas); @@ -278,12 +276,12 @@ public abstract class SlantPuzzleLayout implements PuzzleLayout { SlantArea area = areas.get(position); areas.remove(area); - SlantLine horizontal = createLine(area, Line.Direction.HORIZONTAL, startRatio1, endRatio1); - SlantLine vertical = createLine(area, Line.Direction.VERTICAL, startRatio2, endRatio2); + SlantLine horizontal = SlantUtils.createLine(area, Line.Direction.HORIZONTAL, startRatio1, endRatio1); + SlantLine vertical = SlantUtils.createLine(area, Line.Direction.VERTICAL, startRatio2, endRatio2); lines.add(horizontal); lines.add(vertical); - List increasedAreas = cutAreaCross(area, horizontal, vertical); + List increasedAreas = SlantUtils.cutAreaCross(area, horizontal, vertical); areas.addAll(increasedAreas); sortAreas(); @@ -299,7 +297,7 @@ public abstract class SlantPuzzleLayout implements PuzzleLayout { areas.remove(area); Pair, List> spilt = - cutAreaWith(area, hSize, vSize); + SlantUtils.cutAreaWith(area, hSize, vSize); lines.addAll(spilt.first); areas.addAll(spilt.second); diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantUtils.java similarity index 99% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantUtils.java index 7e3a1cd9c..8628f8d7b 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/slant/SlantUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/slant/SlantUtils.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.models.puzzle.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant; import android.graphics.PointF; import android.util.Pair; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightArea.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightArea.java similarity index 96% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightArea.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightArea.java index 7c8dc4444..c66e131a2 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightArea.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightArea.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_library.models.puzzle.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight; import android.graphics.Path; import android.graphics.PointF; import android.graphics.RectF; -import com.yizhuan.xchat_android_library.models.puzzle.Area; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; import java.util.Arrays; import java.util.Comparator; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightLine.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightLine.java similarity index 97% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightLine.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightLine.java index e2b861b65..7a321c6ad 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightLine.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightLine.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.models.puzzle.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight; import android.graphics.PointF; import android.graphics.RectF; import android.util.Log; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; import static java.lang.Math.max; import static java.lang.Math.min; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightPuzzleLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java similarity index 93% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightPuzzleLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java index 116289638..60a5a24ec 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightPuzzleLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightPuzzleLayout.java @@ -1,21 +1,21 @@ -package com.yizhuan.xchat_android_library.models.puzzle.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight; import android.graphics.PointF; import android.graphics.RectF; import android.util.Pair; -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 com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -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; +import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightUtils.createLine; +import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightUtils.cutAreaCross; +import static com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightUtils.cutAreaSpiral; /** diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightUtils.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightUtils.java index 6482bab71..f1e02663f 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/straight/StraightUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/straight/StraightUtils.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.models.puzzle.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight; import android.graphics.PointF; import android.util.Pair; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/NumberSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java similarity index 79% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/NumberSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java index 0421bb04b..dd123ab7c 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/NumberSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/NumberSlantLayout.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant; import android.util.Log; -import com.yizhuan.xchat_android_library.models.puzzle.slant.SlantPuzzleLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.slant.SlantPuzzleLayout; /** diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/OneSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java similarity index 82% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/OneSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java index 4a6183a2b..12ae2f6e1 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/OneSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/OneSlantLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/SlantLayoutHelper.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/SlantLayoutHelper.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java index 0f68e2a07..6795494eb 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/SlantLayoutHelper.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/SlantLayoutHelper.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant; -import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/ThreeSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java similarity index 89% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/ThreeSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java index b7e54b502..54dc45732 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/ThreeSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/ThreeSlantLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/TwoSlantLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java similarity index 77% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/TwoSlantLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java index 2cdc90d31..81b505370 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/slant/TwoSlantLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/slant/TwoSlantLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.slant; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/EightStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/EightStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java index eeecaa53d..6b5ef5282 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/EightStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/EightStraightLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FiveStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FiveStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java index b4c93672a..402c26cb2 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FiveStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FiveStraightLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FourStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java similarity index 90% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FourStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java index b2937dac1..981edc693 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/FourStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/FourStraightLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NineStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java similarity index 94% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NineStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java index c5d236c0a..b5f2ff1bf 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NineStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NineStraightLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NumberStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java similarity index 79% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NumberStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java index fa631e3fa..6dcb6690a 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/NumberStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/NumberStraightLayout.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; import android.util.Log; -import com.yizhuan.xchat_android_library.models.puzzle.straight.StraightPuzzleLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.straight.StraightPuzzleLayout; /** diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/OneStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java similarity index 86% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/OneStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java index 05edd3fef..89d264428 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/OneStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/OneStraightLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SevenStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java similarity index 94% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SevenStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java index 20ec11202..d0792b560 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SevenStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SevenStraightLayout.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SixStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SixStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java index 6dcd26e29..b37af498a 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/SixStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/SixStraightLayout.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/StraightLayoutHelper.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/StraightLayoutHelper.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java index 79bd8cd69..f16a52e04 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/StraightLayoutHelper.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/StraightLayoutHelper.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/ThreeStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java similarity index 89% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/ThreeStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java index 433bdae8e..d75dcdf8b 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/ThreeStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/ThreeStraightLayout.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** * @author wupanjie diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/TwoStraightLayout.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java similarity index 89% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/TwoStraightLayout.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java index cd9cdf0c1..6f74be7f9 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/puzzle/template/straight/TwoStraightLayout.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/puzzle/template/straight/TwoStraightLayout.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_library.models.puzzle.template.straight; +package com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight; import android.util.Log; -import com.yizhuan.xchat_android_library.models.puzzle.Line; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Line; /** diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/StickerModel.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/StickerModel.java similarity index 89% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/StickerModel.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/StickerModel.java index c78f1cbb0..5ffd21baf 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/StickerModel.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/StickerModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.sticker; +package com.yizhuan.xchat_android_library.easyphoto.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.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 com.yizhuan.xchat_android_library.easyphoto.EasyPhotos; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.cache.StickerCache; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity.TextStickerData; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.view.BitmapSticker; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.view.EditFragment; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.view.TextSticker; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener.OnStickerClickListener; +import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.BitmapUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.SaveBitmapCallBack; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/cache/StickerCache.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/cache/StickerCache.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/cache/StickerCache.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/cache/StickerCache.java index 7a10c9bd6..d0c875a52 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/cache/StickerCache.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/cache/StickerCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.sticker.cache; +package com.yizhuan.xchat_android_library.easyphoto.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.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos; import java.util.LinkedHashMap; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/entity/TextStickerData.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/entity/TextStickerData.java similarity index 94% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/entity/TextStickerData.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/entity/TextStickerData.java index 03eaba4ae..078f04f73 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/entity/TextStickerData.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/entity/TextStickerData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.sticker.entity; +package com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/listener/OnStickerClickListener.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/listener/OnStickerClickListener.java similarity index 71% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/listener/OnStickerClickListener.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/listener/OnStickerClickListener.java index b6b208311..aa0f81f90 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/listener/OnStickerClickListener.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/listener/OnStickerClickListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.sticker.listener; +package com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener; /** * 贴纸的点击监听 diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/BitmapSticker.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/BitmapSticker.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/BitmapSticker.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/BitmapSticker.java index eb47fad08..948371396 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/BitmapSticker.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/BitmapSticker.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.sticker.view; +package com.yizhuan.xchat_android_library.easyphoto.models.sticker.view; import android.content.Context; import android.graphics.Bitmap; @@ -18,8 +18,8 @@ import android.view.View; import androidx.core.content.ContextCompat; 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; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.cache.StickerCache; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener.OnStickerClickListener; /** diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/EditFragment.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/EditFragment.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/EditFragment.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/EditFragment.java index 925aa9fba..d1a55838e 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/EditFragment.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/EditFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.sticker.view; +package com.yizhuan.xchat_android_library.easyphoto.models.sticker.view; import android.content.Context; import android.graphics.drawable.ColorDrawable; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/TextSticker.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/TextSticker.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/TextSticker.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/TextSticker.java index 199bb9d60..364446592 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/models/sticker/view/TextSticker.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/models/sticker/view/TextSticker.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.models.sticker.view; +package com.yizhuan.xchat_android_library.easyphoto.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.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos; import com.yizhuan.xchat_android_library.R; -import com.yizhuan.xchat_android_library.models.sticker.listener.OnStickerClickListener; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.listener.OnStickerClickListener; /** diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/result/Result.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/result/Result.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/result/Result.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/result/Result.java index e7f71107b..c7d2307c5 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/result/Result.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/result/Result.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_library.result; +package com.yizhuan.xchat_android_library.easyphoto.result; import android.net.Uri; -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.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/setting/Setting.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/setting/Setting.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/setting/Setting.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/setting/Setting.java index 9fe605745..1203eb5d5 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/setting/Setting.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/setting/Setting.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_library.setting; +package com.yizhuan.xchat_android_library.easyphoto.setting; import android.view.View; import androidx.annotation.IntDef; -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 com.yizhuan.xchat_android_library.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/EasyPhotosActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java similarity index 96% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/EasyPhotosActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java index 1367e8ee4..3060c81e1 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/EasyPhotosActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/EasyPhotosActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui; +package com.yizhuan.xchat_android_library.easyphoto.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.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.easyphoto.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 com.yizhuan.xchat_android_library.easyphoto.constant.Code; +import com.yizhuan.xchat_android_library.easyphoto.constant.Key; +import com.yizhuan.xchat_android_library.easyphoto.result.Result; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.AlbumItemsAdapter; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PhotosAdapter; +import com.yizhuan.xchat_android_library.easyphoto.ui.dialog.LoadingDialog; +import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedTextView; +import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdListener; +import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.utils.color.ColorUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.MediaScannerConnectionUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.permission.PermissionUtil; +import com.yizhuan.xchat_android_library.easyphoto.utils.settings.SettingsUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.string.StringUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.system.SystemUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils; import java.io.File; import java.io.IOException; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewActivity.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewActivity.java index 35cc354bf..84c72213c 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui; +package com.yizhuan.xchat_android_library.easyphoto.ui; import android.app.Activity; import android.content.Intent; @@ -27,16 +27,16 @@ import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; 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 com.yizhuan.xchat_android_library.easyphoto.constant.Code; +import com.yizhuan.xchat_android_library.easyphoto.constant.Key; +import com.yizhuan.xchat_android_library.easyphoto.result.Result; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PreviewPhotosAdapter; +import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedTextView; +import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.utils.color.ColorUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.system.SystemUtils; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewFragment.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewFragment.java similarity index 93% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewFragment.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewFragment.java index 4d7336c91..15d4573c1 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PreviewFragment.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PreviewFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui; +package com.yizhuan.xchat_android_library.easyphoto.ui; import android.content.Context; import android.os.Bundle; @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.yizhuan.xchat_android_library.R; -import com.yizhuan.xchat_android_library.ui.adapter.PreviewPhotosFragmentAdapter; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PreviewPhotosFragmentAdapter; public class PreviewFragment extends Fragment implements PreviewPhotosFragmentAdapter.OnClickListener { diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleActivity.java similarity index 94% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleActivity.java index 3564c8b91..4a14d1033 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui; +package com.yizhuan.xchat_android_library.easyphoto.ui; import android.Manifest; import android.app.Activity; @@ -26,27 +26,27 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; -import com.yizhuan.xchat_android_library.EasyPhotos; +import com.yizhuan.xchat_android_library.easyphoto.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 com.yizhuan.xchat_android_library.easyphoto.constant.Code; +import com.yizhuan.xchat_android_library.easyphoto.constant.Key; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.StickerModel; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PuzzleAdapter; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.TextStickerAdapter; +import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.Area; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.DegreeSeekBar; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzlePiece; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleUtils; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleView; +import com.yizhuan.xchat_android_library.easyphoto.utils.bitmap.SaveBitmapCallBack; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.permission.PermissionUtil; +import com.yizhuan.xchat_android_library.easyphoto.utils.settings.SettingsUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils; import java.io.File; import java.io.IOException; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleSelectorActivity.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleSelectorActivity.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleSelectorActivity.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleSelectorActivity.java index 50b184f78..7714f6e8c 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/PuzzleSelectorActivity.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/PuzzleSelectorActivity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui; +package com.yizhuan.xchat_android_library.easyphoto.ui; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -25,16 +25,16 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; 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 com.yizhuan.xchat_android_library.easyphoto.constant.Code; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.AlbumItemsAdapter; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PuzzleSelectorAdapter; +import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedTextView; +import com.yizhuan.xchat_android_library.easyphoto.models.album.AlbumModel; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.ui.adapter.PuzzleSelectorPreviewAdapter; +import com.yizhuan.xchat_android_library.easyphoto.utils.color.ColorUtils; +import com.yizhuan.xchat_android_library.easyphoto.utils.system.SystemUtils; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/AlbumItemsAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/AlbumItemsAdapter.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/AlbumItemsAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/AlbumItemsAdapter.java index 413c75641..d8128aca8 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/AlbumItemsAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/AlbumItemsAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.ui.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -12,9 +12,9 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.recyclerview.widget.RecyclerView; 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 com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdViewHolder; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.AlbumItem; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PhotosAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PhotosAdapter.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PhotosAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PhotosAdapter.java index 40ffd01b5..6b59632c5 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PhotosAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PhotosAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.ui.adapter; import android.content.Context; import android.net.Uri; @@ -14,13 +14,13 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; 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 com.yizhuan.xchat_android_library.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.result.Result; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedImageView; +import com.yizhuan.xchat_android_library.easyphoto.models.ad.AdViewHolder; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosAdapter.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosAdapter.java index b8f1224a0..cc46bf53c 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.ui.adapter; import android.content.Context; import android.content.Intent; @@ -18,9 +18,9 @@ import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView; import com.github.chrisbanes.photoview.OnScaleChangedListener; import com.github.chrisbanes.photoview.PhotoView; 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.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosFragmentAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java similarity index 88% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosFragmentAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java index c8dd5b3cf..5b91d8f58 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PreviewPhotosFragmentAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PreviewPhotosFragmentAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.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.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; +import com.yizhuan.xchat_android_library.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.result.Result; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedImageView; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils; /** * 预览所有选中图片集合的适配器 diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleAdapter.java similarity index 88% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleAdapter.java index a094ce64b..63292f734 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.ui.adapter; import android.view.LayoutInflater; import android.view.View; @@ -7,10 +7,10 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; 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 com.yizhuan.xchat_android_library.easyphoto.models.puzzle.PuzzleLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.SquarePuzzleView; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.slant.NumberSlantLayout; +import com.yizhuan.xchat_android_library.easyphoto.models.puzzle.template.straight.NumberStraightLayout; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java similarity index 89% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java index f92e073eb..529c05fe6 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.ui.adapter; import android.content.Context; import android.net.Uri; @@ -11,10 +11,10 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; 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 com.yizhuan.xchat_android_library.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorPreviewAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java similarity index 90% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorPreviewAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java index 3bd2a1647..dbe20edc8 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/PuzzleSelectorPreviewAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/PuzzleSelectorPreviewAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.ui.adapter; import android.content.Context; import android.net.Uri; @@ -11,10 +11,10 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; 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 com.yizhuan.xchat_android_library.easyphoto.constant.Type; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; +import com.yizhuan.xchat_android_library.easyphoto.utils.media.DurationUtils; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/TextStickerAdapter.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/TextStickerAdapter.java similarity index 91% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/TextStickerAdapter.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/TextStickerAdapter.java index 29a618040..cbde770ca 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/adapter/TextStickerAdapter.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/adapter/TextStickerAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.adapter; +package com.yizhuan.xchat_android_library.easyphoto.ui.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -9,8 +9,8 @@ import android.widget.TextView; import androidx.recyclerview.widget.RecyclerView; 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 com.yizhuan.xchat_android_library.easyphoto.models.sticker.StickerModel; +import com.yizhuan.xchat_android_library.easyphoto.models.sticker.entity.TextStickerData; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/dialog/LoadingDialog.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/dialog/LoadingDialog.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/dialog/LoadingDialog.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/dialog/LoadingDialog.java index 579afe11d..bc8a376f3 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/dialog/LoadingDialog.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/dialog/LoadingDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.dialog; +package com.yizhuan.xchat_android_library.easyphoto.ui.dialog; import android.app.Dialog; import android.content.Context; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedImageView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedImageView.java similarity index 94% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedImageView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedImageView.java index b9119b7d6..bdf94c8a0 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedImageView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedImageView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.widget; +package com.yizhuan.xchat_android_library.easyphoto.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedTextView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedTextView.java similarity index 97% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedTextView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedTextView.java index d64f7a4ab..90d8412f2 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PressedTextView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PressedTextView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.widget; +package com.yizhuan.xchat_android_library.easyphoto.ui.widget; import android.animation.AnimatorSet; import android.animation.ObjectAnimator; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PreviewRecyclerView.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PreviewRecyclerView.java similarity index 96% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PreviewRecyclerView.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PreviewRecyclerView.java index 78423e561..92866b220 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/ui/widget/PreviewRecyclerView.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/ui/widget/PreviewRecyclerView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.ui.widget; +package com.yizhuan.xchat_android_library.easyphoto.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/BitmapUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/BitmapUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java index bebf8c6e3..261328c1c 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/BitmapUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.bitmap; +package com.yizhuan.xchat_android_library.easyphoto.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.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 com.yizhuan.xchat_android_library.easyphoto.EasyPhotos; +import com.yizhuan.xchat_android_library.easyphoto.utils.uri.UriUtils; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; import java.io.File; import java.io.FileOutputStream; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/SaveBitmapCallBack.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/SaveBitmapCallBack.java similarity index 80% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/SaveBitmapCallBack.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/SaveBitmapCallBack.java index 3b32dc1b5..2b1c12d98 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/bitmap/SaveBitmapCallBack.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/bitmap/SaveBitmapCallBack.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.bitmap; +package com.yizhuan.xchat_android_library.easyphoto.utils.bitmap; import java.io.File; import java.io.IOException; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/color/ColorUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/color/ColorUtils.java similarity index 91% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/color/ColorUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/color/ColorUtils.java index 25ffb090d..ca3a57358 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/color/ColorUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/color/ColorUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.color; +package com.yizhuan.xchat_android_library.easyphoto.utils.color; /** * Created by huan on 2018/1/9. diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/DurationUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/DurationUtils.java similarity index 94% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/DurationUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/DurationUtils.java index 6e4390849..a2ec489df 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/DurationUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/DurationUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.media; +package com.yizhuan.xchat_android_library.easyphoto.utils.media; import android.media.MediaMetadataRetriever; import android.text.format.DateUtils; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/MediaScannerConnectionUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/MediaScannerConnectionUtils.java similarity index 92% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/MediaScannerConnectionUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/MediaScannerConnectionUtils.java index 194075476..406af4405 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/media/MediaScannerConnectionUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/media/MediaScannerConnectionUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.media; +package com.yizhuan.xchat_android_library.easyphoto.utils.media; import android.content.Context; import android.media.MediaScannerConnection; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/permission/PermissionUtil.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/permission/PermissionUtil.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/permission/PermissionUtil.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/permission/PermissionUtil.java index cb3fd50e3..1fbf7eff5 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/permission/PermissionUtil.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/permission/PermissionUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.permission; +package com.yizhuan.xchat_android_library.easyphoto.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.yizhuan.xchat_android_library.constant.Code; +import com.yizhuan.xchat_android_library.easyphoto.constant.Code; import java.util.ArrayList; import java.util.List; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/EasyResult.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/EasyResult.java similarity index 95% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/EasyResult.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/EasyResult.java index e92acd692..d314c73ef 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/EasyResult.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/EasyResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.result; +package com.yizhuan.xchat_android_library.easyphoto.utils.result; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/HolderFragment.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/HolderFragment.java similarity index 83% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/HolderFragment.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/HolderFragment.java index 239d8f587..dac78921e 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/result/HolderFragment.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/result/HolderFragment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.result; +package com.yizhuan.xchat_android_library.easyphoto.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.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 com.yizhuan.xchat_android_library.easyphoto.EasyPhotos; +import com.yizhuan.xchat_android_library.easyphoto.callback.PuzzleCallback; +import com.yizhuan.xchat_android_library.easyphoto.callback.SelectCallback; +import com.yizhuan.xchat_android_library.easyphoto.ui.EasyPhotosActivity; +import com.yizhuan.xchat_android_library.easyphoto.ui.PuzzleActivity; +import com.yizhuan.xchat_android_library.easyphoto.engine.ImageEngine; +import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo; import java.util.ArrayList; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/settings/SettingsUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/settings/SettingsUtils.java similarity index 83% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/settings/SettingsUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/settings/SettingsUtils.java index 1eeaae342..8f0a4bed4 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/settings/SettingsUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/settings/SettingsUtils.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_library.utils.settings; +package com.yizhuan.xchat_android_library.easyphoto.utils.settings; import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.provider.Settings; -import com.yizhuan.xchat_android_library.constant.Code; +import com.yizhuan.xchat_android_library.easyphoto.constant.Code; /** * 系统设置界面启动器 diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/string/StringUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/string/StringUtils.java similarity index 86% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/string/StringUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/string/StringUtils.java index adc88c811..4efad9c46 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/string/StringUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/string/StringUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.string; +package com.yizhuan.xchat_android_library.easyphoto.utils.string; /** * 字符串工具类 diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/MeiZuStatusUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/MeiZuStatusUtils.java similarity index 99% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/MeiZuStatusUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/MeiZuStatusUtils.java index e079696d1..4e92afd4e 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/MeiZuStatusUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/MeiZuStatusUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.system; +package com.yizhuan.xchat_android_library.easyphoto.utils.system; import android.app.Activity; import android.os.Build; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/SystemUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/SystemUtils.java similarity index 99% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/SystemUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/SystemUtils.java index 62e06edbb..e5b673220 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/system/SystemUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/system/SystemUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.system; +package com.yizhuan.xchat_android_library.easyphoto.utils.system; import android.app.Activity; import android.content.Context; diff --git a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/uri/UriUtils.java b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/uri/UriUtils.java similarity index 98% rename from library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/uri/UriUtils.java rename to library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/uri/UriUtils.java index 3b425aabc..9e21d9b60 100644 --- a/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/utils/uri/UriUtils.java +++ b/library/src/module_easyphoto/java/com/yizhuan/xchat_android_library/easyphoto/utils/uri/UriUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_library.utils.uri; +package com.yizhuan.xchat_android_library.easyphoto.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.yizhuan.xchat_android_library.setting.Setting; +import com.yizhuan.xchat_android_library.easyphoto.setting.Setting; import java.io.File; import java.util.Locale; diff --git a/library/src/module_easyphoto/res/layout/activity_easy_photos.xml b/library/src/module_easyphoto/res/layout/activity_easy_photos.xml index 0967a8eeb..0c6d0b475 100644 --- a/library/src/module_easyphoto/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.yizhuan.xchat_android_library.ui.EasyPhotosActivity"> + tools:context="com.yizhuan.xchat_android_library.easyphoto.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.easyphoto.ui.PuzzleSelectorActivity"> - - - + tools:context="com.yizhuan.xchat_android_library.easyphoto.ui.PreviewFragment"> - - diff --git a/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml b/library/src/module_easyphoto/res/layout/item_rv_photos_easy_photos.xml index ede2e6c3c..e0157ba76 100644 --- a/library/src/module_easyphoto/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"> -