From 252c7be5cc71330bf715fb52a2e79beb9ba02196 Mon Sep 17 00:00:00 2001 From: jhg3410 <80373033+jhg3410@users.noreply.github.com> Date: Mon, 30 Jan 2023 00:59:19 +0900 Subject: [PATCH] #3 - State in Compose --- .../compose/basicstatecodelab/MainActivity.kt | 15 +-------------- .../compose/basicstatecodelab/WaterCounter.kt | 16 ++++++++++++++++ .../compose/basicstatecodelab/WellnessScreen.kt | 10 ++++++++++ 3 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WaterCounter.kt create mode 100644 BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WellnessScreen.kt diff --git a/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/MainActivity.kt b/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/MainActivity.kt index 4fd3e0c..64e8613 100644 --- a/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/MainActivity.kt +++ b/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/MainActivity.kt @@ -22,22 +22,9 @@ class MainActivity : ComponentActivity() { modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background ) { - Greeting("Android") + WellnessScreen() } } } } -} - -@Composable -fun Greeting(name: String) { - Text(text = "Hello $name!") -} - -@Preview(showBackground = true) -@Composable -fun DefaultPreview() { - BasicStateCodelabTheme { - Greeting("Android") - } } \ No newline at end of file diff --git a/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WaterCounter.kt b/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WaterCounter.kt new file mode 100644 index 0000000..c21ca4e --- /dev/null +++ b/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WaterCounter.kt @@ -0,0 +1,16 @@ +package jik.compose.basicstatecodelab + +import androidx.compose.foundation.layout.padding +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + +@Composable +fun WaterCounter(modifier: Modifier = Modifier) { + val count = 0 + Text( + text = "You've had $count glasses", + modifier = modifier.padding(16.dp) + ) +} \ No newline at end of file diff --git a/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WellnessScreen.kt b/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WellnessScreen.kt new file mode 100644 index 0000000..24aac50 --- /dev/null +++ b/BasicStateCodelab/app/src/main/java/jik/compose/basicstatecodelab/WellnessScreen.kt @@ -0,0 +1,10 @@ +package jik.compose.basicstatecodelab + +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + + +@Composable +fun WellnessScreen(modifier: Modifier = Modifier) { + WaterCounter(modifier) +} \ No newline at end of file