3 files changed, 10 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle
index eaacf542..d7ba2634 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -91,9 +91,9 @@ dependencies {
     compile "com.github.Raizlabs.DBFlow:dbflow-core:${DBFLOW}"
     annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${DBFLOW}"
     kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${DBFLOW}"
-//    compile "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${DBFLOW}"
-    compile "com.github.Raizlabs.DBFlow:dbflow-rx2:${DBFLOW}"
-    compile "com.github.Raizlabs.DBFlow:dbflow-rx2-kotlinextensions:${DBFLOW}"
+    compile "com.github.Raizlabs.DBFlow:dbflow-kotlinextensions:${DBFLOW}"
+//    compile "com.github.Raizlabs.DBFlow:dbflow-rx2:${DBFLOW}"
+//    compile "com.github.Raizlabs.DBFlow:dbflow-rx2-kotlinextensions:${DBFLOW}"
 
 //    compile "org.greenrobot:eventbus:${EVENTBUS}"
 
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
index 7cf90cc6..bcf30614 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
 import ca.allanwang.kau.email.sendEmail
+import ca.allanwang.kau.kpref.CoreAttributeContract
 import ca.allanwang.kau.kpref.KPrefActivity
 import ca.allanwang.kau.kpref.KPrefAdapterBuilder
 import ca.allanwang.kau.utils.*
@@ -16,10 +17,12 @@ import com.pitchedapps.frost.utils.*
  * Created by Allan Wang on 2017-06-06.
  */
 class SettingsActivity : KPrefActivity() {
-
-    override fun onCreateKPrefs(savedInstanceState: android.os.Bundle?): KPrefAdapterBuilder.() -> Unit = {
+    override fun kPrefCoreAttributes(): CoreAttributeContract.() -> Unit = {
         textColor = { Prefs.textColor }
         accentColor = { Prefs.textColor }
+    }
+
+    override fun onCreateKPrefs(savedInstanceState: android.os.Bundle?): KPrefAdapterBuilder.() -> Unit = {
         header(R.string.settings)
         text(R.string.theme, { Prefs.theme }, { Prefs.theme = it }) {
             onClick = {
@@ -135,6 +138,8 @@ class SettingsActivity : KPrefActivity() {
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_settings, menu)
         toolbar.tint(Prefs.iconColor)
+        toolbarTitle.textColor = Prefs.iconColor
+        toolbarTitle.invalidate()
         setMenuIcons(menu, Prefs.iconColor,
                 R.id.action_email to GoogleMaterial.Icon.gmd_email,
                 R.id.action_changelog to GoogleMaterial.Icon.gmd_info)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 48963e0e..a8a71845 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -89,7 +89,6 @@ fun MaterialDialog.Builder.theme(): MaterialDialog.Builder {
     positiveColor(Prefs.textColor)
     negativeColor(Prefs.textColor)
     neutralColor(Prefs.textColor)
-    SimpleItemAnimator
     return this
 }