diff --git a/app/src/main/java/com/example/cupcake/data/DataSource.kt b/app/src/main/java/com/example/cupcake/data/DataSource.kt index d6fb063..d36d32d 100644 --- a/app/src/main/java/com/example/cupcake/data/DataSource.kt +++ b/app/src/main/java/com/example/cupcake/data/DataSource.kt @@ -27,8 +27,8 @@ object DataSource { ) val quantityOptions = listOf( - Pair(R.string.one_cupcake, 1), + Pair(R.string.one_cupcake, 3), Pair(R.string.six_cupcakes, 6), - Pair(R.string.twelve_cupcakes, 12) + Pair(R.string.twelve_cupcakes, 9) ) } diff --git a/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt b/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt index 6b9c833..884001d 100644 --- a/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt +++ b/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt @@ -63,7 +63,7 @@ fun StartOrderScreen( ) { Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_medium))) Image( - painter = painterResource(R.drawable.cupcake), + painter = painterResource(R.drawable.coffee), contentDescription = null, modifier = Modifier.width(300.dp) ) diff --git a/app/src/main/java/com/example/cupcake/ui/theme/Color.kt b/app/src/main/java/com/example/cupcake/ui/theme/Color.kt index f387523..c1b2a0b 100644 --- a/app/src/main/java/com/example/cupcake/ui/theme/Color.kt +++ b/app/src/main/java/com/example/cupcake/ui/theme/Color.kt @@ -17,7 +17,7 @@ package com.example.cupcake.ui.theme import androidx.compose.ui.graphics.Color -val md_theme_light_primary = Color(0xFF984062) +val md_theme_light_primary = Color(0xFFE91E63) val md_theme_light_onPrimary = Color(0xFFFFFFFF) val md_theme_light_primaryContainer = Color(0xFFFFD9E2) val md_theme_light_onPrimaryContainer = Color(0xFF3E001E) @@ -47,29 +47,29 @@ val md_theme_light_surfaceTint = Color(0xFF984062) val md_theme_light_outlineVariant = Color(0xFFD5C2C6) val md_theme_light_scrim = Color(0xFF000000) -val md_theme_dark_primary = Color(0xFFFFB0C9) -val md_theme_dark_onPrimary = Color(0xFF5E1133) -val md_theme_dark_primaryContainer = Color(0xFF7B294A) -val md_theme_dark_onPrimaryContainer = Color(0xFFFFD9E2) +val md_theme_dark_primary = Color(0xFFB7CF4F) +val md_theme_dark_onPrimary = Color(0xFF1A0089) +val md_theme_dark_primaryContainer = Color(0xFF98AB3E) +val md_theme_dark_onPrimaryContainer = Color(0xFF180078) val md_theme_dark_secondary = Color(0xFFE2BDC7) -val md_theme_dark_onSecondary = Color(0xFF422931) +val md_theme_dark_onSecondary = Color(0xFF16006C) val md_theme_dark_secondaryContainer = Color(0xFF5A3F47) val md_theme_dark_onSecondaryContainer = Color(0xFFFFD9E2) val md_theme_dark_tertiary = Color(0xFFEFBD94) -val md_theme_dark_onTertiary = Color(0xFF48290C) +val md_theme_dark_onTertiary = Color(0xFF3F51B5) val md_theme_dark_tertiaryContainer = Color(0xFF623F20) val md_theme_dark_onTertiaryContainer = Color(0xFFFFDCC2) val md_theme_dark_error = Color(0xFFFFB4AB) val md_theme_dark_errorContainer = Color(0xFF93000A) val md_theme_dark_onError = Color(0xFF690005) val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) -val md_theme_dark_background = Color(0xFF201A1B) -val md_theme_dark_onBackground = Color(0xFFEBE0E1) +val md_theme_dark_background = Color(0xFFEFE7D3) +val md_theme_dark_onBackground = Color(0xFF1A0089) val md_theme_dark_surface = Color(0xFF201A1B) -val md_theme_dark_onSurface = Color(0xFFEBE0E1) +val md_theme_dark_onSurface = Color(0xFF16006B) val md_theme_dark_surfaceVariant = Color(0xFF514347) -val md_theme_dark_onSurfaceVariant = Color(0xFFD5C2C6) -val md_theme_dark_outline = Color(0xFF9E8C90) +val md_theme_dark_onSurfaceVariant = Color(0xFF3F51B5) +val md_theme_dark_outline = Color(0xFF3F51B5) val md_theme_dark_inverseOnSurface = Color(0xFF201A1B) val md_theme_dark_inverseSurface = Color(0xFFEBE0E1) val md_theme_dark_inversePrimary = Color(0xFF984062) diff --git a/app/src/main/res/drawable/coffee.png b/app/src/main/res/drawable/coffee.png new file mode 100644 index 0000000..18e0cae Binary files /dev/null and b/app/src/main/res/drawable/coffee.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d8fcaa..36dc5bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,17 +14,17 @@ limitations under the License. --> - Cupcake - Order Cupcakes - One Cupcake - Six Cupcakes - Twelve Cupcakes - Choose Flavor - Vanilla - Chocolate - Red Velvet - Salted Caramel - Coffee + Asique Coffee + Order Coffee + One Coffee + Two Coffee + Three Coffee + Menu + Americano + Cappucino + Latte + Caramel Macchiato + Mocha Special Flavor Cancel Next