diff --git a/app/src/main/java/com/example/pagingapp/MainActivity.kt b/app/src/main/java/com/example/pagingapp/MainActivity.kt index 5a86350..0e77cf0 100644 --- a/app/src/main/java/com/example/pagingapp/MainActivity.kt +++ b/app/src/main/java/com/example/pagingapp/MainActivity.kt @@ -17,6 +17,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import com.example.pagingapp.ui.theme.PagingAppTheme +import com.example.pagingapp.views.AboutView import com.example.pagingapp.views.SettingView class MainActivity : ComponentActivity() { @@ -59,6 +60,7 @@ fun App(){ OperationState.About ->{ println("about clicked") + AboutView(modifier = Modifier.padding(innerPadding)) } OperationState.Exit -> { // dialog confirmation exit diff --git a/app/src/main/java/com/example/pagingapp/views/About.kt b/app/src/main/java/com/example/pagingapp/views/About.kt index 9ea3bce..0edf4c7 100644 --- a/app/src/main/java/com/example/pagingapp/views/About.kt +++ b/app/src/main/java/com/example/pagingapp/views/About.kt @@ -1,9 +1,32 @@ package com.example.pagingapp.views +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Text import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.example.pagingapp.R @Composable -fun AboutView(mod: Modifier = Modifier){ +fun AboutView(modifier: Modifier = Modifier){ + Row(modifier = modifier.fillMaxSize().padding(16.dp), verticalAlignment = Alignment.CenterVertically) + { + Image(painter = painterResource(R.drawable.gtcbackground240), contentDescription = "About Image") + Spacer(modifier = Modifier.width(8.dp)) + Column{ + Text("VX-3000 Paging App", modifier = Modifier.padding(8.dp).fillMaxWidth(), textAlign = TextAlign.Center) + Text("Version 1.0.0", modifier = Modifier.padding(8.dp).fillMaxWidth(), textAlign = TextAlign.Center) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/pagingapp/views/Group.kt b/app/src/main/java/com/example/pagingapp/views/Group.kt index 5f95b80..38fbe17 100644 --- a/app/src/main/java/com/example/pagingapp/views/Group.kt +++ b/app/src/main/java/com/example/pagingapp/views/Group.kt @@ -4,6 +4,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @Composable -fun GroupView(mod: Modifier = Modifier){ +fun GroupView(modifier: Modifier = Modifier){ } \ No newline at end of file diff --git a/app/src/main/java/com/example/pagingapp/views/Zone.kt b/app/src/main/java/com/example/pagingapp/views/Zone.kt index e8d19d7..2825c7a 100644 --- a/app/src/main/java/com/example/pagingapp/views/Zone.kt +++ b/app/src/main/java/com/example/pagingapp/views/Zone.kt @@ -4,6 +4,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @Composable -fun ZoneView(mod: Modifier = Modifier){ +fun ZoneView(modifier: Modifier = Modifier){ } \ No newline at end of file diff --git a/app/src/main/res/drawable/gtcbackground240.png b/app/src/main/res/drawable/gtcbackground240.png new file mode 100644 index 0000000..fa9275a Binary files /dev/null and b/app/src/main/res/drawable/gtcbackground240.png differ