element-hq · bmarty · Feb 22, 2022 · Feb 22, 2022 · Feb 22, 2022 · Feb 22, 2022
diff --git 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
@@ -0,0 +1 @@
+Moves attachment-viewer, diff-match-patch, and multipicker modules to subfolders under library
diff --git a/attachment-viewer/.gitignore → library/attachment-viewer/.gitignore b/attachment-viewer/.gitignore → library/attachment-viewer/.gitignore
diff --git a/attachment-viewer/build.gradle → library/attachment-viewer/build.gradle b/attachment-viewer/build.gradle → library/attachment-viewer/build.gradle
diff --git a/attachment-viewer/consumer-rules.pro → library/attachment-viewer/consumer-rules.pro b/attachment-viewer/consumer-rules.pro → library/attachment-viewer/consumer-rules.pro
diff --git a/attachment-viewer/proguard-rules.pro → library/attachment-viewer/proguard-rules.pro b/attachment-viewer/proguard-rules.pro → library/attachment-viewer/proguard-rules.pro
diff --git a/...hment-viewer/src/main/AndroidManifest.xml → ...hment-viewer/src/main/AndroidManifest.xml b/...hment-viewer/src/main/AndroidManifest.xml → ...hment-viewer/src/main/AndroidManifest.xml
diff --git a/...tachmentviewer/AnimatedImageViewHolder.kt → ...tachmentviewer/AnimatedImageViewHolder.kt b/...tachmentviewer/AnimatedImageViewHolder.kt → ...tachmentviewer/AnimatedImageViewHolder.kt
diff --git a/.../lib/attachmentviewer/AttachmentEvents.kt → .../lib/attachmentviewer/AttachmentEvents.kt b/.../lib/attachmentviewer/AttachmentEvents.kt → .../lib/attachmentviewer/AttachmentEvents.kt
diff --git a/...achmentviewer/AttachmentSourceProvider.kt → ...achmentviewer/AttachmentSourceProvider.kt b/...achmentviewer/AttachmentSourceProvider.kt → ...achmentviewer/AttachmentSourceProvider.kt
diff --git a/...achmentviewer/AttachmentViewerActivity.kt → ...achmentviewer/AttachmentViewerActivity.kt b/...achmentviewer/AttachmentViewerActivity.kt → ...achmentviewer/AttachmentViewerActivity.kt
diff --git a/...ib/attachmentviewer/AttachmentsAdapter.kt → ...ib/attachmentviewer/AttachmentsAdapter.kt b/...ib/attachmentviewer/AttachmentsAdapter.kt → ...ib/attachmentviewer/AttachmentsAdapter.kt
diff --git a/...or/lib/attachmentviewer/BaseViewHolder.kt → ...or/lib/attachmentviewer/BaseViewHolder.kt b/...or/lib/attachmentviewer/BaseViewHolder.kt → ...or/lib/attachmentviewer/BaseViewHolder.kt
diff --git a/...lib/attachmentviewer/ImageLoaderTarget.kt → ...lib/attachmentviewer/ImageLoaderTarget.kt b/...lib/attachmentviewer/ImageLoaderTarget.kt → ...lib/attachmentviewer/ImageLoaderTarget.kt
diff --git a/...or/lib/attachmentviewer/SwipeDirection.kt → ...or/lib/attachmentviewer/SwipeDirection.kt b/...or/lib/attachmentviewer/SwipeDirection.kt → ...or/lib/attachmentviewer/SwipeDirection.kt
diff --git a/...ttachmentviewer/SwipeDirectionDetector.kt → ...ttachmentviewer/SwipeDirectionDetector.kt b/...ttachmentviewer/SwipeDirectionDetector.kt → ...ttachmentviewer/SwipeDirectionDetector.kt
diff --git a/...attachmentviewer/SwipeToDismissHandler.kt → ...attachmentviewer/SwipeToDismissHandler.kt b/...attachmentviewer/SwipeToDismissHandler.kt → ...attachmentviewer/SwipeToDismissHandler.kt
diff --git a/...lib/attachmentviewer/VideoLoaderTarget.kt → ...lib/attachmentviewer/VideoLoaderTarget.kt b/...lib/attachmentviewer/VideoLoaderTarget.kt → ...lib/attachmentviewer/VideoLoaderTarget.kt
diff --git a/...r/lib/attachmentviewer/VideoViewHolder.kt → ...r/lib/attachmentviewer/VideoViewHolder.kt b/...r/lib/attachmentviewer/VideoViewHolder.kt → ...r/lib/attachmentviewer/VideoViewHolder.kt
diff --git a/...tachmentviewer/ZoomableImageViewHolder.kt → ...tachmentviewer/ZoomableImageViewHolder.kt b/...tachmentviewer/ZoomableImageViewHolder.kt → ...tachmentviewer/ZoomableImageViewHolder.kt
diff --git a/...res/layout/activity_attachment_viewer.xml → ...res/layout/activity_attachment_viewer.xml b/...res/layout/activity_attachment_viewer.xml → ...res/layout/activity_attachment_viewer.xml
diff --git a/...layout/item_animated_image_attachment.xml → ...layout/item_animated_image_attachment.xml b/...layout/item_animated_image_attachment.xml → ...layout/item_animated_image_attachment.xml
diff --git a/...main/res/layout/item_image_attachment.xml → ...main/res/layout/item_image_attachment.xml b/...main/res/layout/item_image_attachment.xml → ...main/res/layout/item_image_attachment.xml
diff --git a/...main/res/layout/item_video_attachment.xml → ...main/res/layout/item_video_attachment.xml b/...main/res/layout/item_video_attachment.xml → ...main/res/layout/item_video_attachment.xml
diff --git a/...nt-viewer/src/main/res/values/strings.xml → ...nt-viewer/src/main/res/values/strings.xml b/...nt-viewer/src/main/res/values/strings.xml → ...nt-viewer/src/main/res/values/strings.xml
diff --git a/diff-match-patch/.gitignore → library/diff-match-patch/.gitignore b/diff-match-patch/.gitignore → library/diff-match-patch/.gitignore
diff --git a/diff-match-patch/build.gradle → library/diff-match-patch/build.gradle b/diff-match-patch/build.gradle → library/diff-match-patch/build.gradle
diff --git a/...aser/neil/plaintext/diff_match_patch.java → ...aser/neil/plaintext/diff_match_patch.java b/...aser/neil/plaintext/diff_match_patch.java → ...aser/neil/plaintext/diff_match_patch.java
diff --git a/multipicker/.gitignore → library/multipicker/.gitignore b/multipicker/.gitignore → library/multipicker/.gitignore
diff --git a/multipicker/build.gradle → library/multipicker/build.gradle b/multipicker/build.gradle → library/multipicker/build.gradle
diff --git a/multipicker/consumer-rules.pro → library/multipicker/consumer-rules.pro b/multipicker/consumer-rules.pro → library/multipicker/consumer-rules.pro
diff --git a/multipicker/proguard-rules.pro → library/multipicker/proguard-rules.pro b/multipicker/proguard-rules.pro → library/multipicker/proguard-rules.pro
diff --git a/multipicker/src/main/AndroidManifest.xml → .../multipicker/src/main/AndroidManifest.xml b/multipicker/src/main/AndroidManifest.xml → .../multipicker/src/main/AndroidManifest.xml
diff --git a/.../im/vector/lib/multipicker/AudioPicker.kt → .../im/vector/lib/multipicker/AudioPicker.kt b/.../im/vector/lib/multipicker/AudioPicker.kt → .../im/vector/lib/multipicker/AudioPicker.kt
diff --git a/...im/vector/lib/multipicker/CameraPicker.kt → ...im/vector/lib/multipicker/CameraPicker.kt b/...im/vector/lib/multipicker/CameraPicker.kt → ...im/vector/lib/multipicker/CameraPicker.kt
diff --git a/...ctor/lib/multipicker/CameraVideoPicker.kt → ...ctor/lib/multipicker/CameraVideoPicker.kt b/...ctor/lib/multipicker/CameraVideoPicker.kt → ...ctor/lib/multipicker/CameraVideoPicker.kt
diff --git a/...m/vector/lib/multipicker/ContactPicker.kt → ...m/vector/lib/multipicker/ContactPicker.kt b/...m/vector/lib/multipicker/ContactPicker.kt → ...m/vector/lib/multipicker/ContactPicker.kt
diff --git a/...a/im/vector/lib/multipicker/FilePicker.kt → ...a/im/vector/lib/multipicker/FilePicker.kt b/...a/im/vector/lib/multipicker/FilePicker.kt → ...a/im/vector/lib/multipicker/FilePicker.kt
diff --git a/.../im/vector/lib/multipicker/ImagePicker.kt → .../im/vector/lib/multipicker/ImagePicker.kt b/.../im/vector/lib/multipicker/ImagePicker.kt → .../im/vector/lib/multipicker/ImagePicker.kt
diff --git a/.../im/vector/lib/multipicker/MediaPicker.kt → .../im/vector/lib/multipicker/MediaPicker.kt b/.../im/vector/lib/multipicker/MediaPicker.kt → .../im/vector/lib/multipicker/MediaPicker.kt
diff --git a/.../im/vector/lib/multipicker/MultiPicker.kt → .../im/vector/lib/multipicker/MultiPicker.kt b/.../im/vector/lib/multipicker/MultiPicker.kt → .../im/vector/lib/multipicker/MultiPicker.kt
diff --git a/.../java/im/vector/lib/multipicker/Picker.kt → .../java/im/vector/lib/multipicker/Picker.kt b/.../java/im/vector/lib/multipicker/Picker.kt → .../java/im/vector/lib/multipicker/Picker.kt
diff --git a/.../im/vector/lib/multipicker/VideoPicker.kt → .../im/vector/lib/multipicker/VideoPicker.kt b/.../im/vector/lib/multipicker/VideoPicker.kt → .../im/vector/lib/multipicker/VideoPicker.kt
diff --git a/...ultipicker/entity/MultiPickerAudioType.kt → ...ultipicker/entity/MultiPickerAudioType.kt b/...ultipicker/entity/MultiPickerAudioType.kt → ...ultipicker/entity/MultiPickerAudioType.kt
diff --git a/...picker/entity/MultiPickerBaseMediaType.kt → ...picker/entity/MultiPickerBaseMediaType.kt b/...picker/entity/MultiPickerBaseMediaType.kt → ...picker/entity/MultiPickerBaseMediaType.kt
diff --git a/...multipicker/entity/MultiPickerBaseType.kt → ...multipicker/entity/MultiPickerBaseType.kt b/...multipicker/entity/MultiPickerBaseType.kt → ...multipicker/entity/MultiPickerBaseType.kt
diff --git a/...tipicker/entity/MultiPickerContactType.kt → ...tipicker/entity/MultiPickerContactType.kt b/...tipicker/entity/MultiPickerContactType.kt → ...tipicker/entity/MultiPickerContactType.kt
diff --git a/...multipicker/entity/MultiPickerFileType.kt → ...multipicker/entity/MultiPickerFileType.kt b/...multipicker/entity/MultiPickerFileType.kt → ...multipicker/entity/MultiPickerFileType.kt
diff --git a/...ultipicker/entity/MultiPickerImageType.kt → ...ultipicker/entity/MultiPickerImageType.kt b/...ultipicker/entity/MultiPickerImageType.kt → ...ultipicker/entity/MultiPickerImageType.kt
diff --git a/...ultipicker/entity/MultiPickerVideoType.kt → ...ultipicker/entity/MultiPickerVideoType.kt b/...ultipicker/entity/MultiPickerVideoType.kt → ...ultipicker/entity/MultiPickerVideoType.kt
diff --git a/...icker/provider/MultiPickerFileProvider.kt → ...icker/provider/MultiPickerFileProvider.kt b/...icker/provider/MultiPickerFileProvider.kt → ...icker/provider/MultiPickerFileProvider.kt
diff --git a/.../multipicker/utils/ContentResolverUtil.kt → .../multipicker/utils/ContentResolverUtil.kt b/.../multipicker/utils/ContentResolverUtil.kt → .../multipicker/utils/ContentResolverUtil.kt
diff --git a/...lib/multipicker/utils/CursorExtensions.kt → ...lib/multipicker/utils/CursorExtensions.kt b/...lib/multipicker/utils/CursorExtensions.kt → ...lib/multipicker/utils/CursorExtensions.kt
diff --git a/...ector/lib/multipicker/utils/ImageUtils.kt → ...ector/lib/multipicker/utils/ImageUtils.kt b/...ector/lib/multipicker/utils/ImageUtils.kt → ...ector/lib/multipicker/utils/ImageUtils.kt
diff --git a/...tor/lib/multipicker/utils/MimeTypeUtil.kt → ...tor/lib/multipicker/utils/MimeTypeUtil.kt b/...tor/lib/multipicker/utils/MimeTypeUtil.kt → ...tor/lib/multipicker/utils/MimeTypeUtil.kt
diff --git a/...in/res/xml/multipicker_provider_paths.xml → ...in/res/xml/multipicker_provider_paths.xml b/...in/res/xml/multipicker_provider_paths.xml → ...in/res/xml/multipicker_provider_paths.xml
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Moves attachment-viewer, diff-match-patch, and multipicker modules to subfolders under library