aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-22 19:50:44 -0700
committerAllan Wang <me@allanwang.ca>2017-06-22 19:50:44 -0700
commitda5967f87b8a0e9863fb6b82fc5807bae9e62a00 (patch)
tree8575d63efacb79ae10a50c471bf3c8055ea1dbf9 /app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt
parent42d441c0e2b436c7b95fe8dc02ef36608395dbff (diff)
downloadfrost-da5967f87b8a0e9863fb6b82fc5807bae9e62a00.tar.gz
frost-da5967f87b8a0e9863fb6b82fc5807bae9e62a00.tar.bz2
frost-da5967f87b8a0e9863fb6b82fc5807bae9e62a00.zip
Fix up colors and add overlay tip
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt
index 43bb6ec6..cf1cbc67 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Theme.kt
@@ -14,23 +14,23 @@ enum class Theme(val textRes: Int, val injector: InjectorContract,
private val headerColorGetter: () -> Int, private val iconColorGetter: () -> Int) {
DEFAULT(R.string.kau_default, JsActions.EMPTY, { Color.BLACK }, { 0xfffafafa.toInt() }, { 0xff3b5998.toInt() }, { Color.WHITE }),
LIGHT(R.string.kau_light, CssAssets.MATERIAL_LIGHT, { Color.BLACK }, { 0xfffafafa.toInt() }, { 0xff3b5998.toInt() }, { Color.WHITE }),
- DARK(R.string.kau_dark, CssAssets.MATERIAL_DARK, { Color.WHITE }, { 0xff303030.toInt() }, { 0xff3b5998.toInt() }, { Color.WHITE }),
+ DARK(R.string.kau_dark, CssAssets.MATERIAL_DARK, { Color.WHITE }, { 0xff303030.toInt() }, { 0xff2e4b86.toInt() }, { Color.WHITE }),
AMOLED(R.string.kau_amoled, CssAssets.MATERIAL_AMOLED, { Color.WHITE }, { Color.BLACK }, { Color.BLACK }, { Color.WHITE }),
GLASS(R.string.kau_glass, CssAssets.MATERIAL_GLASS, { Color.WHITE }, { 0x80000000.toInt() }, { 0xb3000000.toInt() }, { Color.WHITE }),
CUSTOM(R.string.kau_custom, JsActions.EMPTY, { Prefs.customTextColor }, { Prefs.customBackgroundColor }, { Prefs.customHeaderColor }, { Prefs.customIconColor })
;
val textColor: Int
- get() = textColorGetter.invoke()
+ get() = textColorGetter()
val bgColor: Int
- get() = backgroundColorGetter.invoke()
+ get() = backgroundColorGetter()
val headerColor: Int
- get() = headerColorGetter.invoke()
+ get() = headerColorGetter()
val iconColor: Int
- get() = iconColorGetter.invoke()
+ get() = iconColorGetter()
companion object {
val values = values() //save one instance