diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-18 20:25:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-18 20:25:26 -0700 |
commit | ede53aff0ca989881247afead959341818f705b4 (patch) | |
tree | 4cafcf203bac331ebc53eab690c0fb41813d23da /app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | |
parent | 22df6cd1cf436433d5e381a6d6e694a91f647075 (diff) | |
download | frost-ede53aff0ca989881247afead959341818f705b4.tar.gz frost-ede53aff0ca989881247afead959341818f705b4.tar.bz2 frost-ede53aff0ca989881247afead959341818f705b4.zip |
Feature/theme accent (#192)
* Add lots of theming components
* Optimize and add
* Update accents
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt index 3593f6b5..61554312 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -102,6 +102,7 @@ class ImageActivity : KauBaseActivity() { } }) Glide.with(this).asBitmap().load(imageUrl).into(PhotoTarget(this::imageCallback)) + setFrostColors(themeWindow = false) } /** @@ -205,7 +206,7 @@ class ImageActivity : KauBaseActivity() { } } -internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconColor, val backgroundTint: Int = Prefs.iconBackgroundColor.withAlpha(255)) { +internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconColor, val backgroundTint: Int = Int.MAX_VALUE) { ERROR(GoogleMaterial.Icon.gmd_error, Color.WHITE, Color.RED) { override fun onClick(activity: ImageActivity) { activity.materialDialogThemed { @@ -255,14 +256,15 @@ internal enum class FabStates(val iicon: IIcon, val iconColor: Int = Prefs.iconC * If it's in view, give it some animations */ fun update(fab: FloatingActionButton) { + val tint = if (backgroundTint != Int.MAX_VALUE) backgroundTint else Prefs.accentColor if (fab.isHidden) { fab.setIcon(iicon, color = iconColor) - fab.backgroundTintList = ColorStateList.valueOf(backgroundTint) + fab.backgroundTintList = ColorStateList.valueOf(tint) fab.show() } else { fab.fadeScaleTransition { setIcon(iicon, color = iconColor) - backgroundTintList = ColorStateList.valueOf(backgroundTint) + backgroundTintList = ColorStateList.valueOf(tint) } } } |