Skip to content

Commit 04f3515

Browse files
committed
update .
1 parent 8ed0a98 commit 04f3515

File tree

1 file changed

+6
-15
lines changed
  • app/src/main/java/com/chatgptlite/wanted/ui/common

1 file changed

+6
-15
lines changed

app/src/main/java/com/chatgptlite/wanted/ui/common/AppDrawer.kt

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,9 @@ fun AppDrawer(
7171
onNewChatClicked = onNewChatClicked,
7272
onIconClicked = onIconClicked,
7373
conversationViewModel = { conversationViewModel.newConversation() },
74-
deleteConversation = { text ->
74+
deleteConversation = { conversationId ->
7575
coroutineScope.launch {
76-
conversationViewModel.deleteConversation(text)
77-
}
78-
},
79-
deleteMessages = { text ->
80-
coroutineScope.launch {
81-
conversationViewModel.deleteMessages(text)
76+
conversationViewModel.deleteConversation(conversationId)
8277
}
8378
},
8479
onConversation = { conversationModel: ConversationModel ->
@@ -97,7 +92,6 @@ private fun AppDrawerIn(
9792
onIconClicked: () -> Unit,
9893
conversationViewModel: () -> Unit,
9994
deleteConversation: (String) -> Unit,
100-
deleteMessages: (String) -> Unit,
10195
onConversation: (ConversationModel) -> Unit,
10296
currentConversationState: String,
10397
conversationState: MutableList<ConversationModel>,
@@ -121,7 +115,6 @@ private fun AppDrawerIn(
121115
onChatClicked,
122116
deleteConversation,
123117
onConversation,
124-
deleteMessages,
125118
currentConversationState,
126119
conversationState
127120
)
@@ -193,7 +186,6 @@ private fun ColumnScope.HistoryConversations(
193186
onChatClicked: (String) -> Unit,
194187
deleteConversation: (String) -> Unit,
195188
onConversation: (ConversationModel) -> Unit,
196-
deleteMessages: (String) -> Unit,
197189
currentConversationState: String,
198190
conversationState: List<ConversationModel>
199191
) {
@@ -206,9 +198,9 @@ private fun ColumnScope.HistoryConversations(
206198
) {
207199
items(conversationState.size) { index ->
208200
RecycleChatItem(
209-
text = conversations[index].title,
210-
Icons.Outlined.Message,
211-
selected = conversations[index].id == conversationId,
201+
text = conversationState[index].title,
202+
Icons.Filled.Message,
203+
selected = conversationState[index].id == currentConversationState,
212204
onChatClicked = {
213205
onChatClicked(conversationState[index].id)
214206

@@ -218,7 +210,7 @@ private fun ColumnScope.HistoryConversations(
218210
},
219211
onDeleteClicked = {
220212
scope.launch {
221-
conversationViewModel.deleteConversation(conversations[index].id)
213+
deleteConversation(conversationState[index].id)
222214
}
223215
}
224216
)
@@ -409,7 +401,6 @@ fun PreviewAppDrawerIn(
409401
onIconClicked = {},
410402
conversationViewModel = {},
411403
deleteConversation = {},
412-
deleteMessages = {},
413404
conversationState = mutableListOf(),
414405
currentConversationState = String(),
415406
onConversation = { _: ConversationModel -> }

0 commit comments

Comments
 (0)