From f30f1b526993afe480e5dd7f34a32c1317e991c5 Mon Sep 17 00:00:00 2001
From: 202310715280-FADLAN-RIVALDI <202310715280@mhs.ubharajaya.ac.id>
Date: Thu, 30 Oct 2025 13:57:20 +0700
Subject: [PATCH] percobaan
---
.../java/com/example/cupcake/CupcakeScreen.kt | 2 +-
.../com/example/cupcake/data/DataSource.kt | 6 +-
.../example/cupcake/ui/StartOrderScreen.kt | 4 +-
.../com/example/cupcake/ui/SummaryScreen.kt | 4 +-
app/src/main/res/drawable/donuts.xml | 576 ++++++++++++++++++
app/src/main/res/values/strings.xml | 18 +-
6 files changed, 593 insertions(+), 17 deletions(-)
create mode 100644 app/src/main/res/drawable/donuts.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..1309f7d 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_donuts_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..a432624 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.six_cupcakes, 6),
- Pair(R.string.twelve_cupcakes, 12)
+ Pair(R.string.one_donuts, 1),
+ Pair(R.string.six_donuts, 6),
+ Pair(R.string.twelve_donuts, 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..dc36ef0 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.donuts),
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_donuts),
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..b338192 100644
--- a/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt
+++ b/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt
@@ -55,7 +55,7 @@ fun OrderSummaryScreen(
val resources = LocalContext.current.resources
val numberOfCupcakes = resources.getQuantityString(
- R.plurals.cupcakes,
+ R.plurals.Donuts,
orderUiState.quantity,
orderUiState.quantity
)
@@ -67,7 +67,7 @@ fun OrderSummaryScreen(
orderUiState.date,
orderUiState.quantity
)
- val newOrder = stringResource(R.string.new_cupcake_order)
+ val newOrder = stringResource(R.string.new_donuts_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/donuts.xml b/app/src/main/res/drawable/donuts.xml
new file mode 100644
index 0000000..b4a3628
--- /dev/null
+++ b/app/src/main/res/drawable/donuts.xml
@@ -0,0 +1,576 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d8fcaa..4907bea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,11 +14,11 @@
limitations under the License.
-->
- Cupcake
- Order Cupcakes
- One Cupcake
- Six Cupcakes
- Twelve Cupcakes
+ Donuts
+ Order Donuts
+ One Donuts
+ Six Donuts
+ Twelve Donuts
Choose Flavor
Vanilla
Chocolate
@@ -36,11 +36,11 @@
Pickup date
Subtotal %s
Total %s
- New Cupcake Order
+ New Donuts Order
Quantity: %1$s \nFlavor: %2$s \nPickup date: %3$s \nTotal: %4$s \n\nThank you!
Back
-
- - %d cupcake
- - %d cupcakes
+
+ - %d Donuts
+ - %d Donuts