From 4d377795b26e19a4973eda5eba292319ae00fee3 Mon Sep 17 00:00:00 2001
From: Sanjay Prajapati <82382452+sanjay-mi@users.noreply.github.com>
Date: Thu, 3 Mar 2022 17:33:04 +0530
Subject: [PATCH] Develop (#55)

- issues fixes and improvements.
Co-authored-by: AKASH PATEL <akash.patel@mindinventory.com>
---
 README.md                                     |  25 ++++++-
 app/build.gradle                              |   2 +-
 .../main/java/com/lassi/app/MainActivity.kt   |  32 +++++++-
 app/src/main/res/layout/activity_main.xml     |  18 +++++
 app/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin
 app/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin
 app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin
 app/src/main/res/values/strings.xml           |   1 +
 lassi/build.gradle                            |   6 +-
 .../lassi/common/extenstions/ContextExt.kt    |  24 ++++++
 .../com/lassi/common/utils/FilePickerUtils.kt |  64 +++++++++++++++-
 .../lassi/data/media/MediaRepositoryImpl.kt   |   3 +
 .../com/lassi/domain/media/LassiOption.kt     |   1 -
 .../java/com/lassi/domain/media/MediaType.kt  |   3 +-
 .../mediadirectory/FolderFragment.kt          |   4 +-
 .../LassiMediaPickerActivity.kt               |  70 ++++++++++++++----
 23 files changed, 224 insertions(+), 29 deletions(-)
 mode change 100644 => 100755 app/src/main/res/mipmap-hdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-hdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-mdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxhdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 mode change 100644 => 100755 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 lassi/src/main/java/com/lassi/common/extenstions/ContextExt.kt

diff --git a/README.md b/README.md
index 68fba16..0b65cc1 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ Lassi is simplest way to pick media (either image, video, audio or doc)
 * Filter by particular media type
 * Filter videos by min and max time
 * Enable/disable camera from LassiOption
+* You can open System Default view for file selection by using MediaType.FILE_TYPE_WITH_SYSTEM_VIEW
 
 # Usage
 
@@ -51,18 +52,19 @@ Lassi is simplest way to pick media (either image, video, audio or doc)
     ```groovy
         dependencies {
             ...
-            implementation 'com.github.Mindinventory:Lassi:0.3.0'
+            implementation 'com.github.Mindinventory:Lassi:X.X.X'
         }
     ``` 
 
 ### Implementation
 
 
-* Step 1. Add Lassi in to your activity class:
+* Step 1. 
+  To open a app color theme view then add Lassi in to your activity class:
     
     ```kotlin
             val intent = Lassi(this)
-                .with(LassiOption.CAMERA_AND_GALLERY) // choose Option CAMERA, GALLERY or CAMERA_AND_GALLERY
+                .with(LassiOption.CAMERA_AND_GALLERY) // choose Option CAMERA or CAMERA_AND_GALLERY
                 .setMaxCount(5)
                 .setGridSize(3)
                 .setMediaType(MediaType.VIDEO) // MediaType : VIDEO IMAGE, AUDIO OR DOC
@@ -90,7 +92,18 @@ Lassi is simplest way to pick media (either image, video, audio or doc)
                 .build()
              receiveData.launch(intent)
     ```
+`OR` To open a system default view then add Lassi in to your activity class:
 
+```kotlin
+            val intent = Lassi(this)
+                .setMediaType(MediaType.FILE_TYPE_WITH_SYSTEM_VIEW)
+                .setSupportedFileTypes(
+                "jpg", "jpeg", "png", "webp", "gif", "mp4", "mkv", "webm", "avi", "flv", "3gp",
+                "pdf", "odt", "doc", "docs", "docx", "txt", "ppt", "pptx", "rtf", "xlsx", "xls"
+                )  // Filter by required media format (Mandatory)
+                .build()
+            receiveData.launch(intent)
+```
 
 * Step 2. Get Lassi result in ActivityResultCallback lambda function.
 
@@ -110,6 +123,10 @@ Lassi is simplest way to pick media (either image, video, audio or doc)
 
 ### Document access permission note
 If Android device SDK is >= 30 and wants to access document (only for choose the non media file) then add ```android.permission.MANAGE_EXTERNAL_STORAGE``` permission in your app otherwise library won't allow to access documents. Kindly check sample app for more detail.
+If you don't want to give Manage External Storage permission and wants to get files with system default view then You can use `OR` option from Step 1 and give required file type of document.
+
+### MediaType.FILE_TYPE_WITH_SYSTEM_VIEW (for System Default View)
+Using this MediaType you can choose multiple files from system default view. You can't set max count limit for file choose. Give file type into setSupportedFileTypes and you can choose only those types of file from system view.
 
 ### Guideline for contributors
 Contribution towards our repository is always welcome, we request contributors to create a pull request to the **develop** branch only.  
@@ -125,7 +142,7 @@ It would be great for us if the reporter can share the below things to understan
 
 ### Requirements
 
-* minSdkVersion >= 17
+* minSdkVersion >= 19
 * Androidx
 
 ### Library used
diff --git a/app/build.gradle b/app/build.gradle
index c730e7f..833b68b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 32
     defaultConfig {
         applicationId "com.lassi.app"
-        minSdkVersion 17
+        minSdkVersion 19
         targetSdkVersion 32
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/java/com/lassi/app/MainActivity.kt b/app/src/main/java/com/lassi/app/MainActivity.kt
index 763d917..f5cd489 100644
--- a/app/src/main/java/com/lassi/app/MainActivity.kt
+++ b/app/src/main/java/com/lassi/app/MainActivity.kt
@@ -37,6 +37,7 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
         btnVideoPicker.setOnClickListener(this)
         btnAudioPicker.setOnClickListener(this)
         btnDocPicker.setOnClickListener(this)
+        btnDocumentSystemIntent.setOnClickListener(this)
         rvSelectedMedia.adapter = selectedMediaAdapter
         rvSelectedMedia.addItemDecoration(GridSpacingItemDecoration(2, 10))
     }
@@ -108,6 +109,36 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
             R.id.btnDocPicker -> {
                 requestPermissionForDocument()
             }
+            R.id.btnDocumentSystemIntent -> {
+                val intent = Lassi(this)
+                    .setMediaType(MediaType.FILE_TYPE_WITH_SYSTEM_VIEW)
+                    .setSupportedFileTypes(
+                        "jpg",
+                        "jpeg",
+                        "png",
+                        "webp",
+                        "gif",
+                        "mp4",
+                        "mkv",
+                        "webm",
+                        "avi",
+                        "flv",
+                        "3gp",
+                        "pdf",
+                        "odt",
+                        "doc",
+                        "docs",
+                        "docx",
+                        "txt",
+                        "ppt",
+                        "pptx",
+                        "rtf",
+                        "xlsx",
+                        "xls"
+                    )
+                    .build()
+                receiveData.launch(intent)
+            }
         }
     }
 
