rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5309 from vector-im/feature/eric/modules-to-subfolder

Browse Source 
#5289:  Moves modules to subfolders under library
This commit is contained in:
Benoit Marty 2022-02-22 22:58:14 +01:00 committed by GitHub
commit 924a4f8c94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
58 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -138,7 +138,7 @@ project(":vector") {
} }
} }
project(":diff-match-patch") { project(":library:diff-match-patch") {
sonarqube { sonarqube {
skipProject = true skipProject = true
} }

1
changelog.d/5309.misc Normal file
View File

@ -0,0 +1 @@
Moves attachment-viewer, diff-match-patch, and multipicker modules to subfolders under library

0
attachment-viewer/.gitignore → library/attachment-viewer/.gitignore vendored
View File

0
attachment-viewer/build.gradle → library/attachment-viewer/build.gradle
View File

0
attachment-viewer/consumer-rules.pro → library/attachment-viewer/consumer-rules.pro
View File

0
attachment-viewer/proguard-rules.pro → library/attachment-viewer/proguard-rules.pro vendored
View File

0
attachment-viewer/src/main/AndroidManifest.xml → library/attachment-viewer/src/main/AndroidManifest.xml
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentEvents.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentSourceProvider.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/BaseViewHolder.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt
View File

0
attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt → library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt
View File

0
attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml → library/attachment-viewer/src/main/res/layout/activity_attachment_viewer.xml
View File

0
attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml → library/attachment-viewer/src/main/res/layout/item_animated_image_attachment.xml
View File

0
attachment-viewer/src/main/res/layout/item_image_attachment.xml → library/attachment-viewer/src/main/res/layout/item_image_attachment.xml
View File

0
attachment-viewer/src/main/res/layout/item_video_attachment.xml → library/attachment-viewer/src/main/res/layout/item_video_attachment.xml
View File

0
attachment-viewer/src/main/res/values/strings.xml → library/attachment-viewer/src/main/res/values/strings.xml
View File

0
diff-match-patch/.gitignore → library/diff-match-patch/.gitignore vendored
View File

0
diff-match-patch/build.gradle → library/diff-match-patch/build.gradle
View File

0
diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java → library/diff-match-patch/src/main/java/name/fraser/neil/plaintext/diff_match_patch.java
View File

0
multipicker/.gitignore → library/multipicker/.gitignore vendored
View File

0
multipicker/build.gradle → library/multipicker/build.gradle
View File

0
multipicker/consumer-rules.pro → library/multipicker/consumer-rules.pro
View File

0
multipicker/proguard-rules.pro → library/multipicker/proguard-rules.pro vendored
View File

0
multipicker/src/main/AndroidManifest.xml → library/multipicker/src/main/AndroidManifest.xml
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/CameraPicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/ContactPicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/utils/CursorExtensions.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/utils/CursorExtensions.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
View File

0
multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt → library/multipicker/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt
View File

0
multipicker/src/main/res/xml/multipicker_provider_paths.xml → library/multipicker/src/main/res/xml/multipicker_provider_paths.xml
View File

6
settings.gradle
View File

@ -1,9 +1,9 @@
include ':vector' include ':vector'
include ':matrix-sdk-android' include ':matrix-sdk-android'
include ':diff-match-patch'
include ':attachment-viewer'
include ':multipicker'
include ':library:core-utils' include ':library:core-utils'
include ':library:ui-styles' include ':library:ui-styles'
include ':library:jsonviewer' include ':library:jsonviewer'
include ':library:attachment-viewer'
include ':library:diff-match-patch'
include ':library:multipicker'
include ':matrix-sdk-android-flow' include ':matrix-sdk-android-flow'

6
vector/build.gradle
View File

@ -335,12 +335,12 @@ dependencies {
implementation project(":matrix-sdk-android") implementation project(":matrix-sdk-android")
implementation project(":matrix-sdk-android-flow") 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:jsonviewer")
implementation project(":library:ui-styles") implementation project(":library:ui-styles")
implementation project(":library:core-utils") 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 'androidx.multidex:multidex:2.0.1'
implementation libs.jetbrains.coroutinesCore implementation libs.jetbrains.coroutinesCore