Menjadi roti

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.

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.cheese,
-        R.string.salted_caramel,
+        R.string.mocha,
         R.string.coffee
     )
 
     val quantityOptions = listOf(
-        Pair(R.string.one_cupcake, 1),
+        Pair(R.string.one_bread, 1),
-        Pair(R.string.six_cupcakes, 6),
+        Pair(R.string.six_bread, 6),
-        Pair(R.string.twelve_cupcakes, 12)
+        Pair(R.string.twelve_bread, 12)
     )
 }

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

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)))

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

app/src/main/res/drawable/bread.xml

@@ -0,0 +1,39 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="800dp"
+    android:height="800dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M175.4,866.3c39.1,25.7 166.1,114.6 488.5,-229.7s223,-425.9 196.2,-454.9c-26.8,-29 -263.6,-149.6 -556,122.5C21.6,567 175.4,866.3 175.4,866.3z"
+      android:fillColor="#EAAD6A"/>
+  <path
+      android:pathData="M241.9,696.5s26.7,26.1 48.6,4.5c21.9,-21.7 -2.2,-40.2 -2.2,-40.2L171.6,514l-27.3,67.4 97.6,115.1zM623.3,323.5s26.7,26.1 48.6,4.5c21.9,-21.7 -2.2,-40.2 -2.2,-40.2L565.9,153.9l-62.1,19.2 119.5,150.4zM386.5,463.8s26.7,26.1 48.6,4.5c21.9,-21.7 -2.2,-40.2 -2.2,-40.2L322.4,287.5 280.8,332l105.7,131.8z"
+      android:fillColor="#FFC661"/>
+  <path
+      android:pathData="M604.8,577.4c-227.5,243 -389.5,280.3 -455.1,229.3 10.4,34.3 20.7,54.5 20.7,54.5 39.1,25.7 166.1,114.6 488.5,-229.7s223,-425.9 196.2,-454.9c-6.1,-6.6 -22.9,-17.8 -48.6,-28.1 36.5,54.7 15.2,197.1 -201.7,428.9z"
+      android:fillColor="#D19152"/>
+  <path
+      android:pathData="M310.5,281c-4.3,4 -8.6,8.1 -12.9,12.4 -0.7,0.7 -1.5,1.4 -2.2,2.1 -0.4,0.4 -0.7,0.8 -1.1,1.1 -3.8,3.8 -7.7,7.9 -11.7,12.2 -183.1,193.9 -212.5,464 -112.4,564.1 90.5,90.5 259.8,16.9 489.7,-213 229.8,-229.8 303.5,-399.2 213,-489.7C773.1,70.4 504.2,99.3 310.5,281zM659.6,288.6c3.5,3.1 5.5,7.4 5.6,12 0.2,4.7 -1.6,9.1 -4.9,12.4 -6.3,6.3 -16.3,6.6 -23,0.7l-2.8,-2.4c-37,-32.7 -69.3,-70.4 -95.9,-112L524.3,177c1.2,-0.5 2.5,-0.9 3.7,-1.4 8.8,-3.4 17.6,-6.6 26.3,-9.4 0.4,-0.1 0.7,-0.2 1.1,-0.4l3.4,5.3c28.1,43.6 61.9,83.2 100.8,117.5zM434.6,443.1c3.5,3.1 5.5,7.4 5.6,12 0.2,4.7 -1.6,9.1 -4.9,12.4 -6.3,6.3 -16.3,6.6 -23,0.7l-2.8,-2.4c-37,-32.7 -69.3,-70.4 -95.9,-112l-14.9,-23.4c6.7,-7.2 13.6,-14.3 20.7,-21.2 0.8,-0.8 1.7,-1.6 2.5,-2.4l11.9,18.7c28.1,43.6 61.9,83.2 100.8,117.6zM280.1,668.1c3.5,3.1 5.5,7.4 5.6,12 0.2,4.7 -1.6,9.1 -4.9,12.4 -6.3,6.3 -16.3,6.6 -23,0.7l-2.8,-2.4c-37,-32.7 -69.3,-70.4 -95.8,-112l-0.4,-0.6c3.7,-13.1 7.9,-26.5 12.8,-39.9l7.8,12.2c28,43.6 61.9,83.2 100.7,117.6zM641.1,641.1c-124.2,124.2 -348,317 -452,213 -47.2,-47.2 -60.4,-139.1 -38.7,-241.5 25.2,35.9 54.2,69 87.2,98.1l2.8,2.4c17.1,15.1 43.2,14.3 59.4,-1.8 8.4,-8.4 13.1,-20.1 12.7,-32 -0.4,-11.9 -5.7,-23.3 -14.6,-31.2 -37,-32.7 -69.3,-70.4 -95.9,-112l-18.1,-28.3c23,-54 55.2,-107.7 96.7,-156.7l10.9,17c27.9,43.7 61.8,83.3 100.6,117.6l2.8,2.4c17.1,15.1 43.2,14.4 59.4,-1.8 8.4,-8.4 13.1,-20.1 12.7,-32 -0.4,-11.9 -5.7,-23.3 -14.6,-31.2 -37,-32.7 -69.3,-70.4 -95.9,-112L342,288.4c49,-43.2 103.1,-76.9 157.6,-101.2l16.8,26.3c27.9,43.7 61.8,83.3 100.6,117.6l2.8,2.4c17.1,15.1 43.2,14.3 59.4,-1.8 8.4,-8.4 13.1,-20.1 12.7,-32 -0.4,-11.9 -5.7,-23.3 -14.6,-31.2 -36.7,-32.4 -68.6,-69.8 -95.1,-110.9 114.4,-31.4 220.1,-20.6 272,31.3 103.9,104.2 -88.9,328 -213.1,452.2z"
+      android:fillColor="#004364"/>
+  <path
+      android:pathData="M462,257.8m-15.4,0a15.4,15.4 0,1 0,30.8 0,15.4 15.4,0 1,0 -30.8,0Z"
+      android:fillColor="#004364"/>
+  <path
+      android:pathData="M686.7,188.2m-15.4,0a15.4,15.4 0,1 0,30.8 0,15.4 15.4,0 1,0 -30.8,0Z"
+      android:fillColor="#004364"/>
+  <path
+      android:pathData="M681,520.2m-15.4,0a15.4,15.4 0,1 0,30.8 0,15.4 15.4,0 1,0 -30.8,0Z"
+      android:fillColor="#004364"/>
+  <path
+      android:pathData="M607,601.3m-15.4,0a15.4,15.4 0,1 0,30.8 0,15.4 15.4,0 1,0 -30.8,0Z"
+      android:fillColor="#004364"/>
+  <path
+      android:pathData="M249.5,457.8m-15.4,0a15.4,15.4 0,1 0,30.8 0,15.4 15.4,0 1,0 -30.8,0Z"
+      android:fillColor="#004364"/>
+  <path
+      android:pathData="M392.9,292.7m-15.4,0a15.4,15.4 0,1 0,30.8 0,15.4 15.4,0 1,0 -30.8,0Z"
+      android:fillColor="#004364"/>
+  <path
+      android:pathData="M197,758.3m-15.4,0a15.4,15.4 0,1 0,30.8 0,15.4 15.4,0 1,0 -30.8,0Z"
+      android:fillColor="#004364"/>
+</vector>

