From 35d2d9b286a6fc96f66e6cd520536da7d85171d5 Mon Sep 17 00:00:00 2001 From: jhg3410 <80373033+jhg3410@users.noreply.github.com> Date: Mon, 16 Jan 2023 22:11:10 +0900 Subject: [PATCH] #1 - Reusing composables --- .../jik/compose/basicscodelab/MainActivity.kt | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Basics_Codelab/app/src/main/java/jik/compose/basicscodelab/MainActivity.kt b/Basics_Codelab/app/src/main/java/jik/compose/basicscodelab/MainActivity.kt index fb048ee..d93ebe2 100644 --- a/Basics_Codelab/app/src/main/java/jik/compose/basicscodelab/MainActivity.kt +++ b/Basics_Codelab/app/src/main/java/jik/compose/basicscodelab/MainActivity.kt @@ -19,21 +19,27 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) setContent { BasicsCodelabTheme { - // A surface container using the 'background' color from the theme - Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colorScheme.background - ) { - Greeting("Android") - } + MyApp(modifier = Modifier.fillMaxSize()) } } } } +@Composable +private fun MyApp(modifier: Modifier = Modifier) { + Surface( + modifier = modifier, + color = MaterialTheme.colorScheme.background + ) { + Greeting("Android") + } +} + @Composable fun Greeting(name: String) { - Surface(color = MaterialTheme.colorScheme.primary) { + Surface( + color = MaterialTheme.colorScheme.primary + ) { Text(text = "Hello $name!", modifier = Modifier.padding(24.dp)) } } @@ -42,6 +48,6 @@ fun Greeting(name: String) { @Composable fun DefaultPreview() { BasicsCodelabTheme { - Greeting("Android") + MyApp() } } \ No newline at end of file