@@ -14,11 +14,11 @@ object ThemeGenUtil {
1414 * @param givenColor The color to generate theme color set.
1515 * @return A theme color set. [AppThemePallet]
1616 */
17- internal fun generateThemeColorSet (givenColor : KvColor ): AppThemePallet {
18- val closestColor = findClosestColor(givenColor.color )
17+ internal fun generateThemeColorSet (givenColor : Color ): AppThemePallet {
18+ val closestColor = findClosestColor(givenColor)
1919
20- val lightColorPallet = generateLightThemeColorSet(closestColor)
21- val darkColorPallet = generateDarkThemeColorSet(closestColor)
20+ val lightColorPallet = generateLightThemeColorSet(givenColor, closestColor)
21+ val darkColorPallet = generateDarkThemeColorSet(givenColor, closestColor)
2222
2323 return AppThemePallet (light = lightColorPallet, dark = darkColorPallet)
2424 }
@@ -28,14 +28,16 @@ object ThemeGenUtil {
2828 * @param closestColor The closest color to original consumer given color.
2929 * @return A light theme color set. [ThemeColorPallet]
3030 */
31- private fun generateLightThemeColorSet (closestColor : KvColor ): ThemeColorPallet {
31+ private fun generateLightThemeColorSet (givenColor : Color , closestColor : KvColor ): ThemeColorPallet {
3232 return ThemeColorPallet (
33+ base = givenColor,
3334 primary = closestColor.color,
3435 secondary = generateLightSecondaryColor(closestColor.color),
3536 tertiary = generateLightTeriaryColor(closestColor),
3637 background = generateLightBackgroundColor(closestColor),
3738 onPrimary = Color .White ,
38- onSecondary = Color .White
39+ onSecondary = Color .White ,
40+ shadow = Color .Gray
3941 )
4042 }
4143
@@ -44,16 +46,18 @@ object ThemeGenUtil {
4446 * @param closestColor The closest color to original consumer given color.
4547 * @return A dark theme color set. [ThemeColorPallet]
4648 */
47- private fun generateDarkThemeColorSet (primaryColor : KvColor ): ThemeColorPallet {
49+ private fun generateDarkThemeColorSet (givenColor : Color , primaryColor : KvColor ): ThemeColorPallet {
4850 val closestColor = findClosestColor(primaryColor.color)
4951
5052 return ThemeColorPallet (
53+ base = givenColor,
5154 primary = generateDarkPrimaryColor(closestColor.color),
5255 secondary = generateDarkSecondaryColor(closestColor.color),
5356 tertiary = generateDarkTeriaryColor(closestColor),
5457 background = generateDarkBackgroundColor(closestColor.color),
5558 onPrimary = Color .White ,
56- onSecondary = Color .Black
59+ onSecondary = Color .Black ,
60+ shadow = Color .White
5761 )
5862 }
5963
0 commit comments