app/src/main/res/values/strings.xml

@@ -14,16 +14,16 @@
      limitations under the License.
 -->
 <resources>
-    <string name="app_name">Cupcake</string>
+    <string name="app_name">Bread</string>
-    <string name="order_cupcakes">Order Cupcakes</string>
+    <string name="order_bread">Order Bread</string>
-    <string name="one_cupcake">One Cupcake</string>
+    <string name="one_bread">One Bread</string>
-    <string name="six_cupcakes">Six Cupcakes</string>
+    <string name="six_bread">Six Breads</string>
-    <string name="twelve_cupcakes">Twelve Cupcakes</string>
+    <string name="twelve_bread">Twelve Breads</string>
     <string name="choose_flavor">Choose Flavor</string>
-    <string name="vanilla">Vanilla</string>
+    <string name="coconut">Coconut</string>
     <string name="chocolate">Chocolate</string>
-    <string name="red_velvet">Red Velvet</string>
+    <string name="cheese">Cheese</string>
-    <string name="salted_caramel">Salted Caramel</string>
+    <string name="mocha">Mocha</string>
     <string name="coffee">Coffee</string>
     <string name="special_flavor">Special Flavor</string>
     <string name="cancel">Cancel</string>
@@ -36,11 +36,11 @@
     <string name="pickup_date">Pickup date</string>
     <string name="subtotal_price">Subtotal %s</string>
     <string name="total_price">Total %s</string>
-    <string name="new_cupcake_order">New Cupcake Order</string>
+    <string name="new_bread_order">New Bread Order</string>
     <string name="order_details">Quantity: %1$s \nFlavor: %2$s \nPickup date: %3$s \nTotal: %4$s \n\nThank you!</string>
     <string name="back_button">Back</string>
-    <plurals name="cupcakes">
+    <plurals name="bread">
-        <item quantity="one">%d cupcake</item>
+        <item quantity="one">%d bread</item>
-        <item quantity="other">%d cupcakes</item>
+        <item quantity="other">%d bread</item>
     </plurals>
 </resources>