Adopt Ferris Wheel animation colors to different themes

meikpiep · Sep 26, 2024 · e205069 · e205069
1 parent 4b1a8b4
commit e205069
Showing 1 changed file with 21 additions and 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
@@ -58,49 +58,34 @@ class FerrisWheelConfigurer(
 
     private fun cabinColorsDark(): List<CabinStyle> =
         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<CabinStyle> =
         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<CabinStyle> =
         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,
         )
 }