mantra/mantra-kmp
1
0
Fork 0
Code Issues 2 Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Bug fix for renaming

Browse Source
This commit is contained in:
Kgothatso Ngako
2026-07-12 17:24:58 +02:00
parent 248b907497
commit 3d6df8b231
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/ChatRoomDetailMessageListViewModel.kt
View File

@@ -50,7 +50,7 @@ import at.torch.compose.nostr.Relays
import at.torch.compose.repository.ChatRepository
import at.torch.compose.repository.NostrRepository
import at.torch.compose.ui.composable.widgets.profile.ProfileColor
import at.torch.compose.ui.view.state.ChatRoomDetailMessageListUIState
import at.torch.compose.ui.view.state.ChatRoomMessageListUIState
import co.touchlab.kermit.Logger
import com.vitorpamplona.quartz.marmot.mip03GroupMessages.GroupEvent
import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
@@ -61,13 +61,13 @@ import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.launch
class ChatRoomDetailMessageListViewModel(
initialChatRoomDetailMessageListUIState: ChatRoomDetailMessageListUIState,
initialChatRoomMessageListUIState: ChatRoomMessageListUIState,
val localChatRoom: LocalChatRoom,
val nostrRepository: NostrRepository,
val chatRepository: ChatRepository
): ViewModel() {
val logger = Logger.withTag(TAG)
var chatRoomDetailMessageListUIState: ChatRoomDetailMessageListUIState by mutableStateOf(initialChatRoomDetailMessageListUIState)
var chatRoomMessageListUIState: ChatRoomMessageListUIState by mutableStateOf(initialChatRoomMessageListUIState)
private set
val isReceiverChatMessageRelayListMissing: MutableState<Boolean> = mutableStateOf(false)
@@ -85,7 +85,7 @@ class ChatRoomDetailMessageListViewModel(
localChatRoom.chatRoom.id
).distinctUntilChanged().collect { chatMessages ->
logger.d("getChatMessageListByChatRoomId: $chatMessages")
chatRoomDetailMessageListUIState = ChatRoomDetailMessageListUIState.Loaded(
chatRoomMessageListUIState = ChatRoomMessageListUIState.Loaded(
chatMessageList = chatMessages
)
}
@@ -203,8 +203,8 @@ class ChatRoomDetailMessageListViewModel(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally
) {
when (val chatRoomDetailMessageListUIState = this@ChatRoomDetailMessageListViewModel.chatRoomDetailMessageListUIState) {
ChatRoomDetailMessageListUIState.Error -> {
when (val chatRoomDetailMessageListUIState = this@ChatRoomDetailMessageListViewModel.chatRoomMessageListUIState) {
ChatRoomMessageListUIState.Error -> {
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally
@@ -217,7 +217,7 @@ class ChatRoomDetailMessageListViewModel(
)
}
}
is ChatRoomDetailMessageListUIState.Loaded -> {
is ChatRoomMessageListUIState.Loaded -> {
Spacer(
modifier = Modifier.weight(1f)
)
@@ -385,7 +385,7 @@ class ChatRoomDetailMessageListViewModel(
}
}
}
ChatRoomDetailMessageListUIState.Loading -> {
ChatRoomMessageListUIState.Loading -> {
Column(
modifier = Modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally
@@ -427,14 +427,14 @@ class ChatRoomDetailMessageListViewModel(
const val TAG = "ChatRoomDetailMessageListViewModel"
fun factory(
initialChatRoomDetailMessageListUIState: ChatRoomDetailMessageListUIState = ChatRoomDetailMessageListUIState.Loading,
initialChatRoomMessageListUIState: ChatRoomMessageListUIState = ChatRoomMessageListUIState.Loading,
localChatRoom: LocalChatRoom,
nostrRepository: NostrRepository,
chatRepository: ChatRepository
): ViewModelProvider.Factory = viewModelFactory {
initializer {
ChatRoomDetailMessageListViewModel(
initialChatRoomDetailMessageListUIState = initialChatRoomDetailMessageListUIState,
initialChatRoomMessageListUIState = initialChatRoomMessageListUIState,
localChatRoom = localChatRoom,
nostrRepository = nostrRepository,
chatRepository = chatRepository

11
composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/state/ChatRoomDetailMessageListUIState.kt
View File

@@ -1,11 +0,0 @@
package at.torch.compose.ui.view.state
sealed interface ChatRoomDetailMessageListUIState {
data class Loaded(
val chatMessageList: List<at.torch.compose.database.model.intermdiate.LocalChatMessage>
): ChatRoomDetailMessageListUIState
data object Error: ChatRoomDetailMessageListUIState
data object Loading: ChatRoomDetailMessageListUIState
}

11
composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/state/ChatRoomMessageListUIState.kt Executable file
View File

@@ -0,0 +1,11 @@
package at.torch.compose.ui.view.state
sealed interface ChatRoomMessageListUIState {
data class Loaded(
val chatMessageList: List<at.torch.compose.database.model.intermdiate.LocalChatMessage>
): ChatRoomMessageListUIState
data object Error: ChatRoomMessageListUIState
data object Loading: ChatRoomMessageListUIState
}