From 4ffff4c7add4382c9377a0e294740c0aa46758ae Mon Sep 17 00:00:00 2001 From: HagaDalpintoGinting Date: Wed, 22 Oct 2025 20:20:18 +0700 Subject: [PATCH] TUGAS CUPCAKE EDIT --- .../java/com/example/cupcake/CupcakeScreen.kt | 2 +- .../com/example/cupcake/data/DataSource.kt | 16 +- .../example/cupcake/ui/StartOrderScreen.kt | 4 +- .../com/example/cupcake/ui/SummaryScreen.kt | 2 +- app/src/main/res/drawable/softdrink1.xml | 9 + app/src/main/res/drawable/softdrinks.xml | 422 ++++++++++++++++++ app/src/main/res/values/strings.xml | 22 +- 7 files changed, 454 insertions(+), 23 deletions(-) create mode 100644 app/src/main/res/drawable/softdrink1.xml create mode 100644 app/src/main/res/drawable/softdrinks.xml diff --git a/app/src/main/java/com/example/cupcake/CupcakeScreen.kt b/app/src/main/java/com/example/cupcake/CupcakeScreen.kt index 86e8eaf..9362104 100644 --- a/app/src/main/java/com/example/cupcake/CupcakeScreen.kt +++ b/app/src/main/java/com/example/cupcake/CupcakeScreen.kt @@ -200,7 +200,7 @@ private fun shareOrder(context: Context, subject: String, summary: String) { context.startActivity( Intent.createChooser( intent, - context.getString(R.string.new_cupcake_order) + context.getString(R.string.new_softdrinks_order) ) ) } 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..d8d7e8f 100644 --- a/app/src/main/java/com/example/cupcake/data/DataSource.kt +++ b/app/src/main/java/com/example/cupcake/data/DataSource.kt @@ -19,16 +19,16 @@ import com.example.cupcake.R object DataSource { val flavors = listOf( - R.string.vanilla, - R.string.chocolate, - R.string.red_velvet, - R.string.salted_caramel, - R.string.coffee + R.string.coca_cola, + R.string.fanta, + R.string.pepsi, + R.string.sprite, + R.string.ice_coffee ) val quantityOptions = listOf( - Pair(R.string.one_cupcake, 1), - Pair(R.string.six_cupcakes, 6), - Pair(R.string.twelve_cupcakes, 12) + Pair(R.string.one_bottle, 1), + Pair(R.string.six_bottle, 6), + Pair(R.string.twelve_bottle, 12) ) } 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..1b95bbf 100644 --- a/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt +++ b/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt @@ -63,13 +63,13 @@ fun StartOrderScreen( ) { Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_medium))) Image( - painter = painterResource(R.drawable.cupcake), + painter = painterResource(R.drawable.softdrink1), contentDescription = null, modifier = Modifier.width(300.dp) ) Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_medium))) Text( - text = stringResource(R.string.order_cupcakes), + text = stringResource(R.string.order_SoftDrinks), style = MaterialTheme.typography.headlineSmall ) Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_small))) diff --git a/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt b/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt index 1fae196..5d349aa 100644 --- a/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt +++ b/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt @@ -67,7 +67,7 @@ fun OrderSummaryScreen( orderUiState.date, orderUiState.quantity ) - val newOrder = stringResource(R.string.new_cupcake_order) + val newOrder = stringResource(R.string.new_softdrinks_order) //Create a list of order summary to display val items = listOf( // Summary line 1: display selected quantity diff --git a/app/src/main/res/drawable/softdrink1.xml b/app/src/main/res/drawable/softdrink1.xml new file mode 100644 index 0000000..13fd24f --- /dev/null +++ b/app/src/main/res/drawable/softdrink1.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/softdrinks.xml b/app/src/main/res/drawable/softdrinks.xml new file mode 100644 index 0000000..e1b8ef4 --- /dev/null +++ b/app/src/main/res/drawable/softdrinks.xml @@ -0,0 +1,422 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d8fcaa..305785c 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 + SoftDrinks App + Order Softdrinks + One Bottle + Six Bottle + Twelve Bottle Choose Flavor - Vanilla - Chocolate - Red Velvet - Salted Caramel - Coffee + coca cola + sprite + fanta + pepsi + Ice Coffee Special Flavor Cancel Next @@ -36,7 +36,7 @@ Pickup date Subtotal %s Total %s - New Cupcake Order + New SoftDrinks Order Quantity: %1$s \nFlavor: %2$s \nPickup date: %3$s \nTotal: %4$s \n\nThank you! Back