diff --git a/README.md b/README.md
index 205382e..d24abf2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This app contains an order flow for cupcakes with options for quantity, flavor,
The order details get displayed on an order summary screen and can be shared to another app to
send the order.
-
+perubahan
Pre-requisites
--------------
* Experience with Kotlin syntax.
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..8d22868 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.coconut,
R.string.chocolate,
- R.string.red_velvet,
- R.string.salted_caramel,
+ R.string.cheese,
+ R.string.mocha,
R.string.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_bread, 1),
+ Pair(R.string.six_bread, 6),
+ Pair(R.string.twelve_bread, 12)
)
}
diff --git a/app/src/main/java/com/example/cupcake/ui/OrderViewModel.kt b/app/src/main/java/com/example/cupcake/ui/OrderViewModel.kt
index 3f23859..f609f49 100644
--- a/app/src/main/java/com/example/cupcake/ui/OrderViewModel.kt
+++ b/app/src/main/java/com/example/cupcake/ui/OrderViewModel.kt
@@ -27,10 +27,10 @@ import java.util.Calendar
import java.util.Locale
/** Price for a single cupcake */
-private const val PRICE_PER_CUPCAKE = 2.00
+private const val PRICE_PER_BREAD = 2.50
/** Additional cost for same day pickup of an order */
-private const val PRICE_FOR_SAME_DAY_PICKUP = 3.00
+private const val PRICE_FOR_SAME_DAY_PICKUP = 4.00
/**
* [OrderViewModel] holds information about a cupcake order in terms of quantity, flavor, and
@@ -92,7 +92,7 @@ class OrderViewModel : ViewModel() {
quantity: Int = _uiState.value.quantity,
pickupDate: String = _uiState.value.date
): String {
- var calculatedPrice = quantity * PRICE_PER_CUPCAKE
+ var calculatedPrice = quantity * PRICE_PER_BREAD
// If the user selected the first option (today) for pickup, add the surcharge
if (pickupOptions()[0] == pickupDate) {
calculatedPrice += PRICE_FOR_SAME_DAY_PICKUP
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..764ecb2 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.bread),//bagian yang diganti gambar
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_bread),
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..a8503f6 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.bread,
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_bread_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/bread.xml b/app/src/main/res/drawable/bread.xml
new file mode 100644
index 0000000..99d4b2a
--- /dev/null
+++ b/app/src/main/res/drawable/bread.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/vecteezy_doodle-freehand-sketch-drawing-of-bread_11048382.png b/app/src/main/res/drawable/vecteezy_doodle-freehand-sketch-drawing-of-bread_11048382.png
new file mode 100644
index 0000000..87ef902
Binary files /dev/null and b/app/src/main/res/drawable/vecteezy_doodle-freehand-sketch-drawing-of-bread_11048382.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8d8fcaa..f96c899 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,16 +14,16 @@
limitations under the License.
-->
- Cupcake
- Order Cupcakes
- One Cupcake
- Six Cupcakes
- Twelve Cupcakes
+ Bread
+ Order Bread
+ One Bread
+ Six Breads
+ Twelve Breads
Choose Flavor
- Vanilla
+ Coconut
Chocolate
- Red Velvet
- Salted Caramel
+ Cheese
+ Mocha
Coffee
Special Flavor
Cancel
@@ -36,11 +36,11 @@
Pickup date
Subtotal %s
Total %s
- New Cupcake Order
+ New Bread Order
Quantity: %1$s \nFlavor: %2$s \nPickup date: %3$s \nTotal: %4$s \n\nThank you!
Back
-
- - %d cupcake
- - %d cupcakes
+
+ - %d bread
+ - %d bread