From 1a3a0d4cd7b4282798a92e0f7bcb9b7e686f2109 Mon Sep 17 00:00:00 2001 From: maxnes3 <112558334+maxnes3@users.noreply.github.com> Date: Thu, 16 Nov 2023 03:06:38 +0400 Subject: [PATCH] =?UTF-8?q?=D0=AF=20=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobileapp/components/InputContent.kt | 7 ++++--- .../mobileapp/components/ListContent.kt | 18 +++++++++++------- .../mobileapp/components/NavigationBar.kt | 2 +- .../mobileapp/screens/ListDataScreen.kt | 4 +++- .../mobileapp/screens/ListMailScreen.kt | 5 ++++- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/example/mobileapp/components/InputContent.kt b/app/src/main/java/com/example/mobileapp/components/InputContent.kt index e2a1323..9018e2e 100644 --- a/app/src/main/java/com/example/mobileapp/components/InputContent.kt +++ b/app/src/main/java/com/example/mobileapp/components/InputContent.kt @@ -27,9 +27,10 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.navigation.NavHostController import com.example.mobileapp.ui.theme.MobileAppTheme +val buttonHeightStandard = 72.dp + @OptIn(ExperimentalMaterial3Api::class) @Composable fun PlaceholderInputField(label: String){ @@ -102,7 +103,7 @@ fun IconButton(iconLeft: ImageVector, label: String, backgroundColor: Color, tex onClick = onClickAction, modifier = Modifier .fillMaxWidth() - .requiredHeight(64.dp) + .requiredHeight(buttonHeightStandard) .padding(top = 8.dp, start = 16.dp, bottom = 8.dp, end = 16.dp), colors = ButtonDefaults.buttonColors( containerColor = backgroundColor @@ -134,7 +135,7 @@ fun ActiveButton(label: String, backgroundColor: Color, textColor: Color, onClic onClick = onClickAction, modifier = Modifier .fillMaxWidth() - .requiredHeight(64.dp) + .requiredHeight(buttonHeightStandard) .padding(top = 8.dp, start = 16.dp, bottom = 8.dp, end = 16.dp), colors = ButtonDefaults.buttonColors( containerColor = backgroundColor diff --git a/app/src/main/java/com/example/mobileapp/components/ListContent.kt b/app/src/main/java/com/example/mobileapp/components/ListContent.kt index d3c9248..081b2e9 100644 --- a/app/src/main/java/com/example/mobileapp/components/ListContent.kt +++ b/app/src/main/java/com/example/mobileapp/components/ListContent.kt @@ -44,25 +44,29 @@ import com.example.mobileapp.ui.theme.ButtonColor1 import com.example.mobileapp.ui.theme.ButtonColor2 @Composable -fun DataListScroll(navController: NavHostController){ - val storySingleton = StorySingleton() - +fun DataListScroll(navController: NavHostController, dataList: List){ LazyColumn( horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier .fillMaxWidth() ){ item { - addNewListItem(navController, "editstory") + when(dataList[0]){ + is Story -> addNewListItem(navController, "editstory") + is Mail -> addNewListItem(navController, "editmail") + } } - items(storySingleton.getStoryList()){ item -> - DataListItem(item = item, navController = navController) + items(dataList){ item -> + when(item){ + is Story -> StoryListItem(item = item, navController = navController) + is Mail -> MailListItem(item = item) + } } } } @Composable -fun DataListItem(item: Story, navController: NavHostController){ +fun StoryListItem(item: Story, navController: NavHostController){ val isExpanded = remember { mutableStateOf(false) } diff --git a/app/src/main/java/com/example/mobileapp/components/NavigationBar.kt b/app/src/main/java/com/example/mobileapp/components/NavigationBar.kt index 715f335..578dc5a 100644 --- a/app/src/main/java/com/example/mobileapp/components/NavigationBar.kt +++ b/app/src/main/java/com/example/mobileapp/components/NavigationBar.kt @@ -140,7 +140,7 @@ fun NavigationButton(navController: NavHostController, }, modifier = Modifier .fillMaxWidth() - .requiredHeight(64.dp) + .requiredHeight(72.dp) .padding(top = 8.dp, start = 16.dp, bottom = 8.dp, end = 16.dp), colors = ButtonDefaults.buttonColors( containerColor = backgroundColor diff --git a/app/src/main/java/com/example/mobileapp/screens/ListDataScreen.kt b/app/src/main/java/com/example/mobileapp/screens/ListDataScreen.kt index 8a25837..4df9465 100644 --- a/app/src/main/java/com/example/mobileapp/screens/ListDataScreen.kt +++ b/app/src/main/java/com/example/mobileapp/screens/ListDataScreen.kt @@ -12,16 +12,18 @@ import androidx.compose.ui.Modifier import androidx.navigation.NavHostController import com.example.mobileapp.components.DataListScroll import com.example.mobileapp.components.NavBar +import com.example.mobileapp.entities.StorySingleton import com.example.mobileapp.ui.theme.BackgroundItem1 import com.example.mobileapp.ui.theme.BackgroundItem2 @Composable fun ListDataScreen(navController: NavHostController){ + val storySingleton = StorySingleton() Column( modifier = Modifier .fillMaxSize() .background(BackgroundItem1) ) { - DataListScroll(navController) + DataListScroll(navController, storySingleton.getStoryList()) } } \ No newline at end of file diff --git a/app/src/main/java/com/example/mobileapp/screens/ListMailScreen.kt b/app/src/main/java/com/example/mobileapp/screens/ListMailScreen.kt index 3ff5272..bd15dde 100644 --- a/app/src/main/java/com/example/mobileapp/screens/ListMailScreen.kt +++ b/app/src/main/java/com/example/mobileapp/screens/ListMailScreen.kt @@ -10,18 +10,21 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.navigation.NavHostController +import com.example.mobileapp.components.DataListScroll import com.example.mobileapp.components.MailListScroll import com.example.mobileapp.components.NavBar +import com.example.mobileapp.entities.MailSingleton import com.example.mobileapp.ui.theme.BackgroundItem1 import com.example.mobileapp.ui.theme.BackgroundItem2 @Composable fun ListMailScreen(navController: NavHostController){ + val mailSingleton = MailSingleton() Column( modifier = Modifier .fillMaxSize() .background(BackgroundItem1) ) { - MailListScroll(navController) + DataListScroll(navController, mailSingleton.getMailList()) } } \ No newline at end of file