Implement image logic

2 files changed, 15 insertions, 6 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImagePickerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImagePickerActivity.kt
index 7ba26715..21d95d30 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImagePickerActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImagePickerActivity.kt
@@ -1,10 +1,17 @@
 package com.pitchedapps.frost.activities
 
-import ca.allanwang.kau.imagepicker.ImagePickerActivity
+import android.content.res.ColorStateList
+import android.os.Bundle
+import ca.allanwang.kau.imagepicker.ImagePickerActivityBase
+import com.pitchedapps.frost.utils.Prefs
 
 /**
  * Created by Allan Wang on 2017-07-23.
  */
-class ImagePickerActivity : ImagePickerActivity() {
+class ImagePickerActivity : ImagePickerActivityBase() {
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        fab.backgroundTintList = ColorStateList.valueOf(Prefs.iconBackgroundColor)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt b/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt
index e36d7da3..3a5b34ac 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/contracts/FileChooser.kt
@@ -30,15 +30,17 @@ class FileChooserDelegate : FileChooserContract {
     override var filePathCallback: ValueCallback<Array<Uri>>? = null
 
     override fun Activity.openImagePicker(filePathCallback: ValueCallback<Array<Uri>>, fileChooserParams: WebChromeClient.FileChooserParams) {
+        this@FileChooserDelegate.filePathCallback = filePathCallback
         kauLaunchImagePicker(ImagePickerActivity::class.java, IMAGE_CHOOSER_REQUEST)
     }
 
     override fun Activity.onActivityResultWeb(requestCode: Int, resultCode: Int, intent: Intent?): Boolean {
-        L.d("On activity results web $requestCode")
+        L.d("FileChooser On activity results web $requestCode")
         if (requestCode != IMAGE_CHOOSER_REQUEST) return false
-        val results = kauOnImagePickerResult(resultCode, intent).map { Uri.parse(it.data) }
-        L.d("Callback received; ${filePathCallback != null}")
-        filePathCallback?.onReceiveValue(results.toTypedArray())
+        val results = kauOnImagePickerResult(resultCode, intent).map { Uri.parse(it.data) }.toTypedArray()
+        L.d("FileChooser result ${results.contentToString()}")
+        L.d("FileChooser Callback received; ${filePathCallback != null}")
+        filePathCallback?.onReceiveValue(results)
         filePathCallback = null
         return true
     }