.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,10 +1,24 @@
-Kalkulator BMI
+Tip Time - Solution Code
-===============
+=================================
 
-Silahkan kembangkan aplikasi ini untuk melakukan perhitungan BMI
+Solution code for the [Android Basics with Compose](https://developer.android.com/courses/android-basics-compose/course): Tip Time app.
 
-Petunjuk lebih detil dapat dibaca di
-https://docs.google.com/document/d/1iGiC0Bg3Bdcd2Maq45TYkCDUkZ5Ql51E/edit?rtpof=true
 
-Starter dimodifikasi dan terinspirasi dari:
+Introduction
-https://developer.android.com/codelabs/basic-android-compose-calculate-tip#0
+------------
+The Tip Time app contains various UI elements for calculating a tip,
+teaching about user input, and State in Compose.
+
+
+Pre-requisites
+--------------
+* Experience with Kotlin syntax.
+* How to create and run a project in Android Studio.
+
+
+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/java/com/example/tiptime/MainActivity.kt

@@ -79,10 +79,9 @@ fun TipTimeLayout() {
     var tipInput by remember { mutableStateOf("") }
     var roundUp by remember { mutableStateOf(false) }
 
-    val BmiHeight = amountInput.toDoubleOrNull() ?: 0.0
+    val amount = amountInput.toDoubleOrNull() ?: 0.0
-    val BmiWeight = tipInput.toDoubleOrNull() ?: 0.0
+    val tipPercent = tipInput.toDoubleOrNull() ?: 0.0
-    val bmi = calculateBMI(BmiHeight, BmiWeight, roundUp)
+    val tip = calculateTip(amount, tipPercent, roundUp)
-    val category = calculateBMICategory(BmiHeight, BmiWeight, roundUp)
 
     Column(
         modifier = Modifier
@@ -100,8 +99,8 @@ fun TipTimeLayout() {
                 .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
@@ -111,8 +110,8 @@ fun TipTimeLayout() {
             modifier = Modifier.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
@@ -127,14 +126,9 @@ fun TipTimeLayout() {
             modifier = Modifier.padding(bottom = 32.dp)
         )
         Text(
-            text = stringResource(R.string.bmi_calculation, bmi),
+            text = stringResource(R.string.tip_amount, tip),
             style = MaterialTheme.typography.displaySmall
         )
-        Text(
-            text = stringResource(R.string.bmi_category, category),
-            style = MaterialTheme.typography.displaySmall
-        )
-
         Spacer(modifier = Modifier.height(150.dp))
     }
 }
@@ -169,7 +163,7 @@ fun RoundTheTipRow(
         modifier = modifier.fillMaxWidth(),
         verticalAlignment = Alignment.CenterVertically
     ) {
-        Text(text = stringResource(R.string.use_usc))
+        Text(text = stringResource(R.string.round_up_tip))
         Switch(
             modifier = Modifier
                 .fillMaxWidth()
@@ -181,34 +175,22 @@ fun RoundTheTipRow(
 }
 
 /**
- * Calculates the BMI
+ * Calculates the tip based on the user input and format the tip amount
- *
+ * according to the local currency.
- * Catatan: tambahkan unit test untuk kalkulasi BMI ini
+ * Example would be "$10.00".
  */
-private fun calculateBMI(BmiHeight: Double, BmiWeight: Double = 15.0, roundUp: Boolean): String {
+private fun calculateTip(amount: Double, tipPercent: Double = 15.0, roundUp: Boolean): String {
-    var bmi = BmiWeight / 100 * BmiHeight
+    var tip = tipPercent / 100 * amount
     if (roundUp) {
-        bmi = kotlin.math.ceil(bmi)
+        tip = kotlin.math.ceil(tip)
     }
-    return NumberFormat.getNumberInstance().format(bmi)
+    return NumberFormat.getCurrencyInstance().format(tip)
 }
-/**
- * Calculates the BMI Category
- *
- * Catatan: tambahkan unit test untuk kalkulasi BMI ini
- */
 
-private fun calculateBMICategory(BmiHeight: Double, BmiWeight: Double = 15.0, roundUp: Boolean): String {
-    var bmi = BmiWeight / 100 * BmiHeight
-    if (roundUp) {
-        bmi = kotlin.math.ceil(bmi)
-    }
-    return NumberFormat.getNumberInstance().format(bmi)
-}
 @Preview(showBackground = true)
 @Composable
 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/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