fenix/Simple-Draw
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Draw.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix #132, launch the system image picker at opening a file

Browse Source
This commit is contained in:
tibbi
2019-03-08 19:46:30 +01:00
parent af08bd8e72
commit b521f131cb
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/kotlin/com/simplemobiletools/draw/pro/activities/MainActivity.kt
View File

@ -15,7 +15,6 @@ import android.view.WindowManager
import android.webkit.MimeTypeMap import android.webkit.MimeTypeMap
import android.widget.SeekBar import android.widget.SeekBar
import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.LICENSE_GLIDE import com.simplemobiletools.commons.helpers.LICENSE_GLIDE
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
@ -36,7 +35,10 @@ import java.io.ByteArrayOutputStream
import java.io.File import java.io.File
import java.io.OutputStream import java.io.OutputStream
class MainActivity : SimpleActivity(), CanvasListener { class MainActivity : SimpleActivity(), CanvasListener {
private val PICK_IMAGE_INTENT = 1
private val FOLDER_NAME = "images" private val FOLDER_NAME = "images"
private val FILE_NAME = "simple-draw.png" private val FILE_NAME = "simple-draw.png"
private val BITMAP_PATH = "bitmap_path" private val BITMAP_PATH = "bitmap_path"
@ -148,16 +150,18 @@ class MainActivity : SimpleActivity(), CanvasListener {
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, false) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, false)
} }
private fun tryOpenFile() { override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
getStoragePermission { super.onActivityResult(requestCode, resultCode, resultData)
openFile() if (requestCode == PICK_IMAGE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null) {
tryOpenUri(resultData.data!!, resultData)
} }
} }
private fun openFile() { private fun tryOpenFile() {
val path = if (isImageCaptureIntent) "" else defaultPath Intent(Intent.ACTION_GET_CONTENT).apply {
FilePickerDialog(this, path) { addCategory(Intent.CATEGORY_OPENABLE)
openPath(it) type = "image/*"
startActivityForResult(this, PICK_IMAGE_INTENT)
} }
} }
@ -165,14 +169,14 @@ class MainActivity : SimpleActivity(), CanvasListener {
if (intent?.action == Intent.ACTION_SEND && intent.type.startsWith("image/")) { if (intent?.action == Intent.ACTION_SEND && intent.type.startsWith("image/")) {
getStoragePermission { getStoragePermission {
val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM) val uri = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
tryOpenUri(uri) tryOpenUri(uri, intent)
} }
} }
if (intent?.action == Intent.ACTION_SEND_MULTIPLE && intent.type.startsWith("image/")) { if (intent?.action == Intent.ACTION_SEND_MULTIPLE && intent.type.startsWith("image/")) {
getStoragePermission { getStoragePermission {
val imageUris = intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM) val imageUris = intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)
imageUris.any { tryOpenUri(it) } imageUris.any { tryOpenUri(it, intent) }
} }
} }
@ -204,7 +208,7 @@ class MainActivity : SimpleActivity(), CanvasListener {
} }
} }
private fun tryOpenUri(uri: Uri) = when { private fun tryOpenUri(uri: Uri, intent: Intent) = when {
uri.scheme == "file" -> openPath(uri.path) uri.scheme == "file" -> openPath(uri.path)
uri.scheme == "content" -> openUri(uri, intent) uri.scheme == "content" -> openUri(uri, intent)
else -> false else -> false