.github/renovate.json

@@ -2,10 +2,5 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "local>android/.github:renovate-config"
-  ],
-   "baseBranches": [
-     "main",
-     "starter",
-     "state"
   ]
 }

README.md

@@ -1,21 +1,24 @@
-Kalkulator BMI
+Tip Time - Solution Code
-===============
+=================================
-Langkah-langkah:
 
-1. Clone Repository Project
+Solution code for the [Android Basics with Compose](https://developer.android.com/courses/android-basics-compose/course): Tip Time app.
-Saya meng-clone repository project dari GitHub menggunakan Android Studio untuk dijadikan dasar pengerjaan tugas.
 
-2. Modifikasi Tampilan Aplikasi
-Saya meminta bantuan ChatGPT dan DeepSeek untuk memberikan saran tampilan aplikasi agar lebih menarik. Setelah itu, saya menyesuaikan tampilan sesuai arahan yang diberikan.
 
-3. Mengubah Icon Aplikasi (APK)
+Introduction
-Saya mengganti icon aplikasi melalui fitur Image Asset di Android Studio dengan icon baru sesuai arahan dari ChatGPT.
+------------
+The Tip Time app contains various UI elements for calculating a tip,
+teaching about user input, and State in Compose.
 
-4. Review dan Uji Coba
-Setelah perubahan selesai, saya menjalankan aplikasi untuk memastikan tampilan dan icon sudah berubah dengan baik.
 
-Petunjuk lebih detil dapat dibaca di
+Pre-requisites
-https://docs.google.com/document/d/1iGiC0Bg3Bdcd2Maq45TYkCDUkZ5Ql51E/edit?rtpof=true
+--------------
+* Experience with Kotlin syntax.
+* How to create and run a project in Android Studio.
 
-Starter dimodifikasi dan terinspirasi dari:
+
-https://developer.android.com/codelabs/basic-android-compose-calculate-tip#0
+Getting Started
+---------------
+1. Install Android Studio, if you don't already have it.
+2. Download the sample.
+3. Import the sample into Android Studio.
+4. Build and run the sample.

app/build.gradle.kts

@@ -17,7 +17,6 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 android {
@@ -46,15 +45,18 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = "1.8"
     }
     buildFeatures {
         compose = true
     }
+    composeOptions {
+        kotlinCompilerExtensionVersion = rootProject.extra["compose_compiler_version"].toString()
+    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -65,7 +67,7 @@ android {
 
 dependencies {
 
-    implementation(platform("androidx.compose:compose-bom:2024.12.01"))
+    implementation(platform("androidx.compose:compose-bom:2024.11.00"))
     implementation("androidx.activity:activity-compose:1.9.3")
     implementation("androidx.compose.material3:material3")
     implementation("androidx.compose.ui:ui")
@@ -76,7 +78,7 @@ dependencies {
 
     testImplementation("junit:junit:4.13.2")
 
-    androidTestImplementation(platform("androidx.compose:compose-bom:2024.12.01"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2024.11.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")

app/src/main/AndroidManifest.xml

@@ -20,9 +20,9 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/app_icon"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/app_icon_round"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.TipTime"
         tools:targetApi="33">

app/src/main/java/com/example/tiptime/MainActivity.kt

@@ -54,9 +54,8 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.example.tiptime.ui.theme.TipTimeTheme
-import java.text.DecimalFormat
+import java.text.NumberFormat
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -76,16 +75,13 @@ class MainActivity : ComponentActivity() {
 
 @Composable
 fun TipTimeLayout() {
-    var heightInput by remember { mutableStateOf("") }
+    var amountInput by remember { mutableStateOf("") }
-    var weightInput by remember { mutableStateOf("") }
+    var tipInput by remember { mutableStateOf("") }
-    var useUSC by remember { mutableStateOf(false) }
+    var roundUp by remember { mutableStateOf(false) }
 
-    val height = heightInput.toDoubleOrNull() ?: 0.0
+    val amount = amountInput.toDoubleOrNull() ?: 0.0
-    val weight = weightInput.toDoubleOrNull() ?: 0.0
+    val tipPercent = tipInput.toDoubleOrNull() ?: 0.0
-
+    val tip = calculateTip(amount, tipPercent, roundUp)
-    val bmi = calculateBMI(height, weight, useUSC)
-    val category = calculateBMICategory(bmi)
-    val categoryColor = getCategoryColor(category)
 
     Column(
         modifier = Modifier
@@ -97,61 +93,42 @@ fun TipTimeLayout() {
         verticalArrangement = Arrangement.Center
     ) {
         Text(
-            text = "Calculate BMI",
+            text = stringResource(R.string.calculate_tip),
-            style = MaterialTheme.typography.headlineMedium,
-            color = MaterialTheme.colorScheme.primary,
             modifier = Modifier
                 .padding(bottom = 16.dp, top = 40.dp)
                 .align(alignment = Alignment.Start)
         )
-
         EditNumberField(
-            label = R.string.height,
+            label = R.string.bill_amount,
-            leadingIcon = R.drawable.number,
+            leadingIcon = R.drawable.money,
             keyboardOptions = KeyboardOptions.Default.copy(
                 keyboardType = KeyboardType.Number,
                 imeAction = ImeAction.Next
             ),
-            value = heightInput,
+            value = amountInput,
-            onValueChanged = { heightInput = it },
+            onValueChanged = { amountInput = it },
-            modifier = Modifier
+            modifier = Modifier.padding(bottom = 32.dp).fillMaxWidth(),
-                .padding(bottom = 32.dp)
-                .fillMaxWidth(),
         )
-
         EditNumberField(
-            label = R.string.weight,
+            label = R.string.how_was_the_service,
-            leadingIcon = R.drawable.number,
+            leadingIcon = R.drawable.percent,
             keyboardOptions = KeyboardOptions.Default.copy(
                 keyboardType = KeyboardType.Number,
                 imeAction = ImeAction.Done
             ),
-            value = weightInput,
+            value = tipInput,
-            onValueChanged = { weightInput = it },
+            onValueChanged = { tipInput = it },
-            modifier = Modifier
+            modifier = Modifier.padding(bottom = 32.dp).fillMaxWidth(),
-                .padding(bottom = 32.dp)
-                .fillMaxWidth(),
         )
-
+        RoundTheTipRow(
-        RoundTheUnitRow(
+            roundUp = roundUp,
-            useUSC = useUSC,
+            onRoundUpChanged = { roundUp = it },
-            onUnitChanged = { useUSC = it },
             modifier = Modifier.padding(bottom = 32.dp)
         )
-
         Text(
-            text = "BMI Anda: $bmi",
+            text = stringResource(R.string.tip_amount, tip),
-            style = MaterialTheme.typography.displaySmall,
+            style = MaterialTheme.typography.displaySmall
-            color = MaterialTheme.colorScheme.onSurface
         )
-
-        Text(
-            text = "Kategori: $category",
-            fontSize = 20.sp,
-            color = categoryColor,
-            modifier = Modifier.padding(top = 8.dp)
-        )
-
         Spacer(modifier = Modifier.height(150.dp))
     }
 }
@@ -177,73 +154,37 @@ fun EditNumberField(
 }
 
 @Composable
-fun RoundTheUnitRow(
+fun RoundTheTipRow(
-    useUSC: Boolean,
+    roundUp: Boolean,
-    onUnitChanged: (Boolean) -> Unit,
+    onRoundUpChanged: (Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
     Row(
         modifier = modifier.fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Text(
+        Text(text = stringResource(R.string.round_up_tip))
-            text = "Gunakan Unit (Metric/USC)",
-            color = MaterialTheme.colorScheme.onSurface
-        )
         Switch(
             modifier = Modifier
                 .fillMaxWidth()
                 .wrapContentWidth(Alignment.End),
-            checked = useUSC,
+            checked = roundUp,
-            onCheckedChange = onUnitChanged
+            onCheckedChange = onRoundUpChanged
         )
     }
 }
 
 /**
- * Menghitung BMI berdasarkan rumus yang digunakan
+ * Calculates the tip based on the user input and format the tip amount
+ * according to the local currency.
+ * Example would be "$10.00".
  */
-internal fun calculateBMI(height: Double, weight: Double, useUSC: Boolean): String {
+private fun calculateTip(amount: Double, tipPercent: Double = 15.0, roundUp: Boolean): String {
-    if (height == 0.0 || weight == 0.0) return "0.0"
+    var tip = tipPercent / 100 * amount
-
+    if (roundUp) {
-    val bmi = if (useUSC) {
+        tip = kotlin.math.ceil(tip)
-        // Rumus USC: 703 * (berat (lbs) / (tinggi (in)^2))
-        703 * (weight / (height * height))
-    } else {
-        // Rumus Metric: berat (kg) / (tinggi (m)^2)
-        val heightInMeter = height / 100
-        weight / (heightInMeter * heightInMeter)
-    }
-
-    return DecimalFormat("#.0").format(bmi)
-}
-
-/**
- * Menentukan kategori BMI
- */
-internal fun calculateBMICategory(bmiString: String): String {
-    val bmi = bmiString.toDoubleOrNull() ?: 0.0
-    return when {
-        bmi < 18.5 -> "Underweight"
-        bmi < 25.0 -> "Normal weight"
-        bmi < 30.0 -> "Overweight"
-        bmi >= 30.0 -> "Obese"
-        else -> "Tidak diketahui"
-    }
-}
-
-/**
- * Memberikan warna berdasarkan kategori BMI - menggunakan warna dari tema
- */
-@Composable
-fun getCategoryColor(category: String): androidx.compose.ui.graphics.Color {
-    return when (category) {
-        "Underweight" -> androidx.compose.ui.graphics.Color(0xFF2196F3) // Biru
-        "Normal weight" -> androidx.compose.ui.graphics.Color(0xFF4CAF50) // Hijau
-        "Overweight" -> androidx.compose.ui.graphics.Color(0xFFFF9800) // Orange
-        "Obese" -> androidx.compose.ui.graphics.Color(0xFFF44336) // Merah
-        else -> MaterialTheme.colorScheme.onSurface
     }
+    return NumberFormat.getCurrencyInstance().format(tip)
 }
 
 @Preview(showBackground = true)
@@ -252,4 +193,4 @@ fun TipTimeLayoutPreview() {
     TipTimeTheme {
         TipTimeLayout()
     }
-}
+}

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

@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7.5,11C9.43,11 11,9.43 11,7.5S9.43,4 7.5,4S4,5.57 4,7.5S5.57,11 7.5,11zM7.5,6C8.33,6 9,6.67 9,7.5S8.33,9 7.5,9S6,8.33 6,7.5S6.67,6 7.5,6z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M4.0025,18.5831l14.5875,-14.5875l1.4142,1.4142l-14.5875,14.5875z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M16.5,13c-1.93,0 -3.5,1.57 -3.5,3.5s1.57,3.5 3.5,3.5s3.5,-1.57 3.5,-3.5S18.43,13 16.5,13zM16.5,18c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S17.33,18 16.5,18z"/>
+</vector>

app/src/main/res/mipmap-anydpi-v26/app_icon.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/app_icon_background"/>
-    <foreground android:drawable="@mipmap/app_icon_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/app_icon_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/app_icon_background"/>
-    <foreground android:drawable="@mipmap/app_icon_foreground"/>
-</adaptive-icon>

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

@@ -15,11 +15,10 @@
   ~ limitations under the License.
   -->
 <resources>
-    <string name="app_name">BMI Calculator</string>
+    <string name="app_name">Tip Time</string>
-    <string name="calculate_tip">Calculate BMI</string>
+    <string name="calculate_tip">Calculate Tip</string>
-    <string name="height">Tinggi Badan</string>
+    <string name="bill_amount">Bill Amount</string>
-    <string name="weight">Berat Badan</string>
+    <string name="how_was_the_service">Tip Percentage</string>
-    <string name="use_usc">Gunakan Unit USC (lbs/in)?</string>
+    <string name="round_up_tip">Round up tip?</string>
-    <string name="bmi_calculation">BMI Anda: %s</string>
+    <string name="tip_amount">Tip Amount: %s</string>
-    <string name="bmi_category">Kategori: %s</string>
 </resources>

build.gradle.kts

@@ -14,10 +14,14 @@
  * limitations under the License.
  */
 
+buildscript {
+    extra.apply {
+        set("compose_compiler_version", "1.5.3")
+    }
+}
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.13.0" apply false
+    id("com.android.application") version "8.7.3" apply false
-    id("com.android.library") version "8.13.0" apply false
+    id("com.android.library") version "8.7.3" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.10" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum