From 91329cb86d4ed40a5c5ba15c0eebaaa6dc8c60bf Mon Sep 17 00:00:00 2001 From: Danya_Mochalov Date: Fri, 6 Oct 2023 03:31:54 +0400 Subject: [PATCH] preparations --- .idea/vcs.xml | 6 ++++++ .../java/com/example/shawarma/MainActivity.kt | 17 +++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/shawarma/MainActivity.kt b/app/src/main/java/com/example/shawarma/MainActivity.kt index 6ff5d78..dd4fbf0 100644 --- a/app/src/main/java/com/example/shawarma/MainActivity.kt +++ b/app/src/main/java/com/example/shawarma/MainActivity.kt @@ -9,6 +9,7 @@ import androidx.compose.material.Surface import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.Preview import com.example.shawarma.ui.theme.ShawarmaTheme @@ -19,25 +20,13 @@ class MainActivity : ComponentActivity() { ShawarmaTheme { // A surface container using the 'background' color from the theme Surface( - modifier = Modifier.fillMaxSize(), - color = MaterialTheme.colors.background + modifier = Modifier.fillMaxSize() ) { - Greeting("Android") } } } } } -@Composable -fun Greeting(name: String) { - Text(text = "Hello $name!") -} -@Preview(showBackground = true) -@Composable -fun DefaultPreview() { - ShawarmaTheme { - Greeting("Android") - } -} \ No newline at end of file +