Merge pull request #53 from icerockdev/develop

Release 0.8.2
icerockdev · Apr 29, 2021 · fa11392 · fa11392
2 parents 553da35 + b0c491a
commit fa11392
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -46,22 +46,22 @@ TODO
  - 0.7.1
  - 0.8.0
  - 0.8.1
+ - 0.8.2
 
 ## Installation
 root build.gradle 
 ```groovy
 allprojects {
  repositories {
  mavenCentral()
- maven { url = "http://dl.bintray.com/lukaville/maven" }
  }
 }
 ```
 
 project build.gradle
 ```groovy
 dependencies {
- commonMainApi("dev.icerock.moko:media:0.8.1")
+ commonMainApi("dev.icerock.moko:media:0.8.2")
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ allprojects {
  mavenCentral()
  google()
 
- maven { url = uri("http://dl.bintray.com/lukaville/maven") }
+ maven { url = uri("https://jitpack.io") }
 
  jcenter {
  content {

diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -16,7 +16,7 @@ object Deps {
  private const val mokoMvvmVersion = "0.10.0"
  private const val mokoPermissionsVersion = "0.9.0"
  private const val mokoTestVersion = "0.2.1"
- const val mokoMediaVersion = "0.8.1"
+ const val mokoMediaVersion = "0.8.2"
 
  object Android {
  const val compileSdk = 28
@@ -42,7 +42,7 @@ object Deps {
  const val material = "com.google.android.material:material:$materialDesignVersion"
  const val lifecycle = "androidx.lifecycle:lifecycle-extensions:$androidLifecycleVersion"
  const val exifInterface = "androidx.exifinterface:exifinterface:$androidExifInterface"
- const val mediaFilePicker = "com.nbsp:materialfilepicker:$androidMediaFilePicker"
+ const val mediaFilePicker = "com.github.icerockdev:MaterialFilePicker:$androidMediaFilePicker"
  }
 
  object MultiPlatform {

diff --git a/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/FilePickerFragment.kt b/media/src/androidMain/kotlin/dev/icerock/moko/media/picker/FilePickerFragment.kt
@@ -6,6 +6,7 @@ package dev.icerock.moko.media.picker
 
 import android.app.Activity
 import android.content.Intent
+import android.os.Environment
 import androidx.fragment.app.Fragment
 import com.nbsp.materialfilepicker.ui.FilePickerActivity
 import dev.icerock.moko.media.FileMedia
@@ -26,8 +27,10 @@ class FilePickerFragment : Fragment() {
 
  // TODO нужно убрать использование внешней зависимости, сделать конфигурацию способа
  // выбора файла из вне (аргументом в контроллер передавать)
+ val externalStorage = Environment.getExternalStorageDirectory()
  MaterialFilePicker().withSupportFragment(this)
  .withCloseMenu(true)
+ .withRootPath(externalStorage.absolutePath)
  .withRequestCode(requestCode)
  .start()
  }

diff --git a/media/src/iosMain/kotlin/dev/icerock/moko/media/picker/ios/MediaPickerController.kt b/media/src/iosMain/kotlin/dev/icerock/moko/media/picker/ios/MediaPickerController.kt
@@ -85,7 +85,7 @@ class MediaPickerController(
 
  val controller = UIDocumentPickerViewController(
  documentTypes = listOf(kStandardFileTypesId),
- inMode = UIDocumentPickerMode.UIDocumentPickerModeOpen
+ inMode = UIDocumentPickerMode.UIDocumentPickerModeImport
  )
  controller.delegate = localDelegatePtr
  getViewController().presentViewController(