From e2050696c21f38cd4808f54730a2a19bd4e43a16 Mon Sep 17 00:00:00 2001 From: meikpiep Date: Thu, 26 Sep 2024 22:26:17 +0200 Subject: [PATCH] Adopt Ferris Wheel animation colors to different themes --- .../gauguin/ui/main/FerrisWheelConfigurer.kt | 57 +++++++------------ 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/FerrisWheelConfigurer.kt b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/FerrisWheelConfigurer.kt index e3e6d60c..8a249b8b 100644 --- a/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/FerrisWheelConfigurer.kt +++ b/gauguin-app/src/main/kotlin/org/piepmeyer/gauguin/ui/main/FerrisWheelConfigurer.kt @@ -58,49 +58,34 @@ class FerrisWheelConfigurer( private fun cabinColorsDark(): List = listOf( - CabinStyle( - MaterialColors.getColor(ferrisWheel, com.google.android.material.R.attr.colorPrimaryVariant), - Color.TRANSPARENT, - ), - CabinStyle( - MaterialColors.getColor(ferrisWheel, com.google.android.material.R.attr.colorSecondaryVariant), - Color.TRANSPARENT, - ), - CabinStyle( - ferrisWheel.resources.getColor(R.color.gridSelected, null), - Color.TRANSPARENT, - ), + cabin(com.google.android.material.R.attr.colorPrimaryVariant), + cabin(com.google.android.material.R.attr.colorSecondaryVariant), + cabinFromColor(R.color.gridSelected), ) private fun cabinColorsLight(): List = listOf( - CabinStyle( - ferrisWheel.resources.getColor(R.color.md_theme_light_inversePrimary, null), - Color.TRANSPARENT, - ), - CabinStyle( - MaterialColors.getColor(ferrisWheel, com.google.android.material.R.attr.colorSecondaryVariant), - Color.TRANSPARENT, - ), - CabinStyle( - MaterialColors.getColor(ferrisWheel, R.attr.colorMainTopPanelBackground), - Color.TRANSPARENT, - ), + cabin(com.google.android.material.R.attr.colorSecondaryVariant), + cabin(R.attr.colorMainTopPanelBackground), + cabinFromColor(R.color.md_theme_light_inversePrimary), ) private fun cabinColorsDynamic(): List = listOf( - CabinStyle( - MaterialColors.getColor(ferrisWheel, com.google.android.material.R.attr.colorPrimaryVariant), - Color.TRANSPARENT, - ), - CabinStyle( - MaterialColors.getColor(ferrisWheel, com.google.android.material.R.attr.colorSecondaryVariant), - Color.TRANSPARENT, - ), - CabinStyle( - MaterialColors.getColor(ferrisWheel, R.attr.colorMainTopPanelBackground), - Color.TRANSPARENT, - ), + cabin(com.google.android.material.R.attr.colorPrimaryVariant), + cabin(com.google.android.material.R.attr.colorSecondaryVariant), + cabin(R.attr.colorMainTopPanelBackground), + ) + + private fun cabin(attr: Int) = + CabinStyle( + MaterialColors.getColor(ferrisWheel, attr), + Color.TRANSPARENT, + ) + + private fun cabinFromColor(color: Int) = + CabinStyle( + ferrisWheel.resources.getColor(color, null), + Color.TRANSPARENT, ) }