2 files changed, 16 insertions, 8 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
index 61554312..9a5f3c6e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -184,7 +184,7 @@ class ImageActivity : KauBaseActivity() {
                         L.d("Download image async finished: $success")
                         uiThread {
                             val text = if (success) R.string.image_download_success else R.string.image_download_fail
-                            snackbar(text)
+                            frostSnackbar(text)
                             if (success) fabAction = FabStates.SHARE
                         }
                     }
@@ -246,7 +246,7 @@ internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconC
             } catch (e: Exception) {
                 activity.errorRef = e
                 e.logFrostAnswers("Image share failed")
-                activity.snackbar(R.string.image_share_failed)
+                activity.frostSnackbar(R.string.image_share_failed)
             }
         }
     };
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt
index 9b73f9b7..d42b5d9f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MediaPickerActivity.kt
@@ -1,9 +1,12 @@
 package com.pitchedapps.frost.activities
 
 import android.content.Context
+import android.graphics.Color
 import android.net.Uri
 import android.support.v4.content.FileProvider
 import ca.allanwang.kau.mediapicker.*
+import ca.allanwang.kau.utils.colorToBackground
+import ca.allanwang.kau.utils.isColorVisibleOn
 import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.utils.Prefs
 import java.io.File
@@ -11,15 +14,20 @@ import java.io.File
 /**
  * Created by Allan Wang on 2017-07-23.
  */
-private fun actions() = listOf(object : MediaActionCamera(Prefs.accentColor) {
+private fun actions(): List<MediaAction> {
+    var color = Prefs.iconBackgroundColor
+    if (!color.isColorVisibleOn(Color.WHITE, 50))
+        color = 0xff3b5998.toInt()
+    return listOf(object : MediaActionCamera(color) {
 
-    override fun createFile(context: Context): File
-            = createMediaFile("Frost", ".jpg")
+        override fun createFile(context: Context): File
+                = createMediaFile("Frost", ".jpg")
 
-    override fun createUri(context: Context, file: File): Uri
-            = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
+        override fun createUri(context: Context, file: File): Uri
+                = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", file)
 
-}, MediaActionGallery(color = Prefs.accentColor))
+    }, MediaActionGallery(color = color.colorToBackground(0.1f)))
+}
 
 class ImagePickerActivity : MediaPickerActivityOverlayBase(MediaType.IMAGE, actions())