From 4bc9bd70ad46b2cf851b2e322840e9b32c4ee9f1 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 12:42:00 -0400 Subject: [PATCH 01/13] - maps the JSON field shared_code to the Kotlin property sharedCode - maps the JSON field created_at - maps the JSON field item_count --- .../java/com/example/listifyjetapp/model/ListModel.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt b/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt index 09016c6..b58a842 100644 --- a/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt +++ b/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt @@ -1,11 +1,14 @@ package com.example.listifyjetapp.model -import java.time.LocalDateTime +import com.google.gson.annotations.SerializedName data class ListModel( val id: Int, val name: String, val share: Boolean, - val shareCode: String, // can be UUID or String - val createdAt: LocalDateTime + //val sharedCode: String, // can be UUID or String + //val createdAt: LocalDateTime + @SerializedName("shared_code") val sharedCode: String, + @SerializedName("created_at") val createdAt: String, + @SerializedName("item_count") val itemCount: Int, ) From 6988d2048958f69194546b3fade59f7de9bffc4e Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 12:44:25 -0400 Subject: [PATCH 02/13] - add colours --- app/src/main/java/com/example/listifyjetapp/ui/theme/Color.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/example/listifyjetapp/ui/theme/Color.kt b/app/src/main/java/com/example/listifyjetapp/ui/theme/Color.kt index 6b65d4a..d525909 100644 --- a/app/src/main/java/com/example/listifyjetapp/ui/theme/Color.kt +++ b/app/src/main/java/com/example/listifyjetapp/ui/theme/Color.kt @@ -12,6 +12,8 @@ val Pink40 = Color(0xFF7D5260) object ListifyColor { val SplashYellow = Color(0xFFFFCA3A) + val TextBlack = Color(0xff000000) val TextDark = Color(0xff3e4e50) val TextGrey = Color(0xff858585) + val IconGreen = Color(0xff0cc25f) } From 3c32bebbfd303accd95350aadb4d333160b5d750 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 12:48:51 -0400 Subject: [PATCH 03/13] - Create app top bar composable - check if top bar is in ListsScreen - check if goBackIcon is null --- .../listifyjetapp/widgets/ListifyTopBar.kt | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 app/src/main/java/com/example/listifyjetapp/widgets/ListifyTopBar.kt diff --git a/app/src/main/java/com/example/listifyjetapp/widgets/ListifyTopBar.kt b/app/src/main/java/com/example/listifyjetapp/widgets/ListifyTopBar.kt new file mode 100644 index 0000000..fae85b5 --- /dev/null +++ b/app/src/main/java/com/example/listifyjetapp/widgets/ListifyTopBar.kt @@ -0,0 +1,59 @@ +package com.example.listifyjetapp.widgets + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material3.CenterAlignedTopAppBar +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults.topAppBarColors +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp + +@OptIn(ExperimentalMaterial3Api::class) +@Preview +@Composable +fun ListifyTopBar( + title: String = "Screen Tittle", + isListsScreen: Boolean = true, + goBackIcon: ImageVector? = null, + onGoBackButtonClicked: () -> Unit = {} +) { + + CenterAlignedTopAppBar( + //modifier = Modifier.shadow(elevation = 5.dp), + colors = topAppBarColors(containerColor = Color.Transparent), + title = { + Text(text = title, fontWeight = FontWeight.ExtraBold, fontSize = 24.sp) + }, + actions = { + if (isListsScreen) { + IconButton(onClick = { }) { + Icon( + modifier = Modifier.size(24.dp), + imageVector = Icons.Default.Add, + contentDescription = "Add list icon" + ) + } + } + }, + navigationIcon = { + if (goBackIcon != null) { + Icon( + imageVector = goBackIcon, + contentDescription = "GO back icon", + modifier = Modifier.size(24.dp).clickable { onGoBackButtonClicked.invoke() } + ) + } + } + ) +} \ No newline at end of file From d227eab730984d1cd5bfe286ebe0be493e05252f Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 12:53:35 -0400 Subject: [PATCH 04/13] - Create search bar composable --- .../listifyjetapp/widgets/ListifySearchBar.kt | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 app/src/main/java/com/example/listifyjetapp/widgets/ListifySearchBar.kt diff --git a/app/src/main/java/com/example/listifyjetapp/widgets/ListifySearchBar.kt b/app/src/main/java/com/example/listifyjetapp/widgets/ListifySearchBar.kt new file mode 100644 index 0000000..8443b5f --- /dev/null +++ b/app/src/main/java/com/example/listifyjetapp/widgets/ListifySearchBar.kt @@ -0,0 +1,61 @@ +package com.example.listifyjetapp.widgets + + +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.text.input.InputTransformation.Companion.keyboardOptions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Search +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.unit.dp +import com.example.listifyjetapp.ui.theme.ListifyColor + + +@Composable +fun ListifySearchBar( + searchTextValue: MutableState, + onValueChange: (String) -> Unit, + imeAction: ImeAction = ImeAction.Next, // what happen when you press "Next" + keyboardAction: KeyboardActions = KeyboardActions.Default // what to do when an action is triggered +) { + TextField( + modifier = Modifier.fillMaxWidth(), + shape = RoundedCornerShape(12.dp), + colors = TextFieldDefaults.colors( + unfocusedIndicatorColor = Color.Transparent, + focusedIndicatorColor = Color.Transparent, + disabledIndicatorColor = Color.Transparent, + + unfocusedLabelColor = ListifyColor.TextDark.copy(0.1f), + focusedContainerColor = ListifyColor.TextDark.copy(0.1f), + cursorColor = ListifyColor.TextDark, + ), + singleLine = true, + maxLines = 1, + leadingIcon = { + Icon( + imageVector = Icons.Default.Search, + contentDescription = "Search icon", + ) + }, + + value = searchTextValue.value, + onValueChange = onValueChange, + placeholder = { Text(text="Search") }, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text), // Sets the keyboard to normal text input. + keyboardActions = keyboardAction, + ) +} \ No newline at end of file From 1449a219f8d0eea0e825e98ae1d02d6b706a2095 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 12:59:52 -0400 Subject: [PATCH 05/13] - add isLoading state - Sets isLoading = true while waiting for the result. - resets isLoading to false --- .../screens/lists/ListsViewModel.kt | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListsViewModel.kt b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListsViewModel.kt index c96eee0..893ed77 100644 --- a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListsViewModel.kt +++ b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListsViewModel.kt @@ -1,29 +1,35 @@ package com.example.listifyjetapp.screens.lists import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.example.listifyjetapp.data.ListifyResult import com.example.listifyjetapp.model.ListModel import com.example.listifyjetapp.repository.ListsRepository import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.delay import kotlinx.coroutines.launch import javax.inject.Inject @HiltViewModel class ListsViewModel @Inject constructor(private val repository: ListsRepository): ViewModel() { val lists = mutableStateListOf() + var isLoading = mutableStateOf(false) fun getUserLists(userId: Int) { viewModelScope.launch { - val result = repository.getUserLists(userId = userId) - when(result) { - is ListifyResult.Success -> { - lists.clear() - lists.addAll(result.data) + isLoading.value = true + val result = repository.getUserLists(userId = userId) + when (result) { + is ListifyResult.Success -> { + lists.clear() + lists.addAll(result.data) + } + + is ListifyResult.Failure -> Unit } - is ListifyResult.Failure -> Unit - } + isLoading.value = false } } } \ No newline at end of file From fe499a36c0d49140d8469452956b103773c2a069 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 14:31:44 -0400 Subject: [PATCH 06/13] - add top bar + search bar - track isLoading + load lists if isLoading is true --- .../screens/lists/ListifyListsScreen.kt | 139 +++++++++++++++++- 1 file changed, 131 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt index d313af2..9f4414f 100644 --- a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt +++ b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt @@ -1,17 +1,42 @@ package com.example.listifyjetapp.screens.lists +import android.util.Log +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.text.KeyboardActions +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material.icons.filled.Share +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel +import com.example.listifyjetapp.ui.theme.ListifyColor +import com.example.listifyjetapp.widgets.ListifySearchBar +import com.example.listifyjetapp.widgets.ListifyTopBar @Composable fun ListifyListsScreen( @@ -19,22 +44,120 @@ fun ListifyListsScreen( ) { LaunchedEffect(Unit) { viewModel.getUserLists(4) } - Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding -> + Scaffold( + modifier = Modifier.fillMaxSize(), + topBar = { ListifyTopBar( + title = "Lists", + isListsScreen = true, + ) } + ) { innerPadding -> Surface( modifier = Modifier.fillMaxSize().padding(innerPadding) ) { + Column( + modifier = Modifier.padding(horizontal = 16.dp), + verticalArrangement = Arrangement.Top, + horizontalAlignment = Alignment.CenterHorizontally + ) { + //val lists =viewModel.lists + //Log.d("Lists", lists.toString()) + val searchTextState = rememberSaveable { mutableStateOf("") } + val keyboardController = LocalSoftwareKeyboardController.current - if (viewModel.lists.isEmpty()) { - Text(text = "You don't have any lists yet.") - } else { - LazyColumn { - items(viewModel.lists) {list -> - Text(text = list.name) + ListifySearchBar( + searchTextValue = searchTextState, + onValueChange = {searchTextState.value = it}, + keyboardAction = KeyboardActions{ + // Trigger search logic or hide keyboard + searchTextState.value.trim() // perform the search + searchTextState.value = "" // clear text field when click Done, Next, etc + keyboardController?.hide() // hide keyboard + } + ) + //Text(text = "You don't have any lists yet.") + + if (viewModel.isLoading.value) { + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator() + } + } else if (viewModel.lists.isEmpty()) { + Text(text = "You don't have any lists yet.") + } else { + LazyColumn(modifier = Modifier.padding( + vertical = 16.dp, + horizontal = 8.dp + )){ + + items(viewModel.lists) {list -> + Log.d("list", list.itemCount.toString()) + Row( + modifier = Modifier + .clickable { } + .padding(vertical = 16.dp) + .fillMaxWidth() + .background(Color.Transparent) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + // List info + Column { + Text( + text = list.name, + color = ListifyColor.TextBlack, + fontSize = 20.sp, + //fontWeight = FontWeight.SemiBold + ) + + if (list.share) { + Row { + Icon( + modifier = Modifier.size(16.dp), + tint = ListifyColor.IconGreen, + imageVector = Icons.Default.Share, + contentDescription = "Shared with" + + ) + } + } + + Text( + text = list.createdAt, + color = ListifyColor.TextGrey, + fontSize = 16.sp + ) + } + // List setting menu + + Row() { + Text( + text = list.itemCount.toString(), + color = ListifyColor.TextGrey, + fontSize = 16.sp + ) + + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = "Forward icon" + ) + + } + + } + + } + HorizontalDivider() + + } } } } } } - } \ No newline at end of file From d2f7e6fdfb37fe3fb255f3c2bbc8190f1958deac Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 14:45:23 -0400 Subject: [PATCH 07/13] - ignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index aa724b7..86f1fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ .externalNativeBuild .cxx local.properties +/app/src/main/java/com/example/listifyjetapp/utils/constants/Constants.kt \ No newline at end of file From c606fb756de6ff013cc4bec01a949a8241a14959 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 21:59:19 -0400 Subject: [PATCH 08/13] - create User model - create SharedUsers model --- .../com/example/listifyjetapp/model/User.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 app/src/main/java/com/example/listifyjetapp/model/User.kt diff --git a/app/src/main/java/com/example/listifyjetapp/model/User.kt b/app/src/main/java/com/example/listifyjetapp/model/User.kt new file mode 100644 index 0000000..706255e --- /dev/null +++ b/app/src/main/java/com/example/listifyjetapp/model/User.kt @@ -0,0 +1,17 @@ +package com.example.listifyjetapp.model + +import com.google.gson.annotations.SerializedName + +data class User( + val id: Int, + val username: String, + val email: String, + val password: String, + @SerializedName("created_at") val createdAt: String +) + +data class SharedUsers( + @SerializedName("user_id") val userId: Int, + val username: String, +) + From df6e1576baa5f42e3ceaf7d6b8b3879a06728564 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 22:01:41 -0400 Subject: [PATCH 09/13] - add sharedWidth field --- app/src/main/java/com/example/listifyjetapp/model/ListModel.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt b/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt index b58a842..6d8079e 100644 --- a/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt +++ b/app/src/main/java/com/example/listifyjetapp/model/ListModel.kt @@ -11,4 +11,5 @@ data class ListModel( @SerializedName("shared_code") val sharedCode: String, @SerializedName("created_at") val createdAt: String, @SerializedName("item_count") val itemCount: Int, + @SerializedName("shared_with") val sharedWith: List ) From c77faa7057f5bb35e603591008f2c12cdc3a0286 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 22:06:36 -0400 Subject: [PATCH 10/13] - create composable to show info of each list --- .../listifyjetapp/screens/lists/ListRow.kt | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt diff --git a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt new file mode 100644 index 0000000..c10a9d4 --- /dev/null +++ b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt @@ -0,0 +1,95 @@ +package com.example.listifyjetapp.screens.lists + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight +import androidx.compose.material.icons.filled.Share +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.example.listifyjetapp.model.ListModel +import com.example.listifyjetapp.ui.theme.ListifyColor + +@Composable +fun ListItemComposable( + list: ListModel, + //viewModel: User +) { + Row( + modifier = Modifier + .clickable { } + .padding(vertical = 16.dp) + .fillMaxWidth() + .background(Color.Transparent) + ) { + Row( + modifier = Modifier.fillMaxWidth(), + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween + ) { + // List info + Column { + Text( + text = list.name, + color = ListifyColor.TextBlack, + fontSize = 20.sp, + //fontWeight = FontWeight.SemiBold + ) + + if (list.share) { + Row { + Icon( + modifier = Modifier.size(16.dp), + tint = ListifyColor.IconGreen, + imageVector = Icons.Default.Share, + contentDescription = "Shared with" + ) + Text( + text = list.sharedWith.take(8).joinToString(", ") { it.username }, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + } + } + + Text( + text = list.createdAt, + color = ListifyColor.TextGrey, + fontSize = 16.sp + ) + } + // List setting menu + + Row() { + Text( + text = list.itemCount.toString(), + color = ListifyColor.TextGrey, + fontSize = 16.sp + ) + + Icon( + imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, + contentDescription = "Forward icon" + ) + + } + + } + + } + HorizontalDivider() +} \ No newline at end of file From b1347d490aa3b3e0fbf0c40fa87a42f152741f76 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 22:08:01 -0400 Subject: [PATCH 11/13] - rename composable --- .../java/com/example/listifyjetapp/screens/lists/ListRow.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt index c10a9d4..46a6875 100644 --- a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt +++ b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt @@ -25,7 +25,7 @@ import com.example.listifyjetapp.model.ListModel import com.example.listifyjetapp.ui.theme.ListifyColor @Composable -fun ListItemComposable( +fun ListRow( list: ListModel, //viewModel: User ) { From f9def51e42a9ff2fae20712296d1a3c0a34a8819 Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 22:08:10 -0400 Subject: [PATCH 12/13] - render ListRow --- .../screens/lists/ListifyListsScreen.kt | 73 +------------------ 1 file changed, 1 insertion(+), 72 deletions(-) diff --git a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt index 9f4414f..8b6ae67 100644 --- a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt +++ b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListifyListsScreen.kt @@ -1,25 +1,15 @@ package com.example.listifyjetapp.screens.lists import android.util.Log -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.text.KeyboardActions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight -import androidx.compose.material.icons.filled.Share import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Icon import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -29,12 +19,9 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel -import com.example.listifyjetapp.ui.theme.ListifyColor import com.example.listifyjetapp.widgets.ListifySearchBar import com.example.listifyjetapp.widgets.ListifyTopBar @@ -93,66 +80,8 @@ fun ListifyListsScreen( )){ items(viewModel.lists) {list -> - Log.d("list", list.itemCount.toString()) - Row( - modifier = Modifier - .clickable { } - .padding(vertical = 16.dp) - .fillMaxWidth() - .background(Color.Transparent) - ) { - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.SpaceBetween - ) { - // List info - Column { - Text( - text = list.name, - color = ListifyColor.TextBlack, - fontSize = 20.sp, - //fontWeight = FontWeight.SemiBold - ) - if (list.share) { - Row { - Icon( - modifier = Modifier.size(16.dp), - tint = ListifyColor.IconGreen, - imageVector = Icons.Default.Share, - contentDescription = "Shared with" - - ) - } - } - - Text( - text = list.createdAt, - color = ListifyColor.TextGrey, - fontSize = 16.sp - ) - } - // List setting menu - - Row() { - Text( - text = list.itemCount.toString(), - color = ListifyColor.TextGrey, - fontSize = 16.sp - ) - - Icon( - imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight, - contentDescription = "Forward icon" - ) - - } - - } - - } - HorizontalDivider() + ListRow(list) } } From 8ff17e2796454698293f0c6a8554852dcf9b748b Mon Sep 17 00:00:00 2001 From: jiyu13 Date: Wed, 23 Jul 2025 22:23:30 -0400 Subject: [PATCH 13/13] - add padding to list info column - center aligned list share row - style list share text --- .../listifyjetapp/screens/lists/ListRow.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt index 46a6875..a479b26 100644 --- a/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt +++ b/app/src/main/java/com/example/listifyjetapp/screens/lists/ListRow.kt @@ -42,7 +42,10 @@ fun ListRow( horizontalArrangement = Arrangement.SpaceBetween ) { // List info - Column { + Column( + modifier = Modifier.padding(horizontal = 8.dp), + + ) { Text( text = list.name, color = ListifyColor.TextBlack, @@ -51,7 +54,9 @@ fun ListRow( ) if (list.share) { - Row { + Row( + verticalAlignment = Alignment.CenterVertically + ) { Icon( modifier = Modifier.size(16.dp), tint = ListifyColor.IconGreen, @@ -59,9 +64,11 @@ fun ListRow( contentDescription = "Shared with" ) Text( - text = list.sharedWith.take(8).joinToString(", ") { it.username }, + text = list.sharedWith.take(3).joinToString(", ") { it.username }, maxLines = 1, - overflow = TextOverflow.Ellipsis + overflow = TextOverflow.Ellipsis, + color = ListifyColor.TextGrey, + fontSize = 16.sp ) } }