Skip to content

Commit 69609cc

Browse files
committed
Color Pallet: Consume the latest changes from color-pallet library module
1 parent 8fd91ea commit 69609cc

File tree

5 files changed

+5
-20
lines changed

5 files changed

+5
-20
lines changed

ui-app/src/main/kotlin/com/kavi/droid/color/pallet/app/KvColorPalletApp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ class KvColorPalletApp: Application() {
99
override fun onCreate() {
1010
super.onCreate()
1111
// Initialize the kv color pallet
12-
KvColorPallet.init(MatPackage.MatDGreen.color)
12+
KvColorPallet.initialize(MatPackage.MatDGreen)
1313
}
1414
}

ui-app/src/main/kotlin/com/kavi/droid/color/pallet/app/theme/Theme.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,6 @@ import androidx.compose.runtime.Composable
99
import androidx.compose.ui.graphics.Color
1010
import com.kavi.droid.color.pallet.KvColorPallet
1111

12-
/*private val LightColorScheme = lightColorScheme(
13-
primary = Purple40,
14-
secondary = PurpleGrey40,
15-
tertiary = Pink40,
16-
background = Color.Gray
17-
/* Other default colors to override */
18-
background = Color(0xFFFFFBFE),
19-
surface = Color(0xFFFFFBFE),
20-
onPrimary = Color.White,
21-
onSecondary = Color.White,
22-
onTertiary = Color.White,
23-
onBackground = Color(0xFF1C1B1F),
24-
onSurface = Color(0xFF1C1B1F),
25-
)*/
26-
2712
@Composable
2813
fun KvColorPalletTheme(
2914
darkTheme: Boolean = isSystemInDarkTheme(),

ui-app/src/main/kotlin/com/kavi/droid/color/pallet/app/ui/tab/pallet/pager/AlphaPalletPager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ fun AlphaPalletPager() {
6767

6868
@Composable
6969
fun AlphaPalletColorRow(givenColor: KvColor, selectedColor: Color, onSelect: (color: Color) -> Unit) {
70-
val colors = KvColorPallet.instance!!.generateAlphaColorPallet(givenColor.color)
70+
val colors = KvColorPallet.instance.generateAlphaColorPallet(givenColor.color)
7171
Row {
7272
colors.forEach {
7373
ColorBox(givenColor = it, selectedColor = selectedColor, onSelect = onSelect)

ui-app/src/main/kotlin/com/kavi/droid/color/pallet/app/ui/tab/pallet/pager/PalletPager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fun PalletPager() {
6666

6767
@Composable
6868
fun PalletColorRow(givenColor: KvColor, selectedColor: Color, onSelect: (color: Color) -> Unit) {
69-
val colors = KvColorPallet(givenColor.color).generateColorPallet(givenColor)
69+
val colors = KvColorPallet.instance.generateColorPallet(givenColor)
7070
Row {
7171
colors.forEach {
7272
ColorBox(givenColor = it, selectedColor = selectedColor, onSelect = onSelect)

ui-app/src/main/kotlin/com/kavi/droid/color/pallet/app/ui/tab/theme/ThemeColorGen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ fun ThemeColorRow(givenColor: KvColor) {
108108
.fillMaxWidth(),
109109
verticalArrangement = Arrangement.Center,
110110
) {
111-
val appThemeColorSet = KvColorPallet().generateThemeColorPallet(
112-
givenColor = givenColor,
111+
val appThemeColorSet = KvColorPallet.instance.generateThemeColorPallet(
112+
givenColor = givenColor.color,
113113
)
114114

115115
Text("Light Theme", Modifier.padding(top = 8.dp, start = 8.dp), style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.ExtraBold,)

0 commit comments

Comments
 (0)