Convert all theme access to themeprovider

1 files changed, 10 insertions, 10 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
index 90bec985..9ce16ec7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt
@@ -134,8 +134,8 @@ class SettingsActivity : KPrefActivity() {
     }
 
     override fun kPrefCoreAttributes(): CoreAttributeContract.() -> Unit = {
-        textColor = { prefs.textColor }
-        accentColor = { prefs.accentColor }
+        textColor = { themeProvider.textColor }
+        accentColor = { themeProvider.accentColor }
     }
 
     override fun onCreateKPrefs(savedInstanceState: Bundle?): KPrefAdapterBuilder.() -> Unit = {
@@ -218,18 +218,18 @@ class SettingsActivity : KPrefActivity() {
 
     @SuppressLint("MissingSuperCall")
     override fun onCreate(savedInstanceState: Bundle?) {
-        setFrostTheme(prefs, true)
+        setFrostTheme(themeProvider, true)
         super.onCreate(savedInstanceState)
         animate = prefs.animate
         themeExterior(false)
     }
 
     fun themeExterior(animate: Boolean = true) {
-        if (animate) bgCanvas.fade(prefs.bgColor)
-        else bgCanvas.set(prefs.bgColor)
-        if (animate) toolbarCanvas.ripple(prefs.headerColor, RippleCanvas.MIDDLE, RippleCanvas.END)
-        else toolbarCanvas.set(prefs.headerColor)
-        frostNavigationBar(prefs)
+        if (animate) bgCanvas.fade(themeProvider.bgColor)
+        else bgCanvas.set(themeProvider.bgColor)
+        if (animate) toolbarCanvas.ripple(themeProvider.headerColor, RippleCanvas.MIDDLE, RippleCanvas.END)
+        else toolbarCanvas.set(themeProvider.headerColor)
+        frostNavigationBar(prefs, themeProvider)
     }
 
     override fun onBackPressed() {
@@ -244,9 +244,9 @@ class SettingsActivity : KPrefActivity() {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_settings, menu)
-        toolbar.tint(prefs.iconColor)
+        toolbar.tint(themeProvider.iconColor)
         setMenuIcons(
-            menu, prefs.iconColor,
+            menu, themeProvider.iconColor,
             R.id.action_github to CommunityMaterial.Icon2.cmd_github,
             R.id.action_changelog to GoogleMaterial.Icon.gmd_info
         )