From 6b85bc72a864e65d99ae65802ce03f977a98c906 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 11 Mar 2018 22:21:40 -0400
Subject: misc (#781)

* Rename image vars

* Add black media option, resolves #726

* Update changelog

* Fix menu parsin

* Update changelog

* Fix menu badges
---
 .../pitchedapps/frost/activities/ImageActivity.kt  | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt')

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 9f191460..1bc3334f 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -86,28 +86,30 @@ class ImageActivity : KauBaseActivity() {
         private val L = KauLoggerExtension("Image", com.pitchedapps.frost.utils.L)
     }
 
-    val IMAGE_URL: String by lazy { intent.getStringExtra(ARG_IMAGE_URL).trim('"') }
+    val imageUrl: String by lazy { intent.getStringExtra(ARG_IMAGE_URL).trim('"') }
 
-    private val TEXT: String? by lazy { intent.getStringExtra(ARG_TEXT) }
+    private val imageText: String? by lazy { intent.getStringExtra(ARG_TEXT) }
 
     // a unique image identifier based on the id (if it exists), and its hash
-    private val IMAGE_HASH: String by lazy {
-        "${Math.abs(FB_IMAGE_ID_MATCHER.find(IMAGE_URL)[1]?.hashCode()
-                ?: 0)}_${Math.abs(IMAGE_URL.hashCode())}"
+    private val imageHash: String by lazy {
+        "${Math.abs(FB_IMAGE_ID_MATCHER.find(imageUrl)[1]?.hashCode()
+                ?: 0)}_${Math.abs(imageUrl.hashCode())}"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         intent?.extras ?: return finish()
         L.i { "Displaying image" }
-        L.v { "Displaying image $IMAGE_URL" }
-        val layout = if (!TEXT.isNullOrBlank()) R.layout.activity_image else R.layout.activity_image_textless
+        L.v { "Displaying image $imageUrl" }
+        val layout = if (!imageText.isNullOrBlank()) R.layout.activity_image else R.layout.activity_image_textless
         setContentView(layout)
-        container.setBackgroundColor(Prefs.bgColor.withMinAlpha(222))
-        caption?.setTextColor(Prefs.textColor)
-        caption?.setBackgroundColor(Prefs.bgColor.colorToForeground(0.2f).withAlpha(255))
-        caption?.text = TEXT
-        progress.tint(Prefs.accentColor)
+        container.setBackgroundColor(if (Prefs.blackMediaBg) Color.BLACK
+        else Prefs.bgColor.withMinAlpha(222))
+        caption?.setTextColor(if (Prefs.blackMediaBg) Color.WHITE else Prefs.textColor)
+        caption?.setBackgroundColor((if (Prefs.blackMediaBg) Color.BLACK else Prefs.bgColor)
+                .colorToForeground(0.2f).withAlpha(255))
+        caption?.text = imageText
+        progress.tint(if (Prefs.blackMediaBg) Color.WHITE else Prefs.accentColor)
         panel?.addPanelSlideListener(object : SlidingUpPanelLayout.SimplePanelSlideListener() {
             override fun onPanelSlide(panel: View, slideOffset: Float) {
                 if (slideOffset == 0f && !fab.isShown) fab.show()
@@ -120,7 +122,7 @@ class ImageActivity : KauBaseActivity() {
             override fun onImageLoadError(e: Exception?) {
                 errorRef = e
                 e.logFrostAnswers("Image load error")
-                L.e { "Failed to load image $IMAGE_URL" }
+                L.e { "Failed to load image $imageUrl" }
                 tempFile?.delete()
                 fabAction = FabStates.ERROR
             }
@@ -129,7 +131,7 @@ class ImageActivity : KauBaseActivity() {
             themeWindow = false
         }
         doAsync({
-            L.e(it) { "Failed to load image $IMAGE_HASH" }
+            L.e(it) { "Failed to load image $imageHash" }
             errorRef = it
             runOnUiThread { progress.fadeOut() }
             tempFile?.delete()
@@ -156,7 +158,7 @@ class ImageActivity : KauBaseActivity() {
      * Returns a file pointing to the image, or null if something goes wrong
      */
     private inline fun loadImage(callback: (file: File?) -> Unit) {
-        val local = File(tempDir, IMAGE_HASH)
+        val local = File(tempDir, imageHash)
         if (local.exists() && local.length() > 1) {
             local.setLastModified(System.currentTimeMillis())
             L.d { "Loading from local cache ${local.absolutePath}" }
@@ -204,7 +206,7 @@ class ImageActivity : KauBaseActivity() {
     }
 
     private fun getImageResponse() = Request.Builder()
-            .url(IMAGE_URL)
+            .url(imageUrl)
             .get()
             .call()
             .execute()
@@ -279,7 +281,7 @@ internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconC
                     if (activity.errorRef != null)
                         L.e(activity.errorRef) { "ImageActivity error report" }
                     activity.sendFrostEmail(R.string.debug_image_link_subject) {
-                        addItem("Url", activity.IMAGE_URL)
+                        addItem("Url", activity.imageUrl)
                         addItem("Message", activity.errorRef?.message ?: "Null")
                     }
                 }
-- 
cgit v1.2.3