From 4668b36d5f6418b2a27449cf71d178eebe8fa9ea Mon Sep 17 00:00:00 2001 From: Kgothatso Ngako Date: Fri, 10 Jul 2026 20:28:14 +0200 Subject: [PATCH] Rename initiateChatRoomDetail to initiate --- .../AddMemberToChatRoomConfirmationScreen.kt | 19 +------------------ .../SearchMemberToAddToChatRoomScreen.kt | 19 +------------------ ...ddMemberToChatRoomConfirmationViewModel.kt | 2 +- .../SearchMemberToAddToChatRoomViewModel.kt | 4 +--- 4 files changed, 4 insertions(+), 40 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt index 3ee631a9..8c01cd28 100644 --- a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt +++ b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/AddMemberToChatRoomConfirmationScreen.kt @@ -1,38 +1,23 @@ package at.torch.compose.ui.composable -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.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.input.rememberTextFieldState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Mic -import androidx.compose.material.icons.filled.PersonAdd -import androidx.compose.material.icons.filled.Send -import androidx.compose.material3.BottomAppBarDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.key import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -43,11 +28,9 @@ import at.torch.compose.repository.ChatRepository import at.torch.compose.repository.NostrRepository import at.torch.compose.ui.composable.navigation.routes.Route import at.torch.compose.ui.composable.widgets.LoadingDataIndicator -import at.torch.compose.ui.composable.widgets.profile.ProfileColor import at.torch.compose.ui.theme.TorchTheme import at.torch.compose.ui.view.model.AddMemberToChatRoomConfirmationViewModel import at.torch.compose.ui.view.state.AddMemberToChatRoomConfirmationUIState -import at.torch.compose.ui.view.state.ChatRoomDetailUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalMaterial3Api::class) @@ -155,7 +138,7 @@ fun AddMemberToChatRoomConfirmationScreen( LaunchedEffect(true) { if (initialChatRoomDetailUIState == AddMemberToChatRoomConfirmationUIState.Loading) { - addMemberToChatRoomConfirmationViewModel.initiateChatRoomDetail() + addMemberToChatRoomConfirmationViewModel.initiate() } } } diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt index 27c86a6d..a9cda57d 100644 --- a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt +++ b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/composable/SearchMemberToAddToChatRoomScreen.kt @@ -1,42 +1,27 @@ package at.torch.compose.ui.composable -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.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.text.input.rememberTextFieldState -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Mic -import androidx.compose.material.icons.filled.Send -import androidx.compose.material3.BottomAppBarDefaults -import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton import androidx.compose.material3.ListItem import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect -import androidx.compose.runtime.key import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview @@ -52,9 +37,7 @@ import at.torch.compose.ui.composable.navigation.routes.Route import at.torch.compose.ui.composable.widgets.LoadingDataIndicator import at.torch.compose.ui.composable.widgets.profile.ProfileAvatar import at.torch.compose.ui.theme.TorchTheme -import at.torch.compose.ui.view.model.ChatRoomDetailMessageListViewModel import at.torch.compose.ui.view.model.SearchMemberToAddToChatRoomViewModel -import at.torch.compose.ui.view.state.ChatRoomDetailUIState import at.torch.compose.ui.view.state.SearchMemberToAddToChatRoomUIState import com.vitorpamplona.quartz.nip01Core.core.HexKey @@ -222,7 +205,7 @@ fun SearchMemberToAddToChatRoomScreen( LaunchedEffect(true) { if (initialSearchMemberToAddToChatRoomUIState == SearchMemberToAddToChatRoomUIState.Loading) { - searchMemberToAddToChatRoomViewModel.initiateChatRoomDetail() + searchMemberToAddToChatRoomViewModel.initiate() } } } diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt index bdfea73f..db1c5581 100644 --- a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/AddMemberToChatRoomConfirmationViewModel.kt @@ -36,7 +36,7 @@ class AddMemberToChatRoomConfirmationViewModel( val isActionPending: MutableState = mutableStateOf(false) - fun initiateChatRoomDetail() { + fun initiate() { logger.d("compressed (most likely chat room): $chatRoomId") // Get ChatRoomById viewModelScope.launch(Dispatchers.IO) { diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt index 748a77b5..cfece857 100644 --- a/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt +++ b/composeApp/src/commonMain/kotlin/at/torch/compose/ui/view/model/SearchMemberToAddToChatRoomViewModel.kt @@ -11,8 +11,6 @@ import androidx.lifecycle.viewmodel.initializer import androidx.lifecycle.viewmodel.viewModelFactory import at.torch.compose.database.model.NegentropySynchronizeRequest import at.torch.compose.database.model.Profile -import at.torch.compose.database.model.Relay -import at.torch.compose.database.model.intermdiate.LocalChatRoom import at.torch.compose.database.model.types.SynchronizationFilter import at.torch.compose.nostr.Relays import at.torch.compose.repository.ChatRepository @@ -43,7 +41,7 @@ class SearchMemberToAddToChatRoomViewModel( val isActionPending: MutableState = mutableStateOf(false) - fun initiateChatRoomDetail() { + fun initiate() { logger.d("compressed (most likely chat room): $chatRoomId") // Get ChatRoomById viewModelScope.launch(Dispatchers.IO) {