From 84bf883a47b956865d31b1b618d5495fcd7d4876 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 19 Aug 2017 09:47:05 -0700
Subject: v1.4.7 (#195)

* Add try catch (#179)

* Add checks before injections (#180)

* Enhancement/url redirect manager (#182)

* Initial blacklist

* Move js checks to java

* Optimize imports and clean up request interceptor

* Misc (#190)

* Update play store description

* Finalize description

* Update kotlin and bg2 for custom themes

* Update to Android Studio 3.0 beta 2

* Update test dependencies and add logging to image activity

* Rename throwable to errorRef

* Update searchview and media picker through kau

* Update themes (#183)

* Theme content now found view

* Update verified bg and bg2 for transparent themes

* Fix check in star text

* Various fixes

* Create base svg sass images

* Feature/theme accent (#192)

* Add lots of theming components

* Optimize and add

* Update accents

* Misc 2 (#191)

* Add further checks for iab and remove generic error dialog

* Theme all snackbars

* Add dynamic media action tile

* Enhancement/media-camera-picker (#194)

* Update kau

* Update changelog
---
 .../kotlin/com/pitchedapps/frost/utils/Prefs.kt    | 24 ++++++++++------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index 9b8064a4..34257da8 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -1,10 +1,10 @@
 package com.pitchedapps.frost.utils
 
+import android.graphics.Color
 import ca.allanwang.kau.kotlin.lazyResettable
 import ca.allanwang.kau.kpref.KPref
 import ca.allanwang.kau.kpref.StringSet
 import ca.allanwang.kau.kpref.kpref
-import ca.allanwang.kau.utils.colorToForeground
 import ca.allanwang.kau.utils.isColorVisibleOn
 import com.pitchedapps.frost.facebook.FeedSort
 import com.pitchedapps.frost.injectors.InjectorContract
@@ -26,6 +26,8 @@ object Prefs : KPref() {
 
     var customTextColor: Int by kpref("color_text", 0xffeceff1.toInt())
 
+    var customAccentColor: Int by kpref("color_accent", 0xff0288d1.toInt())
+
     var customBackgroundColor: Int by kpref("color_bg", 0xff212121.toInt())
 
     var customHeaderColor: Int by kpref("color_header", 0xff01579b.toInt())
@@ -49,6 +51,14 @@ object Prefs : KPref() {
     val textColor: Int
         get() = t.textColor
 
+    val accentColor: Int
+        get() = t.accentColor
+
+    val accentColorForWhite: Int
+        get() = if (accentColor.isColorVisibleOn(Color.WHITE)) accentColor
+        else if (textColor.isColorVisibleOn(Color.WHITE)) textColor
+        else FACEBOOK_BLUE
+
     val bgColor: Int
         get() = t.bgColor
 
@@ -58,18 +68,6 @@ object Prefs : KPref() {
     val iconColor: Int
         get() = t.iconColor
 
-    /**
-     * Ensures that the color is visible against the background
-     */
-    val accentColor: Int
-        get() = if (headerColor.isColorVisibleOn(bgColor, 100)) headerColor else textColor
-
-    /**
-     * Ensures that the color is visible against the background
-     */
-    val iconBackgroundColor: Int
-        get() = if (headerColor.isColorVisibleOn(bgColor)) headerColor else headerColor.colorToForeground(0.2f)
-
     val themeInjector: InjectorContract
         get() = t.injector
 
-- 
cgit v1.2.3