@@ -206,7 +237,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
                     }
                 }
             }
-
             else -> {
                 launchDocPicker()
             }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 53e6ae7..1ab7c59 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -86,6 +86,24 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/btnImagePicker" />
+
+        <Button
+            android:id="@+id/btnDocumentSystemIntent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/bg_rounded_button"
+            android:drawableStart="@drawable/ic_document"
+            android:padding="10dp"
+            android:text="@string/open_system_view"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btnAudioPicker" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bbfd33a..0ee65f1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,4 +7,5 @@
     <string name="video">Video</string>
     <string name="document">Document</string>
     <string name="audio">Audio</string>
+    <string name="open_system_view">Open System View</string>
 </resources>
diff --git a/lassi/build.gradle b/lassi/build.gradle
index cf8f15a..f021293 100644
--- a/lassi/build.gradle
+++ b/lassi/build.gradle
@@ -10,10 +10,10 @@ android {
     compileSdkVersion 32
 
     defaultConfig {
-        minSdkVersion 17
+        minSdkVersion 19
         targetSdkVersion 32
-        versionCode 20
-        versionName "0.3.0"
+        versionCode 21
+        versionName "0.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
diff --git a/lassi/src/main/java/com/lassi/common/extenstions/ContextExt.kt b/lassi/src/main/java/com/lassi/common/extenstions/ContextExt.kt
new file mode 100644
index 0000000..432e604
--- /dev/null
+++ b/lassi/src/main/java/com/lassi/common/extenstions/ContextExt.kt
@@ -0,0 +1,24 @@
+package com.lassi.common.extenstions
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.provider.OpenableColumns
+
+fun Context.getFileName(uri: Uri): String? {
+    val returnCursor: Cursor? = this.contentResolver.query(uri, null, null, null, null)
+    val nameIndex: Int? = returnCursor?.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+    returnCursor?.moveToFirst()
+    val name: String? = nameIndex?.let { returnCursor.getString(it) }
+    returnCursor?.close()
+    return name
+}
+
+fun Context.getFileSize(uri: Uri): Long {
+    val returnCursor: Cursor? = this.contentResolver.query(uri, null, null, null, null)
+    val sizeIndex: Int? = returnCursor?.getColumnIndex(OpenableColumns.SIZE)
+    returnCursor?.moveToFirst()
+    val size: Long? = sizeIndex?.let { returnCursor.getLong(it) }
+    returnCursor?.close()
+    return size ?: 0L
+}
\ No newline at end of file
diff --git a/lassi/src/main/java/com/lassi/common/utils/FilePickerUtils.kt b/lassi/src/main/java/com/lassi/common/utils/FilePickerUtils.kt
index 00f0296..ecced76 100644
--- a/lassi/src/main/java/com/lassi/common/utils/FilePickerUtils.kt
+++ b/lassi/src/main/java/com/lassi/common/utils/FilePickerUtils.kt
@@ -1,9 +1,15 @@
 package com.lassi.common.utils
 
+import android.content.ContentResolver
 import android.content.Context
 import android.media.MediaScannerConnection
 import android.net.Uri
 import android.util.Log
+import android.webkit.MimeTypeMap
+import java.io.File
+import java.io.FileOutputStream
+import java.io.InputStream
+import java.io.OutputStream
 import java.util.*
 
 object FilePickerUtils {
@@ -19,7 +25,7 @@ object FilePickerUtils {
         context: Context,
         filePath: String,
         mimeType: String = "image/*",
-        onFileScanComplete: (uri: Uri?, path:String?) -> Unit
+        onFileScanComplete: (uri: Uri?, path: String?) -> Unit
     ) {
         context.let {
             MediaScannerConnection.scanFile(
@@ -32,4 +38,60 @@ object FilePickerUtils {
             }
         }
     }
+
+    private fun getFileExtension(context: Context, uri: Uri): String? =
+        if (uri.scheme == ContentResolver.SCHEME_CONTENT)
+            MimeTypeMap.getSingleton()
+                .getExtensionFromMimeType(context.contentResolver.getType(uri))
+        else uri.path?.let {
+            MimeTypeMap.getFileExtensionFromUrl(
+                Uri.fromFile(File(it)).toString()
+            )
+        }
+
+    fun getFilePathFromUri(context: Context, uri: Uri, uniqueName: Boolean): String =
+        if (uri.path?.contains("file://") == true) uri.path!!
+        else getFileFromContentUri(context, uri, uniqueName).path
+
+    private fun getFileFromContentUri(
+        context: Context,
+        contentUri: Uri,
+        uniqueName: Boolean,
+    ): File {
+        // Preparing Temp file name
+        val fileExtension = getFileExtension(context, contentUri) ?: ""
+        val fileName =
+            ("file" + if (uniqueName) System.currentTimeMillis() else "") + ".$fileExtension"
+
+        // Creating Temp file
+        val tempFile = File(context.cacheDir, fileName)
+        tempFile.createNewFile()
+        // Initialize streams
+        var oStream: FileOutputStream? = null
+        var inputStream: InputStream? = null
+
+        try {
+            oStream = FileOutputStream(tempFile)
+            inputStream = context.contentResolver.openInputStream(contentUri)
+
+            inputStream?.let { copy(inputStream, oStream) }
+            oStream.flush()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        } finally {
+            // Close streams
+            inputStream?.close()
+            oStream?.close()
+        }
+        return tempFile
+    }
+
+    private fun copy(source: InputStream, target: OutputStream) {
+        val buf = ByteArray(8192)
+        var length: Int
+        while (source.read(buf).also { length = it } > 0) {
+            target.write(buf, 0, length)
+        }
+    }
+
 }
diff --git a/lassi/src/main/java/com/lassi/data/media/MediaRepositoryImpl.kt b/lassi/src/main/java/com/lassi/data/media/MediaRepositoryImpl.kt
index 8f58bd1..11f8e8f 100644
--- a/lassi/src/main/java/com/lassi/data/media/MediaRepositoryImpl.kt
+++ b/lassi/src/main/java/com/lassi/data/media/MediaRepositoryImpl.kt
@@ -308,6 +308,9 @@ class MediaRepositoryImpl(private val context: Context) : MediaRepository {
                     MediaStore.Video.Media.DATE_ADDED
                 )
             }
+            else ->{
+                null
+            }
         }
     }
 
