diff --git a/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt b/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt index 74743cd..e2c31f1 100644 --- a/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt +++ b/app/src/main/java/com/mirenkov/ktheightmap/MainActivity.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.gestures.detectDragGestures import androidx.compose.foundation.gestures.draggable import androidx.compose.foundation.gestures.rememberDraggableState +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawingPadding @@ -18,6 +19,7 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Build import androidx.compose.material3.FloatingActionButton import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme.colorScheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface @@ -25,6 +27,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Size @@ -106,14 +109,6 @@ fun MapCanvas( } } -@Composable -fun Greeting(name: String, modifier: Modifier = Modifier) { - Text( - text = "Hello $name!", - modifier = modifier - ) -} - @Composable fun ToolButton() { FloatingActionButton( @@ -125,16 +120,21 @@ fun ToolButton() { @Preview(showBackground = true) @Composable -fun GreetingPreview() { +fun MainPreview() { KtHeightMapTheme { - Greeting("Android") - } -} - -@Preview(showBackground = true) -@Composable -fun ToolButtonPreview() { - KtHeightMapTheme { - ToolButton() + Scaffold( + modifier = Modifier.safeDrawingPadding(), + floatingActionButton = { ToolButton() } + ) { innerPadding -> + Box( + modifier = Modifier.padding(innerPadding) + .fillMaxSize(), + contentAlignment = Alignment.Center + ) { + Text( + text = "Gryadki" + ) + } + } } } \ No newline at end of file