Skip to content

Commit a39a114

Browse files
committed
refactor: 검색 화면 진입 시 검색어 초기화 및 불필요한 코드 제거
1 parent 55adc5b commit a39a114

3 files changed

Lines changed: 20 additions & 17 deletions

File tree

app/src/main/java/com/flint/presentation/collectioncreate/AddContentScreen.kt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,25 @@ fun AddContentRoute(
4444
) {
4545
val uiState by viewModel.uiState.collectAsState()
4646

47+
LaunchedEffect(Unit) {
48+
viewModel.resetSearchText()
49+
}
50+
4751
AddContentScreen(
4852
uiState = uiState,
4953
selectedContents = uiState.selectedContents,
5054
contentList = uiState.contents,
5155
onSearchTextChanged = viewModel::updateSearch,
5256
onToggleContent = viewModel::toggleContent,
5357
onRemoveContent = viewModel::removeContent,
54-
onBackClick = navigateUp,
55-
onActionClick = navigateToCollectionCreate,
58+
onBackClick = {
59+
viewModel.resetSearchText()
60+
navigateUp()
61+
},
62+
onActionClick = {
63+
viewModel.resetSearchText()
64+
navigateToCollectionCreate()
65+
},
5666
modifier = Modifier.padding(paddingValues),
5767
)
5868
}
@@ -89,7 +99,9 @@ fun AddContentScreen(
8999
title = "작품 추가하기",
90100
actionText = "추가",
91101
onActionClick = {
92-
if (selectedContents.isNotEmpty()) onActionClick()
102+
if (selectedContents.isNotEmpty()) {
103+
onActionClick()
104+
}
93105
},
94106
textStyle = if (selectedContents.isNotEmpty()) FlintTheme.typography.body1M16 else FlintTheme.typography.body1Sb16,
95107
textColor = if (selectedContents.isNotEmpty()) FlintTheme.colors.secondary400 else FlintTheme.colors.gray300,
@@ -143,7 +155,7 @@ fun AddContentScreen(
143155
}
144156
else{
145157
LazyColumn(
146-
modifier = Modifier.weight(1f),
158+
modifier = Modifier.fillMaxSize(),
147159
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
148160
verticalArrangement = Arrangement.spacedBy(16.dp),
149161
) {

app/src/main/java/com/flint/presentation/collectioncreate/CollectionCreateScreen.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ fun CollectionCreateRoute(
7474
onPublicChanged = viewModel::updateIsPublic,
7575
selectedContents = uiState.selectedContents,
7676
contentDetailsMap = uiState.contentDetailsMap,
77-
contentList = uiState.contents,
7877
onRemoveContent = viewModel::removeContent,
7978
onBackClick = navigateUp,
8079
onSpoilerChanged = viewModel::updateSpoiler,
@@ -95,7 +94,6 @@ fun CollectionCreateScreen(
9594
onPublicChanged: (Boolean?) -> Unit = {},
9695
selectedContents: ImmutableList<SearchContentItemModel>,
9796
contentDetailsMap: Map<String, ContentDetail>,
98-
contentList: ImmutableList<SearchContentItemModel>,
9997
onRemoveContent: (SearchContentItemModel) -> Unit,
10098
onBackClick: () -> Unit,
10199
onSpoilerChanged: (String, Boolean) -> Unit = { _, _ -> },
@@ -107,8 +105,6 @@ fun CollectionCreateScreen(
107105
var isModalVisible by remember { mutableStateOf(false) }
108106
var contentToDelete by remember { mutableStateOf<SearchContentItemModel?>(null) }
109107

110-
111-
112108
Column(
113109
modifier =
114110
modifier
@@ -341,7 +337,6 @@ fun CollectionCreateScreenPreview() {
341337
onPublicChanged = {},
342338
selectedContents = SearchContentListModel.FakeList,
343339
contentDetailsMap = emptyMap(),
344-
contentList = SearchContentListModel.FakeList,
345340
onRemoveContent = {},
346341
onBackClick = {},
347342
onSpoilerChanged = { _, _ -> },

app/src/main/java/com/flint/presentation/collectioncreate/CollectionCreateViewModel.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,13 @@ class CollectionCreateViewModel @Inject constructor(
8282
_createSuccess.emit(UiState.Empty)
8383
}
8484

85-
private fun getSearchContentList() {
86-
viewModelScope.launch {
87-
_uiState.update { state ->
88-
state.copy(
89-
contents = SearchContentListModel.FakeList
90-
)
91-
}
85+
fun resetSearchText() {
86+
searchQuery.value = ""
87+
_uiState.update { state ->
88+
state.copy(searchText = "")
9289
}
9390
}
9491

95-
9692
fun updateTitle(title: String) {
9793
_uiState.update { state ->
9894
state.copy(title = title)

0 commit comments

Comments
 (0)