diff --git a/build.gradle b/build.gradle index 2ac948f0a9..1bacc84d46 100644 --- a/build.gradle +++ b/build.gradle @@ -138,7 +138,7 @@ project(":vector") { } } -project(":diff-match-patch") { +project(":library:diff-match-patch") { sonarqube { skipProject = true } diff --git a/changelog.d/5309.misc b/changelog.d/5309.misc new file mode 100644 index 0000000000..83771995af --- /dev/null +++ b/changelog.d/5309.misc @@ -0,0 +1 @@ +Moves attachment-viewer, diff-match-patch, and multipicker modules to subfolders under library \ No newline at end of file diff --git a/attachment-viewer/.gitignore b/library/attachment-viewer/.gitignore similarity index 100% rename from attachment-viewer/.gitignore rename to library/attachment-viewer/.gitignore diff --git a/attachment-viewer/build.gradle b/library/attachment-viewer/build.gradle similarity index 100% rename from attachment-viewer/build.gradle rename to library/attachment-viewer/build.gradle diff --git a/attachment-viewer/consumer-rules.pro b/library/attachment-viewer/consumer-rules.pro similarity index 100% rename from attachment-viewer/consumer-rules.pro rename to library/attachment-viewer/consumer-rules.pro diff --git a/attachment-viewer/proguard-rules.pro b/library/attachment-viewer/proguard-rules.pro similarity index 100% rename from attachment-viewer/proguard-rules.pro rename to library/attachment-viewer/proguard-rules.pro diff --git a/attachment-viewer/src/main/AndroidManifest.xml b/library/attachment-viewer/src/main/AndroidManifest.xml similarity index 100% rename from attachment-viewer/src/main/AndroidManifest.xml rename to library/attachment-viewer/src/main/AndroidManifest.xml diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt b/library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt similarity index 100% rename from attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt rename to library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt diff --git a/attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml b/library/attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml similarity index 100% rename from attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml rename to library/attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml diff --git a/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml b/library/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml similarity index 100% rename from attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml rename to library/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml diff --git a/attachment-viewer/src/main/res/layout/item_image_attachment.xml b/library/attachment-viewer/src/main/res/layout/item_image_attachment.xml similarity index 100% rename from attachment-viewer/src/main/res/layout/item_image_attachment.xml rename to library/attachment-viewer/src/main/res/layout/item_image_attachment.xml diff --git a/attachment-viewer/src/main/res/layout/item_video_attachment.xml b/library/attachment-viewer/src/main/res/layout/item_video_attachment.xml similarity index 100% rename from attachment-viewer/src/main/res/layout/item_video_attachment.xml rename to library/attachment-viewer/src/main/res/layout/item_video_attachment.xml diff --git a/attachment-viewer/src/main/res/values/strings.xml b/library/attachment-viewer/src/main/res/values/strings.xml similarity index 100% rename from attachment-viewer/src/main/res/values/strings.xml rename to library/attachment-viewer/src/main/res/values/strings.xml diff --git a/diff-match-patch/.gitignore b/library/diff-match-patch/.gitignore similarity index 100% rename from diff-match-patch/.gitignore rename to library/diff-match-patch/.gitignore diff --git a/diff-match-patch/build.gradle b/library/diff-match-patch/build.gradle similarity index 100% rename from diff-match-patch/build.gradle rename to library/diff-match-patch/build.gradle diff --git a/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java b/library/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java similarity index 100% rename from diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java rename to library/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java diff --git a/multipicker/.gitignore b/library/multipicker/.gitignore similarity index 100% rename from multipicker/.gitignore rename to library/multipicker/.gitignore diff --git a/multipicker/build.gradle b/library/multipicker/build.gradle similarity index 100% rename from multipicker/build.gradle rename to library/multipicker/build.gradle diff --git a/multipicker/consumer-rules.pro b/library/multipicker/consumer-rules.pro similarity index 100% rename from multipicker/consumer-rules.pro rename to library/multipicker/consumer-rules.pro diff --git a/multipicker/proguard-rules.pro b/library/multipicker/proguard-rules.pro similarity index 100% rename from multipicker/proguard-rules.pro rename to library/multipicker/proguard-rules.pro diff --git a/multipicker/src/main/AndroidManifest.xml b/library/multipicker/src/main/AndroidManifest.xml similarity index 100% rename from multipicker/src/main/AndroidManifest.xml rename to library/multipicker/src/main/AndroidManifest.xml diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/CursorExtensions.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/CursorExtensions.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/utils/CursorExtensions.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/utils/CursorExtensions.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt diff --git a/multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt similarity index 100% rename from multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt rename to library/multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt diff --git a/multipicker/src/main/res/xml/multipicker_provider_paths.xml b/library/multipicker/src/main/res/xml/multipicker_provider_paths.xml similarity index 100% rename from multipicker/src/main/res/xml/multipicker_provider_paths.xml rename to library/multipicker/src/main/res/xml/multipicker_provider_paths.xml diff --git a/settings.gradle b/settings.gradle index d3b217c517..fe97b4096b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ include ':vector' include ':matrix-sdk-android' -include ':diff-match-patch' -include ':attachment-viewer' -include ':multipicker' include ':library:core-utils' include ':library:ui-styles' include ':library:jsonviewer' +include ':library:attachment-viewer' +include ':library:diff-match-patch' +include ':library:multipicker' include ':matrix-sdk-android-flow' diff --git a/vector/build.gradle b/vector/build.gradle index dd41c0e2c4..613deeb87d 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -335,12 +335,12 @@ dependencies { implementation project(":matrix-sdk-android") implementation project(":matrix-sdk-android-flow") - implementation project(":diff-match-patch") - implementation project(":multipicker") - implementation project(":attachment-viewer") implementation project(":library:jsonviewer") implementation project(":library:ui-styles") implementation project(":library:core-utils") + implementation project(":library:attachment-viewer") + implementation project(":library:diff-match-patch") + implementation project(":library:multipicker") implementation 'androidx.multidex:multidex:2.0.1' implementation libs.jetbrains.coroutinesCore