From 4651c45b2f43961a412784ee132529ea1afb253e Mon Sep 17 00:00:00 2001 From: ericdecanini Date: Tue, 22 Feb 2022 19:48:48 +0100 Subject: [PATCH] moves multipicker module to library --- {multipicker => library/multipicker}/.gitignore | 0 {multipicker => library/multipicker}/build.gradle | 0 {multipicker => library/multipicker}/consumer-rules.pro | 0 {multipicker => library/multipicker}/proguard-rules.pro | 0 .../multipicker}/src/main/AndroidManifest.xml | 0 .../src/main/java/im/vector/lib/multipicker/AudioPicker.kt | 0 .../src/main/java/im/vector/lib/multipicker/CameraPicker.kt | 0 .../main/java/im/vector/lib/multipicker/CameraVideoPicker.kt | 0 .../src/main/java/im/vector/lib/multipicker/ContactPicker.kt | 0 .../src/main/java/im/vector/lib/multipicker/FilePicker.kt | 0 .../src/main/java/im/vector/lib/multipicker/ImagePicker.kt | 0 .../src/main/java/im/vector/lib/multipicker/MediaPicker.kt | 0 .../src/main/java/im/vector/lib/multipicker/MultiPicker.kt | 0 .../src/main/java/im/vector/lib/multipicker/Picker.kt | 0 .../src/main/java/im/vector/lib/multipicker/VideoPicker.kt | 0 .../im/vector/lib/multipicker/entity/MultiPickerAudioType.kt | 0 .../vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt | 0 .../im/vector/lib/multipicker/entity/MultiPickerBaseType.kt | 0 .../im/vector/lib/multipicker/entity/MultiPickerContactType.kt | 0 .../im/vector/lib/multipicker/entity/MultiPickerFileType.kt | 0 .../im/vector/lib/multipicker/entity/MultiPickerImageType.kt | 0 .../im/vector/lib/multipicker/entity/MultiPickerVideoType.kt | 0 .../vector/lib/multipicker/provider/MultiPickerFileProvider.kt | 0 .../java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt | 0 .../java/im/vector/lib/multipicker/utils/CursorExtensions.kt | 0 .../src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt | 0 .../main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt | 0 .../src/main/res/xml/multipicker_provider_paths.xml | 0 settings.gradle | 2 +- vector/build.gradle | 2 +- 30 files changed, 2 insertions(+), 2 deletions(-) rename {multipicker => library/multipicker}/.gitignore (100%) rename {multipicker => library/multipicker}/build.gradle (100%) rename {multipicker => library/multipicker}/consumer-rules.pro (100%) rename {multipicker => library/multipicker}/proguard-rules.pro (100%) rename {multipicker => library/multipicker}/src/main/AndroidManifest.xml (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/AudioPicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/CameraPicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/CameraVideoPicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/ContactPicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/FilePicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/ImagePicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/MediaPicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/MultiPicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/Picker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/VideoPicker.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/entity/MultiPickerAudioType.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseMediaType.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/entity/MultiPickerBaseType.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/entity/MultiPickerContactType.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/entity/MultiPickerFileType.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/entity/MultiPickerImageType.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/entity/MultiPickerVideoType.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/provider/MultiPickerFileProvider.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/utils/ContentResolverUtil.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/utils/CursorExtensions.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt (100%) rename {multipicker => library/multipicker}/src/main/java/im/vector/lib/multipicker/utils/MimeTypeUtil.kt (100%) rename {multipicker => library/multipicker}/src/main/res/xml/multipicker_provider_paths.xml (100%) 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 06ceb6cdf8..fe97b4096b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,9 @@ include ':vector' include ':matrix-sdk-android' -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 4b9e6c1144..1c71ff91c9 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(":multipicker") 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