gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get selectedImageUri from ViewModel

Browse Source 
Signed-off-by: sowjanyakch <sowjanya.kch@gmail.com>
This commit is contained in:
sowjanyakch 2024-09-18 18:34:52 +02:00 committed by Marcel Hibbe
parent bc02236801
commit 4dd22d6223
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
View File

@ -138,14 +138,14 @@ fun ConversationCreationScreen(
context: Context, context: Context,
pickImage: PickImage pickImage: PickImage
) { ) {
var selectedImageUri by remember { mutableStateOf<Uri?>(null) } val selectedImageUri = conversationCreationViewModel.selectedImageUriState.collectAsState().value
val imagePickerLauncher = rememberLauncherForActivityResult( val imagePickerLauncher = rememberLauncherForActivityResult(
contract = ActivityResultContracts.StartActivityForResult() contract = ActivityResultContracts.StartActivityForResult()
) { result -> ) { result ->
if (result.resultCode == Activity.RESULT_OK) { if (result.resultCode == Activity.RESULT_OK) {
pickImage.onImagePickerResult(result.data) { uri -> pickImage.onImagePickerResult(result.data) { uri ->
selectedImageUri = uri conversationCreationViewModel.updateSelectedImageUri(uri)
} }
} }
} }
@ -205,18 +205,18 @@ fun ConversationCreationScreen(
DefaultUserAvatar(selectedImageUri) DefaultUserAvatar(selectedImageUri)
UploadAvatar( UploadAvatar(
pickImage = pickImage, pickImage = pickImage,
onImageSelected = { uri -> selectedImageUri = uri }, onImageSelected = { uri -> conversationCreationViewModel.updateSelectedImageUri(uri) },
imagePickerLauncher = imagePickerLauncher, imagePickerLauncher = imagePickerLauncher,
remoteFilePickerLauncher = remoteFilePickerLauncher, remoteFilePickerLauncher = remoteFilePickerLauncher,
cameraLauncher = cameraLauncher, cameraLauncher = cameraLauncher,
onDeleteImage = { selectedImageUri = null }, onDeleteImage = { conversationCreationViewModel.updateSelectedImageUri(null) },
selectedImageUri = selectedImageUri selectedImageUri = selectedImageUri
) )
ConversationNameAndDescription(conversationCreationViewModel) ConversationNameAndDescription(conversationCreationViewModel)
AddParticipants(launcher, context, conversationCreationViewModel) AddParticipants(launcher, context, conversationCreationViewModel)
RoomCreationOptions(conversationCreationViewModel) RoomCreationOptions(conversationCreationViewModel)
CreateConversation(conversationCreationViewModel, context, selectedImageUri) CreateConversation(conversationCreationViewModel, context)
} }
} }
) )
@ -550,11 +550,11 @@ fun ConversationOptions(
@Composable @Composable
fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: ConversationCreationViewModel) { fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: ConversationCreationViewModel) {
var password by remember { mutableStateOf("") } var password by remember { mutableStateOf("") }
AlertDialog( AlertDialog(
containerColor = colorResource(id = R.color.dialog_background), containerColor = colorResource(id = R.color.dialog_background),
onDismissRequest = onDismiss, onDismissRequest = onDismiss,
confirmButton = { confirmButton = {
Button(onClick = { Button(onClick = {
@ -585,8 +585,7 @@ fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: Con
@Composable @Composable
fun CreateConversation( fun CreateConversation(
conversationCreationViewModel: ConversationCreationViewModel, conversationCreationViewModel: ConversationCreationViewModel,
context: Context, context: Context
selectedImageUri: Uri?
) { ) {
val selectedParticipants by conversationCreationViewModel.selectedParticipants.collectAsState() val selectedParticipants by conversationCreationViewModel.selectedParticipants.collectAsState()
Box( Box(
@ -600,8 +599,7 @@ fun CreateConversation(
conversationCreationViewModel.createRoomAndAddParticipants( conversationCreationViewModel.createRoomAndAddParticipants(
roomType = CompanionClass.ROOM_TYPE_GROUP, roomType = CompanionClass.ROOM_TYPE_GROUP,
conversationName = conversationCreationViewModel.roomName.value, conversationName = conversationCreationViewModel.roomName.value,
participants = selectedParticipants.toSet(), participants = selectedParticipants.toSet()
selectedImageUri = selectedImageUri
) { roomToken -> ) { roomToken ->
val bundle = Bundle() val bundle = Bundle()
bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken) bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken)

13
app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationViewModel.kt
View File

@ -32,6 +32,10 @@ class ConversationCreationViewModel @Inject constructor(
val selectedParticipants: StateFlow<List<AutocompleteUser>> = _selectedParticipants val selectedParticipants: StateFlow<List<AutocompleteUser>> = _selectedParticipants
private val roomViewState = MutableStateFlow<RoomUIState>(RoomUIState.None) private val roomViewState = MutableStateFlow<RoomUIState>(RoomUIState.None)
private val selectedImageUri = MutableStateFlow<Uri?>(null)
val selectedImageUriState:StateFlow<Uri?> = selectedImageUri
private val _currentUser = userManager.currentUser.blockingGet() private val _currentUser = userManager.currentUser.blockingGet()
val currentUser: User = _currentUser val currentUser: User = _currentUser
@ -39,6 +43,10 @@ class ConversationCreationViewModel @Inject constructor(
_selectedParticipants.value = participants _selectedParticipants.value = participants
} }
fun updateSelectedImageUri(uri:Uri?){
selectedImageUri.value = uri
}
private val _roomName = MutableStateFlow("") private val _roomName = MutableStateFlow("")
val roomName: StateFlow<String> = _roomName val roomName: StateFlow<String> = _roomName
private val _password = MutableStateFlow("") private val _password = MutableStateFlow("")
@ -66,7 +74,6 @@ class ConversationCreationViewModel @Inject constructor(
roomType: String, roomType: String,
conversationName: String, conversationName: String,
participants: Set<AutocompleteUser>, participants: Set<AutocompleteUser>,
selectedImageUri: Uri?,
onRoomCreated: (String) -> Unit onRoomCreated: (String) -> Unit
) { ) {
val scope = when { val scope = when {
@ -109,9 +116,7 @@ class ConversationCreationViewModel @Inject constructor(
repository.setPassword(token, _password.value) repository.setPassword(token, _password.value)
} }
repository.openConversation(token, scope) repository.openConversation(token, scope)
if (selectedImageUri != null) { selectedImageUri.value?.let { repository.uploadConversationAvatar(it.toFile(), token) }
repository.uploadConversationAvatar(selectedImageUri.toFile(), token)
}
onRoomCreated(token) onRoomCreated(token)
} catch (exception: Exception) { } catch (exception: Exception) {
allowGuestsResult.value = AllowGuestsUiState.Error(exception.message ?: "") allowGuestsResult.value = AllowGuestsUiState.Error(exception.message ?: "")