From 2172b2a7af344b4844103ebe2666cf81be593cda Mon Sep 17 00:00:00 2001 From: Rakha adi Date: Mon, 20 Oct 2025 16:46:57 +0700 Subject: [PATCH] modifikasi barang --- .gitignore | 26 +- .../com/example/cupcake/data/DataSource.kt | 16 +- .../com/example/cupcake/ui/OrderViewModel.kt | 4 +- .../example/cupcake/ui/StartOrderScreen.kt | 4 +- app/src/main/res/drawable/burger.xml | 630 ++++++++++++++++++ app/src/main/res/values/strings.xml | 20 +- 6 files changed, 677 insertions(+), 23 deletions(-) create mode 100644 app/src/main/res/drawable/burger.xml diff --git a/.gitignore b/.gitignore index 3a2358d..bfb23c3 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,28 @@ proguard-project.txt # Android Studio/IDEA *.iml -.idea \ No newline at end of file +.idea + +# Secara eksplisit mengabaikan folder yang tidak perlu dilacak +.gradle/ +.idea/ +build/ +gradle/ +captures/ +local.properties +*.iml + +# Secara eksplisit mengabaikan file yang biasanya diabaikan +*.jks +*.cer + +# Abaikan SEMUA folder lain di root, kecuali folder 'app' +/* +!/app + +# Pastikan file konfigurasi root yang penting tetap terlacak: +!/.gitignore +!/build.gradle +!/settings.gradle +!/gradlew +!/gradlew.bat \ No newline at end of file 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..63d74e4 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.original_burger, + R.string.black_burger, + R.string.Cheese_burger, + R.string.chicken_burger, + R.string.veggie_burger ) 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_burger, 1), + Pair(R.string.six_burger, 6), + Pair(R.string.twelve_burger, 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..2553551 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_CUPCAKE = 200000 /** 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 = 300000 /** * [OrderViewModel] holds information about a cupcake order in terms of quantity, flavor, and 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..48c6ade 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.burger), 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_burger), style = MaterialTheme.typography.headlineSmall ) Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_small))) diff --git a/app/src/main/res/drawable/burger.xml b/app/src/main/res/drawable/burger.xml new file mode 100644 index 0000000..da2ece8 --- /dev/null +++ b/app/src/main/res/drawable/burger.xml @@ -0,0 +1,630 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d8fcaa..e198975 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 + BurgerKings + Order Burger + One Burger + Six burger + Twelve burger Choose Flavor - Vanilla - Chocolate - Red Velvet - Salted Caramel - Coffee + Cheese Burger + Chicken Burger + Veggie Burger + Black Burger + Original Burger Special Flavor Cancel Next