From ede53aff0ca989881247afead959341818f705b4 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Fri, 18 Aug 2017 20:25:26 -0700
Subject: Feature/theme accent (#192)

* Add lots of theming components

* Optimize and add

* Update accents
---
 .../com/pitchedapps/frost/activities/AboutActivity.kt     |  2 +-
 .../com/pitchedapps/frost/activities/ImageActivity.kt     |  8 +++++---
 .../pitchedapps/frost/activities/WebOverlayActivity.kt    | 15 ++++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

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

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index 670e8669..b7bacbc2 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -33,7 +33,7 @@ class AboutActivity : AboutActivityBase(null, {
     textColor = Prefs.textColor
     accentColor = Prefs.accentColor
     backgroundColor = Prefs.bgColor.withMinAlpha(200)
-    cutoutForeground = if (0xff3b5998.toInt().isColorVisibleOn(Prefs.bgColor)) 0xff3b5998.toInt() else Prefs.accentColor
+    cutoutForeground = Prefs.accentColor
     cutoutDrawableRes = R.drawable.frost_f_256
     faqPageTitleRes = R.string.faq_title
     faqXmlRes = R.xml.frost_faq
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 3593f6b5..61554312 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt
@@ -102,6 +102,7 @@ class ImageActivity : KauBaseActivity() {
             }
         })
         Glide.with(this).asBitmap().load(imageUrl).into(PhotoTarget(this::imageCallback))
+        setFrostColors(themeWindow = false)
     }
 
     /**
@@ -205,7 +206,7 @@ class ImageActivity : KauBaseActivity() {
     }
 }
 
-internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconColor, val backgroundTint: Int = Prefs.iconBackgroundColor.withAlpha(255)) {
+internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconColor, val backgroundTint: Int = Int.MAX_VALUE) {
     ERROR(GoogleMaterial.Icon.gmd_error, Color.WHITE, Color.RED) {
         override fun onClick(activity: ImageActivity) {
             activity.materialDialogThemed {
@@ -255,14 +256,15 @@ internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconC
      * If it's in view, give it some animations
      */
     fun update(fab: FloatingActionButton) {
+        val tint = if (backgroundTint != Int.MAX_VALUE) backgroundTint else Prefs.accentColor
         if (fab.isHidden) {
             fab.setIcon(iicon, color = iconColor)
-            fab.backgroundTintList = ColorStateList.valueOf(backgroundTint)
+            fab.backgroundTintList = ColorStateList.valueOf(tint)
             fab.show()
         } else {
             fab.fadeScaleTransition {
                 setIcon(iicon, color = iconColor)
-                backgroundTintList = ColorStateList.valueOf(backgroundTint)
+                backgroundTintList = ColorStateList.valueOf(tint)
             }
         }
     }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index 7b612166..51aedae3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -60,10 +60,7 @@ open class WebOverlayActivity : KauBaseActivity(),
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         toolbar.navigationIcon = GoogleMaterial.Icon.gmd_close.toDrawable(this, 16, Prefs.iconColor)
         toolbar.setNavigationOnClickListener { finishSlideOut() }
-        kauSwipeOnCreate {
-            if (!Prefs.overlayFullScreenSwipe) edgeSize = 20.dpToPx
-            transitionSystemBars = false
-        }
+
         setFrostColors(toolbar, themeWindow = false)
         coordinator.setBackgroundColor(Prefs.bgColor.withAlpha(255))
 
@@ -77,6 +74,11 @@ open class WebOverlayActivity : KauBaseActivity(),
                 setAction(R.string.kau_got_it) { _ -> this.dismiss() }
             }
         }
+
+        kauSwipeOnCreate {
+            if (!Prefs.overlayFullScreenSwipe) edgeSize = 20.dpToPx
+            transitionSystemBars = false
+        }
     }
 
     /**
@@ -108,11 +110,6 @@ open class WebOverlayActivity : KauBaseActivity(),
         toolbar.overflowIcon?.setTint(Prefs.iconColor)
     }
 
-    override fun onPostCreate(savedInstanceState: Bundle?) {
-        super.onPostCreate(savedInstanceState)
-        kauSwipeOnPostCreate()
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         kauSwipeOnDestroy()
-- 
cgit v1.2.3