diff --git a/lassi/src/main/java/com/lassi/domain/media/LassiOption.kt b/lassi/src/main/java/com/lassi/domain/media/LassiOption.kt
index 8e13392..b69fb28 100644
--- a/lassi/src/main/java/com/lassi/domain/media/LassiOption.kt
+++ b/lassi/src/main/java/com/lassi/domain/media/LassiOption.kt
@@ -2,6 +2,5 @@ package com.lassi.domain.media
 
 enum class LassiOption {
     CAMERA,
-    GALLERY,
     CAMERA_AND_GALLERY
 }
\ No newline at end of file
diff --git a/lassi/src/main/java/com/lassi/domain/media/MediaType.kt b/lassi/src/main/java/com/lassi/domain/media/MediaType.kt
index ada50c3..b7bd3bd 100644
--- a/lassi/src/main/java/com/lassi/domain/media/MediaType.kt
+++ b/lassi/src/main/java/com/lassi/domain/media/MediaType.kt
@@ -4,5 +4,6 @@ enum class MediaType(val value: Int) {
     IMAGE(1),
     VIDEO(2),
     AUDIO(3),
-    DOC(4)
+    DOC(4),
+    FILE_TYPE_WITH_SYSTEM_VIEW(5)
 }
\ No newline at end of file
diff --git a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
index 6f78a0b..4965976 100644
--- a/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
+++ b/lassi/src/main/java/com/lassi/presentation/mediadirectory/FolderFragment.kt
@@ -43,9 +43,7 @@ class FolderFragment : LassiBaseViewModelFragment<FolderViewModel>() {
 
     private val requestPermission =
         registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { map ->
-            if (map.entries.all {
-                    it.value == true
-                }) {
+            if (map.entries.all { it.value }) {
                 fetchFolders()
             } else {
                 showPermissionDisableAlert()
diff --git a/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt b/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt
index bc06359..6a9e554 100644
--- a/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt
+++ b/lassi/src/main/java/com/lassi/presentation/mediadirectory/LassiMediaPickerActivity.kt
@@ -9,10 +9,15 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import android.view.WindowManager
+import android.webkit.MimeTypeMap
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.lifecycle.ViewModelProvider
 import com.lassi.R
+import com.lassi.common.extenstions.getFileName
+import com.lassi.common.extenstions.getFileSize
 import com.lassi.common.utils.CropUtils
 import com.lassi.common.utils.DrawableUtils.changeIconColor
+import com.lassi.common.utils.FilePickerUtils.getFilePathFromUri
 import com.lassi.common.utils.KeyUtils
 import com.lassi.common.utils.ToastUtils
 import com.lassi.data.media.MiMedia
@@ -36,6 +41,21 @@ import java.io.File
 class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewModel>() {
     private var menuDone: MenuItem? = null
     private var menuCamera: MenuItem? = null
+    private val getContent =
+        registerForActivityResult(ActivityResultContracts.OpenMultipleDocuments()) { uri ->
+            uri?.let { uris ->
+                val list = ArrayList<MiMedia>()
+                uris.map { uri ->
+                    val miMedia = MiMedia()
+                    miMedia.name = getFileName(uri)
+                    miMedia.doesUri = false
+                    miMedia.fileSize = getFileSize(uri)
+                    miMedia.path = getFilePathFromUri(this, uri, true)
+                    list.add(miMedia)
+                }
+                setResultOk(list)
+            }
+        }
 
     override fun getContentResource() = R.layout.activity_media_picker
 
@@ -92,24 +112,46 @@ class LassiMediaPickerActivity : LassiBaseViewModelActivity<SelectedMediaViewMod
                 )
                 .commitAllowingStateLoss()
         } else {
-            if (LassiConfig.getConfig().mediaType == MediaType.DOC) {
-                supportFragmentManager.beginTransaction()
-                    .replace(
-                        R.id.ftContainer,
-                        DocsFragment()
-                    )
-                    .commitAllowingStateLoss()
-            } else {
-                supportFragmentManager.beginTransaction()
-                    .replace(
-                        R.id.ftContainer,
-                        FolderFragment.newInstance()
-                    )
-                    .commitAllowingStateLoss()
+            LassiConfig.getConfig().mediaType.let { mediaType ->
+                when (mediaType) {
+                    MediaType.DOC -> {
+                        supportFragmentManager.beginTransaction()
+                            .replace(
+                                R.id.ftContainer,
+                                DocsFragment()
+                            )
+                            .commitAllowingStateLoss()
+                    }
+                    MediaType.FILE_TYPE_WITH_SYSTEM_VIEW -> {
+                        browseFile()
+                    }
+                    else -> {
+                        supportFragmentManager.beginTransaction()
+                            .replace(
+                                R.id.ftContainer,
+                                FolderFragment.newInstance()
+                            )
+                            .commitAllowingStateLoss()
+                    }
+                }
             }
         }
     }
 
+    private fun browseFile() {
+        val mimeTypesList = ArrayList<String>()
+        LassiConfig.getConfig().supportedFileType.forEach { mimeType ->
+            MimeTypeMap
+                .getSingleton()
+                .getMimeTypeFromExtension(mimeType)?.let {
+                    mimeTypesList.add(it)
+                }
+        }
+        var mMimeTypeArray = arrayOf<String>()
+        mMimeTypeArray = mimeTypesList.toArray(mMimeTypeArray)
+        getContent.launch(mMimeTypeArray)
+    }
+
     private fun setThemeAttributes() {
         with(LassiConfig.getConfig()) {
             toolbar.background =