diff --git a/app/src/main/java/com/dnsc/plaindo/MainActivity.kt b/app/src/main/java/com/dnsc/plaindo/MainActivity.kt index aa70742..1f702ec 100644 --- a/app/src/main/java/com/dnsc/plaindo/MainActivity.kt +++ b/app/src/main/java/com/dnsc/plaindo/MainActivity.kt @@ -4,13 +4,6 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.tooling.preview.Preview import com.dnsc.plaindo.ui.theme.PlaindoTheme class MainActivity : ComponentActivity() { diff --git a/app/src/main/java/com/dnsc/plaindo/ui/overview/PlaindoOverviewScreen.kt b/app/src/main/java/com/dnsc/plaindo/ui/overview/PlaindoOverviewScreen.kt index f964909..262e1d5 100644 --- a/app/src/main/java/com/dnsc/plaindo/ui/overview/PlaindoOverviewScreen.kt +++ b/app/src/main/java/com/dnsc/plaindo/ui/overview/PlaindoOverviewScreen.kt @@ -1,9 +1,24 @@ package com.dnsc.plaindo.ui.overview +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.dnsc.plaindo.ui.shared.TopBar @Composable fun PlaindoOverviewScreen() { - Text(text = "Overview") + Scaffold( + topBar = { + TopBar(title = "Overview") + } + ) { innerPadding -> + Column( + modifier = Modifier.padding(innerPadding) + ) { + Text(text = "Overview") + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/dnsc/plaindo/ui/settings/PlaindoSettingsScreen.kt b/app/src/main/java/com/dnsc/plaindo/ui/settings/PlaindoSettingsScreen.kt index b7ec2c1..e0cfaaf 100644 --- a/app/src/main/java/com/dnsc/plaindo/ui/settings/PlaindoSettingsScreen.kt +++ b/app/src/main/java/com/dnsc/plaindo/ui/settings/PlaindoSettingsScreen.kt @@ -1,9 +1,24 @@ package com.dnsc.plaindo.ui.settings +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import com.dnsc.plaindo.ui.shared.TopBar @Composable fun PlaindoSettingsScreen() { - Text(text = "Settings") + Scaffold( + topBar = { + TopBar(title = "Settings") + } + ) { innerPadding -> + Column( + modifier = Modifier.padding(innerPadding) + ) { + Text(text = "Settings") + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/dnsc/plaindo/ui/shared/TopBar.kt b/app/src/main/java/com/dnsc/plaindo/ui/shared/TopBar.kt new file mode 100644 index 0000000..987421d --- /dev/null +++ b/app/src/main/java/com/dnsc/plaindo/ui/shared/TopBar.kt @@ -0,0 +1,23 @@ +package com.dnsc.plaindo.ui.shared + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.text.style.TextAlign + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun TopBar(title: String) { + TopAppBar( + title = { + Text( + text = title, + modifier = Modifier.fillMaxWidth(), + textAlign = TextAlign.Left + ) + } + ) +} \ No newline at end of file