diff options
| -rw-r--r-- | app/build.gradle | 6 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/SettingsActivity.kt | 9 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 1 | ||||
| -rw-r--r-- | gradle.properties | 2 |
4 files changed, 11 insertions, 7 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 } diff --git a/gradle.properties b/gradle.properties index 52c620f0..5a9336b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ VERSION_CODE=2 VERSION_NAME=0.2 ANDROID_SUPPORT_LIBS=26.0.0-alpha1 -KAU=5c1a82b943 +KAU=c39611eb05 MATERIAL_DRAWER=5.9.2 MATERIAL_DRAWER_KT=1.0.2 IICON_GOOGLE=3.0.1.0 |