diff options
author | Allan Wang <me@allanwang.ca> | 2017-12-31 00:42:49 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-31 00:42:49 -0500 |
commit | 3076d9a97c203497aec1415d8ac6037d10eebb46 (patch) | |
tree | cdeb914fa95f2b230f6327be3e1527d15b41dc94 /app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | |
parent | 041bafcceadbd5203e95f2692899ac903dd2e883 (diff) | |
download | frost-3076d9a97c203497aec1415d8ac6037d10eebb46.tar.gz frost-3076d9a97c203497aec1415d8ac6037d10eebb46.tar.bz2 frost-3076d9a97c203497aec1415d8ac6037d10eebb46.zip |
feature/menu-parser (#582)
* Test menu parser
* Add menu fragment implementation
* Test proguard
* Clean up
* Use async
* Use invoke
* Try without proguard
* Try 2
* Add fallback logic
* Use normal notification event
* Add custom event flag
* Add rest of menu fragment data
* Ensure fallback works
* Update docs
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 19 |
1 files changed, 13 insertions, 6 deletions
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 f14039b7..7bec8ce0 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt @@ -5,7 +5,9 @@ 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 ca.allanwang.kau.utils.withAlpha import com.pitchedapps.frost.enums.FACEBOOK_BLUE import com.pitchedapps.frost.enums.FeedSort import com.pitchedapps.frost.enums.MainActivityLayout @@ -59,11 +61,18 @@ object Prefs : KPref() { val accentColor: Int get() = t.accentColor - val accentColorForWhite: Int + inline val accentColorForWhite: Int get() = if (accentColor.isColorVisibleOn(Color.WHITE)) accentColor else if (textColor.isColorVisibleOn(Color.WHITE)) textColor else FACEBOOK_BLUE + inline val nativeBgColor: Int + get() = Prefs.bgColor.withAlpha(30) + + fun nativeBgColor(unread: Boolean) = Prefs.bgColor + .colorToForeground(if (unread) 0.7f else 0.0f) + .withAlpha(30) + val bgColor: Int get() = t.bgColor @@ -79,8 +88,8 @@ object Prefs : KPref() { val isCustomTheme: Boolean get() = t == Theme.CUSTOM - val frostId: String - get() = "${installDate}-${identifier}" + inline val frostId: String + get() = "$installDate-$identifier" var tintNavBar: Boolean by kpref("tint_nav_bar", true) @@ -150,10 +159,8 @@ object Prefs : KPref() { var mainActivityLayoutType: Int by kpref("main_activity_layout_type", 0) - val mainActivityLayout: MainActivityLayout + inline val mainActivityLayout: MainActivityLayout get() = MainActivityLayout(mainActivityLayoutType) - var nativeViews: Boolean by kpref("native_views", true) - override fun deleteKeys() = arrayOf("search_bar") } |