Skip to content

Fix/add to list #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohamedd-hassan merged 4 commits into from
Aug 19, 2025
Merged

Fix/add to list #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f2184f
fix: add to list dialog scroll
mohamedd-hassan Aug 19, 2025
eb5ea28
fix: item count update when creating list
mohamedd-hassan Aug 19, 2025
af02964
refactor: remove logs from details viewmodel
mohamedd-hassan Aug 19, 2025
d11b353
refactor: change function call order
mohamedd-hassan Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions ui/src/main/java/com/amsterdam/ui/screens/movieDetails/components/AddToListDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
package com.amsterdam.ui.screens.movieDetails.components

import android.annotation.SuppressLint
import androidx.compose.foundation.background
import androidx.compose.foundation.border
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.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
Expand All @@ -35,6 +36,7 @@ import com.amsterdam.ui.components.EmptyStateText
import com.amsterdam.ui.utils.withEnglishDigits
import com.amsterdam.viewmodel.movieDetails.WishListUiState

@SuppressLint("ConfigurationScreenWidthHeight")
@Composable
fun AddToListDialog(
userLists: List<WishListUiState>,
Expand All @@ -46,10 +48,11 @@ fun AddToListDialog(
onCreateNewList: () -> Unit = {},
onDismiss: () -> Unit = {},
) {
val maxDialogHeight = (LocalConfiguration.current.screenHeightDp * 0.8).dp
Dialog(
onDismiss = onDismiss,
scrollable = false,
modifier = modifier,
scrollable = true,
modifier = modifier.heightIn(max = maxDialogHeight),
Comment thread
eslam-99 marked this conversation as resolved.
) {
Column(
verticalArrangement = Arrangement.spacedBy(24.dp),
Expand All @@ -59,11 +62,11 @@ fun AddToListDialog(
onDismiss = onDismiss,
)
if (userLists.isNotEmpty()) {
LazyColumn(
Column(
verticalArrangement = Arrangement.spacedBy(12.dp),
modifier = Modifier.fillMaxWidth()
) {
items(userLists) { userList ->
userLists.forEach { userList ->
SelectionListItem(
listName = userList.name,
itemCount = userList.itemCount,
Expand Down Expand Up @@ -146,7 +149,8 @@ private fun SelectionListItem(
color = AppTheme.color.body,
)

val listItemCount = pluralStringResource(R.plurals.item_count, itemCount, itemCount).withEnglishDigits()
val listItemCount =
pluralStringResource(R.plurals.item_count, itemCount, itemCount).withEnglishDigits()
Text(
text = listItemCount,
style = AppTheme.textStyle.label.small,
Expand Down Expand Up @@ -205,7 +209,7 @@ private fun ActionButtonsSection(
isLoading = false,
isNegative = false,
colors = ButtonDefaults.buttonColors(containerColor = AppTheme.color.primaryVariant)
)
)
}
}

Expand Down
20 changes: 18 additions & 2 deletions viewModel/src/main/java/com/amsterdam/viewmodel/movieDetails/MovieDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,8 @@ class MovieDetailsViewModel @Inject constructor(
},
onSuccess = { listId ->
sendNewEffect(MovieDetailsEffect.ListCreatedSuccessfully)
setNewList(listId.toLong(), state.value.listName)
onSaveMovieToList(state.value.movieId, listOf(listId.toLong()))
loadWishLists()
setListToAdded(listOf(listId.toLong()))
},
onError = {
sendNewEffect(MovieDetailsEffect.FailedToCreateList)
Expand All @@ -307,6 +306,23 @@ class MovieDetailsViewModel @Inject constructor(
)
}

private fun setNewList(listId: Long, listName: String){
val newWishList = state.value.userLists.toMutableList()
newWishList.add(
WishListUiState(
id = listId,
name = listName,
itemCount = 0,
isMovieInList = true
)
)
updateState {
it.copy(
userLists = newWishList
)
}
}

override fun onSelectedListChange(selectedLists: List<WishListUiState>) {
updateState { it.copy(selectedLists = selectedLists) }
}
Expand Down