Skip to content

Commit 6797d99

Browse files
indramahkotanomanr
andauthored
Fix: Change Secondary Button Color (#39)
Co-authored-by: nomanr <[email protected]>
1 parent 54f5acc commit 6797d99

File tree

5 files changed

+10
-10
lines changed
  • lumo-ui
  • sample-android/ui-components/src/main/java/com/nomanr/sample/ui/components
  • sample-multiplatform/ui-components/src/commonMain/kotlin/com/nomanr/lumo/multiplatform/ui/components

5 files changed

+10
-10
lines changed

lumo-ui/components-lab/src/commonMain/kotlin/com/nomanr/lumo/ui/components/Button.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ internal object ButtonDefaults {
314314
colors =
315315
ButtonColors(
316316
containerColor = AppTheme.colors.transparent,
317-
contentColor = AppTheme.colors.primary,
317+
contentColor = AppTheme.colors.secondary,
318318
borderColor = AppTheme.colors.secondary,
319319
disabledContainerColor = AppTheme.colors.transparent,
320320
disabledContentColor = AppTheme.colors.onDisabled,
@@ -331,7 +331,7 @@ internal object ButtonDefaults {
331331
colors =
332332
ButtonColors(
333333
containerColor = AppTheme.colors.transparent,
334-
contentColor = AppTheme.colors.primary,
334+
contentColor = AppTheme.colors.secondary,
335335
borderColor = AppTheme.colors.transparent,
336336
disabledContainerColor = AppTheme.colors.transparent,
337337
disabledContentColor = AppTheme.colors.onDisabled,

lumo-ui/plugin/src/main/resources/templates/android/components/Button.kt.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ internal object ButtonDefaults {
314314
colors =
315315
ButtonColors(
316316
containerColor = {{themeName}}.colors.transparent,
317-
contentColor = {{themeName}}.colors.primary,
317+
contentColor = {{themeName}}.colors.secondary,
318318
borderColor = {{themeName}}.colors.secondary,
319319
disabledContainerColor = {{themeName}}.colors.transparent,
320320
disabledContentColor = {{themeName}}.colors.onDisabled,
@@ -331,7 +331,7 @@ internal object ButtonDefaults {
331331
colors =
332332
ButtonColors(
333333
containerColor = {{themeName}}.colors.transparent,
334-
contentColor = {{themeName}}.colors.primary,
334+
contentColor = {{themeName}}.colors.secondary,
335335
borderColor = {{themeName}}.colors.transparent,
336336
disabledContainerColor = {{themeName}}.colors.transparent,
337337
disabledContentColor = {{themeName}}.colors.onDisabled,

lumo-ui/plugin/src/main/resources/templates/multiplatform/components/Button.kt.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ internal object ButtonDefaults {
314314
colors =
315315
ButtonColors(
316316
containerColor = {{themeName}}.colors.transparent,
317-
contentColor = {{themeName}}.colors.primary,
317+
contentColor = {{themeName}}.colors.secondary,
318318
borderColor = {{themeName}}.colors.secondary,
319319
disabledContainerColor = {{themeName}}.colors.transparent,
320320
disabledContentColor = {{themeName}}.colors.onDisabled,
@@ -331,7 +331,7 @@ internal object ButtonDefaults {
331331
colors =
332332
ButtonColors(
333333
containerColor = {{themeName}}.colors.transparent,
334-
contentColor = {{themeName}}.colors.primary,
334+
contentColor = {{themeName}}.colors.secondary,
335335
borderColor = {{themeName}}.colors.transparent,
336336
disabledContainerColor = {{themeName}}.colors.transparent,
337337
disabledContentColor = {{themeName}}.colors.onDisabled,

sample-android/ui-components/src/main/java/com/nomanr/sample/ui/components/Button.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ internal object ButtonDefaults {
314314
colors =
315315
ButtonColors(
316316
containerColor = AppTheme.colors.transparent,
317-
contentColor = AppTheme.colors.primary,
317+
contentColor = AppTheme.colors.secondary,
318318
borderColor = AppTheme.colors.secondary,
319319
disabledContainerColor = AppTheme.colors.transparent,
320320
disabledContentColor = AppTheme.colors.onDisabled,
@@ -331,7 +331,7 @@ internal object ButtonDefaults {
331331
colors =
332332
ButtonColors(
333333
containerColor = AppTheme.colors.transparent,
334-
contentColor = AppTheme.colors.primary,
334+
contentColor = AppTheme.colors.secondary,
335335
borderColor = AppTheme.colors.transparent,
336336
disabledContainerColor = AppTheme.colors.transparent,
337337
disabledContentColor = AppTheme.colors.onDisabled,

sample-multiplatform/ui-components/src/commonMain/kotlin/com/nomanr/lumo/multiplatform/ui/components/Button.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ internal object ButtonDefaults {
314314
colors =
315315
ButtonColors(
316316
containerColor = AppTheme.colors.transparent,
317-
contentColor = AppTheme.colors.primary,
317+
contentColor = AppTheme.colors.secondary,
318318
borderColor = AppTheme.colors.secondary,
319319
disabledContainerColor = AppTheme.colors.transparent,
320320
disabledContentColor = AppTheme.colors.onDisabled,
@@ -331,7 +331,7 @@ internal object ButtonDefaults {
331331
colors =
332332
ButtonColors(
333333
containerColor = AppTheme.colors.transparent,
334-
contentColor = AppTheme.colors.primary,
334+
contentColor = AppTheme.colors.secondary,
335335
borderColor = AppTheme.colors.transparent,
336336
disabledContainerColor = AppTheme.colors.transparent,
337337
disabledContentColor = AppTheme.colors.onDisabled,

0 commit comments

Comments
 (0)