From 6c04557a82659a8fadba5b2683a7425f6cb51c3d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 22 Oct 2017 12:22:32 +0200
Subject: [PATCH] fix #47, handle Image Capture intent

---
 app/src/main/AndroidManifest.xml              |  5 ++
 .../draw/activities/MainActivity.kt           | 51 ++++++++++++++-----
 app/src/main/res/menu/menu.xml                |  5 ++
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e590c5d..b0ac41c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,6 +46,11 @@
                 <category android:name="android.intent.category.DEFAULT"/>
                 <data android:mimeType="image/*"/>
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.media.action.IMAGE_CAPTURE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
         </activity>
 
         <activity
diff --git a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
index 889fa2f..61b30d8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/draw/activities/MainActivity.kt
@@ -1,12 +1,15 @@
 package com.simplemobiletools.draw.activities
 
+import android.app.Activity
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.PorterDuff
 import android.graphics.drawable.ColorDrawable
 import android.net.Uri
 import android.os.Bundle
+import android.provider.MediaStore
 import android.support.v4.content.FileProvider
+import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.webkit.MimeTypeMap
@@ -40,6 +43,7 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
     private var strokeWidth = 0f
     private var suggestedFileExtension = PNG
     private var isEraserOn = false
+    private var isImageCaptureIntent = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -79,11 +83,18 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu, menu)
+        menu.apply {
+            findItem(R.id.menu_confirm).isVisible = isImageCaptureIntent
+            findItem(R.id.menu_save).isVisible = !isImageCaptureIntent
+            findItem(R.id.menu_share).isVisible = !isImageCaptureIntent
+        }
+
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
+            R.id.menu_confirm -> confirmImage()
             R.id.menu_save -> trySaveImage()
             R.id.menu_share -> shareImage()
             R.id.clear -> clearCanvas()
@@ -105,17 +116,14 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
     }
 
     private fun tryOpenFile() {
-        handlePermission(PERMISSION_WRITE_STORAGE) {
-            if (it) {
-                openFile()
-            } else {
-                toast(R.string.no_storage_permissions)
-            }
+        getStoragePermission {
+            openFile()
         }
     }
 
     private fun openFile() {
-        FilePickerDialog(this, curPath) {
+        val path = if (isImageCaptureIntent) "" else curPath
+        FilePickerDialog(this, path) {
             openPath(it)
         }
     }
@@ -141,6 +149,16 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
                 openPath(path)
             }
         }
+
+        if (intent?.action == MediaStore.ACTION_IMAGE_CAPTURE) {
+            val output = intent.extras?.get(MediaStore.EXTRA_OUTPUT)
+            if (output != null && output is Uri) {
+                isImageCaptureIntent = true
+                Log.e("DEBUG", "output $output, path ${output.path}")
+                curPath = output.path
+                invalidateOptionsMenu()
+            }
+        }
     }
 
     private fun getStoragePermission(callback: () -> Unit) {
@@ -217,13 +235,20 @@ class MainActivity : SimpleActivity(), MyCanvas.PathsChangedListener {
         }
     }
 
-    private fun trySaveImage() {
-        handlePermission(PERMISSION_WRITE_STORAGE) {
-            if (it) {
-                saveImage()
-            } else {
-                toast(R.string.no_storage_permissions)
+    private fun confirmImage() {
+        val file = File(curPath)
+        getFileOutputStream(file) {
+            it.use {
+                my_canvas.getBitmap().compress(file.getCompressionFormat(), 70, it)
             }
+            setResult(Activity.RESULT_OK)
+            finish()
+        }
+    }
+
+    private fun trySaveImage() {
+        getStoragePermission {
+            saveImage()
         }
     }
 
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
index 48e2a86..8ff45ee 100644
--- a/app/src/main/res/menu/menu.xml
+++ b/app/src/main/res/menu/menu.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_confirm"
+        android:icon="@drawable/ic_check"
+        android:title="@string/save"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_save"
         android:icon="@drawable/ic_save"