Skip to content

Flt 23 컬렉션 생성 수정사항 반영 #214

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
chanmi1125 merged 4 commits into from
Jun 17, 2026
+106 −89
Merged

Flt 23 컬렉션 생성 수정사항 반영 #214

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b03b0f
[feat] 컬렉션 생성 AddContentScreen.kt 하단 그라데이션
chanmi1125 Jun 16, 2026
951684a
[refactor] 컬렉션 생성 '이 작품을 선택한 이유' 버튼 활성화 필수 항목으로 만들기
chanmi1125 Jun 16, 2026
822c5f4
[refactor]충돌 해결
chanmi1125 Jun 17, 2026
2f23a9a
Merge branch 'develop' into FLT-23-컬렉션-생성-수정사항-반영
chanmi1125 Jun 17, 2026
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
190 changes: 103 additions & 87 deletions app/src/main/java/com/flint/presentation/collectioncreate/AddContentScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.flint.presentation.collectioncreate

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Spacer
Expand All @@ -22,7 +23,10 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.tooling.preview.Preview
Expand Down Expand Up @@ -95,109 +99,121 @@ fun AddContentScreen(
}
}

Column(
Box(
modifier = modifier
.fillMaxWidth()
.fillMaxSize()
.background(color = FlintTheme.colors.background),
) {
FlintBackTopAppbar(
onClick = onBackClick,
title = "작품 추가하기",
actionText = "추가",
onActionClick = {
if (selectedContents.isNotEmpty()) {
onActionClick()
}
},
textStyle = if (selectedContents.isNotEmpty()) FlintTheme.typography.body1M16 else FlintTheme.typography.body1Sb16,
textColor = if (selectedContents.isNotEmpty()) FlintTheme.colors.secondary400 else FlintTheme.colors.gray300,
)
Column(modifier = Modifier.fillMaxSize()) {
FlintBackTopAppbar(
onClick = onBackClick,
title = "작품 추가하기",
actionText = "추가",
onActionClick = {
if (selectedContents.isNotEmpty()) {
onActionClick()
}
},
textStyle = if (selectedContents.isNotEmpty()) FlintTheme.typography.body1M16 else FlintTheme.typography.body1Sb16,
textColor = if (selectedContents.isNotEmpty()) FlintTheme.colors.secondary400 else FlintTheme.colors.gray300,
)

Spacer(modifier = Modifier.height(12.dp))

FlintSearchTextField(
placeholder = "추천하고 싶은 작품을 검색해보세요",
value = uiState.searchText,
onValueChanged = onSearchTextChanged,
onSearchAction = {},
onClearAction = {},
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
keyboardActions = KeyboardActions(
onSearch = { keyboardController?.hide() }
),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
)
Spacer(modifier = Modifier.height(12.dp))

Spacer(modifier = Modifier.height(16.dp))
FlintSearchTextField(
placeholder = "추천하고 싶은 작품을 검색해보세요",
value = uiState.searchText,
onValueChanged = onSearchTextChanged,
onSearchAction = {},
onClearAction = {},
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
keyboardActions = KeyboardActions(
onSearch = { keyboardController?.hide() }
),
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
)

if (selectedContents.isNotEmpty()) {
LazyRow(
state = lazyRowState,
contentPadding = PaddingValues(horizontal = 16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
reverseLayout = true,
) {
items(
items = selectedContents,
key = { it.id },
) { content ->
SelectedContentItem(
imageUrl = content.posterUrl,
onRemoveClick = {
if (uiState.isCancelModalVisible) {
contentToDelete = content
isModalVisible = true
} else {
onRemoveContent(content)
}
},
)
}
}
Spacer(modifier = Modifier.height(16.dp))
}

if (contentList.isEmpty() && uiState.searchText.isNotBlank()){
FlintSearchEmptyView(
title = "아직 준비 중인 작품이에요",
modifier = Modifier.fillMaxSize()
)
}
else{
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
verticalArrangement = Arrangement.spacedBy(16.dp),
) {
items(
items = contentList,
key = { it.id },
) { content ->
val isSelected = selectedContents.any { it.id == content.id }

AddContentSelectItem(
onCheckClick = {
if (isSelected){
if (selectedContents.isNotEmpty()) {
LazyRow(
state = lazyRowState,
contentPadding = PaddingValues(horizontal = 16.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
reverseLayout = true,
) {
items(
items = selectedContents,
key = { it.id },
) { content ->
SelectedContentItem(
imageUrl = content.posterUrl,
onRemoveClick = {
if (uiState.isCancelModalVisible) {
contentToDelete = content
isModalVisible = true
} else {
onToggleContent(content)
onRemoveContent(content)
}
} else onToggleContent(content)
},
isSelected = isSelected,
posterImageUrl = content.posterUrl,
title = content.title,
director = content.author,
createdYear = content.year,
)
},
)
}
}
Spacer(modifier = Modifier.height(16.dp))
}

if (contentList.isEmpty() && uiState.searchText.isNotBlank()) {
FlintSearchEmptyView(
title = "아직 준비 중인 작품이에요",
modifier = Modifier.fillMaxSize()
)
} else {
LazyColumn(
modifier = Modifier.fillMaxSize(),
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
verticalArrangement = Arrangement.spacedBy(16.dp),
) {
items(
items = contentList,
key = { it.id },
) { content ->
val isSelected = selectedContents.any { it.id == content.id }

AddContentSelectItem(
onCheckClick = {
if (isSelected) {
if (uiState.isCancelModalVisible) {
contentToDelete = content
isModalVisible = true
} else {
onToggleContent(content)
}
} else onToggleContent(content)
},
isSelected = isSelected,
posterImageUrl = content.posterUrl,
title = content.title,
director = content.author,
createdYear = content.year,
)
}
}
}
}


Box(
modifier = Modifier
.fillMaxWidth()
.height(148.dp)
.align(Alignment.BottomCenter)
.background(
Brush.verticalGradient(
colors = listOf(Color.Transparent, FlintTheme.colors.background)
)
)
)
}
if (isModalVisible) {
CollectionCreateContentDeleteModal(
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/flint/presentation/collectioncreate/uistate/CollectionCreateUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ data class CollectionCreateUiState(
!isLoading &&
title.isNotBlank() &&
isPublic != null &&
selectedContents.size >= 2
selectedContents.size >= 2 &&
selectedContents.all { contentDetailsMap[it.id]?.reason?.isNotBlank() == true }

val isCancelModalVisible: Boolean =
contentDetailsMap.values.any { it.reason.isNotBlank() }
Expand Down
Loading