Ganti Tipis cupcek ke Donat

Ganti Tipis Donut cupcek
Commit Mie Ayam
2025-10-23 10:45:19 +07:00 · 2025-10-22 17:02:52 +07:00 · 2025-10-16 15:28:08 +07:00 · 2024-12-05 12:32:46 +01:00 · 2024-12-05 12:32:35 +01:00 · 2024-12-03 17:04:48 +00:00
8 changed files with 77 additions and 61 deletions
--- a/.github/renovate.json
+++ b/.github/renovate.json
@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>android/.github:renovate-config"
+  ]
+}
--- a/README.md
+++ b/README.md
@ -5,15 +5,12 @@ 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.

-TODO
-

 Pre-requisites
 --------------
 * Experience with Kotlin syntax.
 * How to create and run a project in Android Studio.
 * How to create composable functions 
-* TODO


 Getting Started
--- a/app/src/main/java/com/example/cupcake/CupcakeScreen.kt
+++ b/app/src/main/java/com/example/cupcake/CupcakeScreen.kt
@ -21,6 +21,8 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.Icon
@ -115,7 +117,10 @@ fun CupcakeApp(
        NavHost(
            navController = navController,
            startDestination = CupcakeScreen.Start.name,
-            modifier = Modifier.padding(innerPadding)
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(innerPadding)
        ) {
            composable(route = CupcakeScreen.Start.name) {
                StartOrderScreen(
--- a/app/src/main/java/com/example/cupcake/MainActivity.kt
+++ b/app/src/main/java/com/example/cupcake/MainActivity.kt
@ -18,13 +18,13 @@ package com.example.cupcake
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.core.view.WindowCompat
+import androidx.activity.enableEdgeToEdge
 import com.example.cupcake.ui.theme.CupcakeTheme

 class MainActivity : ComponentActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
        super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
        setContent {
            CupcakeTheme {
                CupcakeApp()
--- a/app/src/main/java/com/example/cupcake/ui/SelectOptionScreen.kt
+++ b/app/src/main/java/com/example/cupcake/ui/SelectOptionScreen.kt
@ -39,6 +39,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.example.cupcake.R
 import com.example.cupcake.ui.components.FormattedPriceLabel
+import com.example.cupcake.ui.theme.CupcakeTheme

 /**
 * Composable that displays the list of items as [RadioButton] options,
@ -54,14 +55,14 @@ fun SelectOptionScreen(
    onCancelButtonClicked: () -> Unit = {},
    onNextButtonClicked: () -> Unit = {},
    modifier: Modifier = Modifier
-){
+) {
    var selectedValue by rememberSaveable { mutableStateOf("") }

    Column(
        modifier = modifier,
        verticalArrangement = Arrangement.SpaceBetween
    ) {
-        Column(modifier = Modifier.padding(dimensionResource(R.dimen.padding_medium))){
+        Column(modifier = Modifier.padding(dimensionResource(R.dimen.padding_medium))) {
            options.forEach { item ->
                Row(
                    modifier = Modifier.selectable(
@ -72,7 +73,7 @@ fun SelectOptionScreen(
                        }
                    ),
                    verticalAlignment = Alignment.CenterVertically
-                ){
+                ) {
                    RadioButton(
                        selected = selectedValue == item,
                        onClick = {
@ -100,12 +101,14 @@ fun SelectOptionScreen(
        Row(
            modifier = Modifier
                .fillMaxWidth()
-                .padding(dimensionResource(R.dimen.padding_medium))
-                .weight(1f, false),
+                .padding(dimensionResource(R.dimen.padding_medium)),
            horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.padding_medium)),
            verticalAlignment = Alignment.Bottom
-        ){
-            OutlinedButton(modifier = Modifier.weight(1f), onClick = onCancelButtonClicked) {
+        ) {
+            OutlinedButton(
+                modifier = Modifier.weight(1f),
+                onClick = onCancelButtonClicked
+            ) {
                Text(stringResource(R.string.cancel))
            }
            Button(
@ -123,10 +126,12 @@ fun SelectOptionScreen(

@Preview
@Composable
-fun SelectOptionPreview(){
-    SelectOptionScreen(
-        subtotal = "299.99",
-        options = listOf("Option 1", "Option 2", "Option 3", "Option 4"),
-        modifier = Modifier.fillMaxHeight()
-    )
+fun SelectOptionPreview() {
+    CupcakeTheme {
+        SelectOptionScreen(
+            subtotal = "299.99",
+            options = listOf("Option 1", "Option 2", "Option 3", "Option 4"),
+            modifier = Modifier.fillMaxHeight()
+        )
+    }
 }
--- a/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt
+++ b/app/src/main/java/com/example/cupcake/ui/StartOrderScreen.kt
@ -19,9 +19,7 @@ import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@ -41,6 +39,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.example.cupcake.R
 import com.example.cupcake.data.DataSource
+import com.example.cupcake.ui.theme.CupcakeTheme

 /**
 * Composable that allows the user to select the desired cupcake quantity and expects
@ -52,7 +51,7 @@ fun StartOrderScreen(
    quantityOptions: List<Pair<Int, Int>>,
    onNextButtonClicked: (Int) -> Unit,
    modifier: Modifier = Modifier
-){
+) {
    Column(
        modifier = modifier,
        verticalArrangement = Arrangement.SpaceBetween
@ -75,20 +74,19 @@ fun StartOrderScreen(
            )
            Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_small)))
        }
-        Row(modifier = Modifier.weight(1f, false)) {
-            Column(
-                modifier = Modifier.fillMaxWidth(),
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.spacedBy(
-                    dimensionResource(id = R.dimen.padding_medium)
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(
+                dimensionResource(id = R.dimen.padding_medium)
+            )
+        ) {
+            quantityOptions.forEach { item ->
+                SelectQuantityButton(
+                    labelResourceId = item.first,
+                    onClick = { onNextButtonClicked(item.second) },
+                    modifier = Modifier.fillMaxWidth(),
                )
-            ) {
-                quantityOptions.forEach { item ->
-                    SelectQuantityButton(
-                        labelResourceId = item.first,
-                        onClick = { onNextButtonClicked(item.second) }
-                    )
-                }
            }
        }
    }
@ -103,7 +101,7 @@ fun SelectQuantityButton(
    @StringRes labelResourceId: Int,
    onClick: () -> Unit,
    modifier: Modifier = Modifier
-){
+) {
    Button(
        onClick = onClick,
        modifier = modifier.widthIn(min = 250.dp)
@ -114,10 +112,14 @@ fun SelectQuantityButton(

@Preview
@Composable
-fun StartOrderPreview(){
-    StartOrderScreen(
-        quantityOptions = DataSource.quantityOptions,
-        onNextButtonClicked = {},
-        modifier = Modifier.fillMaxSize().padding(dimensionResource(R.dimen.padding_medium))
-    )
+fun StartOrderPreview() {
+    CupcakeTheme {
+        StartOrderScreen(
+            quantityOptions = DataSource.quantityOptions,
+            onNextButtonClicked = {},
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(dimensionResource(R.dimen.padding_medium))
+        )
+    }
 }
--- a/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt
+++ b/app/src/main/java/com/example/cupcake/ui/SummaryScreen.kt
@ -38,6 +38,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import com.example.cupcake.R
 import com.example.cupcake.data.OrderUiState
 import com.example.cupcake.ui.components.FormattedPriceLabel
+import com.example.cupcake.ui.theme.CupcakeTheme

 /**
 * This composable expects [orderUiState] that represents the order state, [onCancelButtonClicked]
@ -50,7 +51,7 @@ fun OrderSummaryScreen(
    onCancelButtonClicked: () -> Unit,
    onSendButtonClicked: (String, String) -> Unit,
    modifier: Modifier = Modifier
-){
+) {
    val resources = LocalContext.current.resources

    val numberOfCupcakes = resources.getQuantityString(
@ -97,9 +98,7 @@ fun OrderSummaryScreen(
            )
        }
        Row(
-            modifier = Modifier
-                .weight(1f, false)
-                .padding(dimensionResource(R.dimen.padding_medium))
+            modifier = Modifier.padding(dimensionResource(R.dimen.padding_medium))
        ) {
            Column(
                verticalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.padding_small))
@ -123,11 +122,13 @@ fun OrderSummaryScreen(

@Preview
@Composable
-fun OrderSummaryPreview(){
-    OrderSummaryScreen(
-        orderUiState = OrderUiState(0, "Test", "Test", "$300.00"),
-        onSendButtonClicked = { subject: String, summary: String -> },
-        onCancelButtonClicked = {},
-        modifier = Modifier.fillMaxHeight()
-    )
+fun OrderSummaryPreview() {
+    CupcakeTheme {
+        OrderSummaryScreen(
+            orderUiState = OrderUiState(0, "Test", "Test", "$300.00"),
+            onSendButtonClicked = { subject: String, summary: String -> },
+            onCancelButtonClicked = {},
+            modifier = Modifier.fillMaxHeight()
+        )
+    }
 }
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -14,11 +14,11 @@
     limitations under the License.
 -->
 <resources>
-    <string name="app_name">Cupcake</string>
-    <string name="order_cupcakes">Order Cupcakes</string>
-    <string name="one_cupcake">One Cupcake</string>
-    <string name="six_cupcakes">Six Cupcakes</string>
-    <string name="twelve_cupcakes">Twelve Cupcakes</string>
+    <string name="app_name">Donut</string>
+    <string name="order_cupcakes">Pesan Donut</string>
+    <string name="one_cupcake">Pesan 1 Donat</string>
+    <string name="six_cupcakes">Pesan Paket 6 Donut</string>
+    <string name="twelve_cupcakes">Pesan Paket 12 Donut</string>
    <string name="choose_flavor">Choose Flavor</string>
    <string name="vanilla">Vanilla</string>
    <string name="chocolate">Chocolate</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_cupcake_order">New Donut 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">
-        <item quantity="one">%d cupcake</item>
-        <item quantity="other">%d cupcakes</item>
+        <item quantity="one">%d Donut</item>
+        <item quantity="other">%d Donut</item>
    </plurals>
 </resources>
Author	SHA1	Message	Date
202310715312 HADI GUNA PRAKOSO	d54998cf29	Ganti Tipis cupcek ke Donat	2025-10-23 10:45:19 +07:00
202310715312 HADI GUNA PRAKOSO	27be844ddb	Ganti Tipis Donut cupcek	2025-10-22 17:02:52 +07:00
FazriA	6dd65a9a9e	Commit Mie Ayam	2025-10-16 15:28:08 +07:00
Jose Alcérreca	82b7dc7723	Merge pull request #117 from google-developer-training/renovate/configure Configure Renovate	2024-12-05 12:32:46 +01:00
Jose Alcérreca	8b50e72975	Update and rename renovate.json to .github/renovate.json	2024-12-05 12:32:35 +01:00
renovate[bot]	7097a75f37	Add renovate.json	2024-12-03 17:04:48 +00:00
the-scrambler	a5118e6dfe	Merge pull request #69 from google-developer-training/main-e2e Implement edge-to-edge on branch main	2024-01-22 21:55:07 -08:00
John Shea	8f9aedaebc	Remove TODO wording from README.md	2023-11-01 11:46:02 -04:00
John Shea	5b8dab87ee	Implement vertical scrolling for landscape orientation	2023-10-25 11:58:33 -04:00
John Shea	1c31d367a1	Implement edge-to-edge	2023-10-24 11:45:13 -04:00