Skip to content

fix(conversations): apply the selected preset's parameters when creating a conversation #6649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndyScherzinger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(conversations): apply the selected preset's parameters when creating a conversation #6649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 40 additions & 69 deletions app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
import com.nextcloud.talk.utils.CapabilitiesUtil
import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.PickImage
import com.nextcloud.talk.utils.SpreedFeatures
import com.nextcloud.talk.utils.bundle.BundleKeys
import com.nextcloud.talk.utils.preview.ComposePreviewUtils
import javax.inject.Inject
Expand Down Expand Up @@ -242,12 +241,7 @@ fun ConversationCreationScreen(

ConversationNameAndDescription(conversationCreationViewModel)

if (
CapabilitiesUtil.hasSpreedFeatureCapability(
conversationCreationViewModel.currentUser.capabilities?.spreedCapability,
SpreedFeatures.CONVERSATION_PRESETS
)
) {
if (conversationCreationViewModel.showPresetSelection) {
ConversationPresets(conversationCreationViewModel)
}
AddParticipants(launcher, context, conversationCreationViewModel)
Expand Down Expand Up @@ -389,12 +383,6 @@ fun ConversationNameAndDescription(conversationCreationViewModel: ConversationCr
@Composable
fun ConversationPresets(conversationCreationViewModel: ConversationCreationViewModel) {
val preset by conversationCreationViewModel.conversationPreset
val hasAnnouncementPresetCapability = CapabilitiesUtil.hasSpreedFeatureCapability(
conversationCreationViewModel.currentUser.capabilities?.spreedCapability,
SpreedFeatures.ANNOUNCEMENT_PRESET
)
val showAnnouncementPreset = hasAnnouncementPresetCapability &&
CapabilitiesUtil.isAdmin(conversationCreationViewModel.currentUser.capabilities?.spreedCapability)

Column(
modifier = Modifier
Expand All @@ -410,21 +398,25 @@ fun ConversationPresets(conversationCreationViewModel: ConversationCreationViewM
title = stringResource(R.string.default_room),
subtitle = stringResource(R.string.default_room_preset),
icon = Icons.Outlined.Chat,
isSelected = preset == "default",
onClick = { conversationCreationViewModel.updateConversationPreset("default") }
isSelected = preset == ConversationPreset.DEFAULT,
onClick = { conversationCreationViewModel.updateConversationPreset(ConversationPreset.DEFAULT) }
)

SelectableCard(
modifier = Modifier.weight(1f),
title = stringResource(R.string.voice_room),
subtitle = stringResource(R.string.voice_room_preset),
icon = Icons.Outlined.VolumeUp,
isSelected = preset == "voiceroom",
onClick = { conversationCreationViewModel.updateConversationPreset("voiceroom") }
)
if (conversationCreationViewModel.canCreateVoiceRoom) {
SelectableCard(
modifier = Modifier.weight(1f),
title = stringResource(R.string.voice_room),
subtitle = stringResource(R.string.voice_room_preset),
icon = Icons.Outlined.VolumeUp,
isSelected = preset == ConversationPreset.VOICE_ROOM,
onClick = { conversationCreationViewModel.updateConversationPreset(ConversationPreset.VOICE_ROOM) }
)
} else {
Spacer(modifier = Modifier.weight(1f))
}
}

if (hasAnnouncementPresetCapability) {
if (conversationCreationViewModel.canCreateChannel) {
Row(
horizontalArrangement = Arrangement.spacedBy(12.dp)
) {
Expand All @@ -433,18 +425,22 @@ fun ConversationPresets(conversationCreationViewModel: ConversationCreationViewM
title = stringResource(R.string.nc_channel),
subtitle = stringResource(R.string.nc_channel_description),
icon = Icons.Outlined.Podcasts,
isSelected = preset == "channel",
onClick = { conversationCreationViewModel.updateConversationPreset("channel") }
isSelected = preset == ConversationPreset.CHANNEL,
onClick = { conversationCreationViewModel.updateConversationPreset(ConversationPreset.CHANNEL) }
)

if (showAnnouncementPreset) {
if (conversationCreationViewModel.canCreateAnnouncement) {
SelectableCard(
modifier = Modifier.weight(1f),
title = stringResource(R.string.nc_announcement),
subtitle = stringResource(R.string.nc_announcement_description),
icon = Icons.Outlined.Campaign,
isSelected = preset == "announcement",
onClick = { conversationCreationViewModel.updateConversationPreset("announcement") }
isSelected = preset == ConversationPreset.ANNOUNCEMENT,
onClick = {
conversationCreationViewModel.updateConversationPreset(
ConversationPreset.ANNOUNCEMENT
)
}
)
} else {
Spacer(modifier = Modifier.weight(1f))
Expand Down Expand Up @@ -614,12 +610,12 @@ fun AddParticipants(
@Suppress("LongMethod")
@Composable
fun RoomCreationOptions(conversationCreationViewModel: ConversationCreationViewModel) {
val isGuestsAllowed = conversationCreationViewModel.isGuestsAllowed.value
val isGuestsAllowed = conversationCreationViewModel.isGuestsAllowed
val isConversationAvailableForRegisteredUsers = conversationCreationViewModel
.isConversationAvailableForRegisteredUsers.value
val isOpenForGuestAppUsers = conversationCreationViewModel.openForGuestAppUsers.value
.isConversationAvailableForRegisteredUsers
val isOpenForGuestAppUsers = conversationCreationViewModel.isOpenForGuestAppUsers

val isPasswordSet = conversationCreationViewModel.isPasswordEnabled.value
val isPasswordSet = conversationCreationViewModel.password.collectAsState().value.isNotEmpty()

Text(
text = stringResource(id = R.string.nc_new_conversation_visibility),
Expand All @@ -633,9 +629,7 @@ fun RoomCreationOptions(conversationCreationViewModel: ConversationCreationViewM
switch = {
Switch(
checked = isGuestsAllowed,
onCheckedChange = {
conversationCreationViewModel.isGuestsAllowed.value = it
}
onCheckedChange = { conversationCreationViewModel.allowGuests(it) }
)
},
conversationCreationViewModel = conversationCreationViewModel
Expand Down Expand Up @@ -663,9 +657,7 @@ fun RoomCreationOptions(conversationCreationViewModel: ConversationCreationViewM
switch = {
Switch(
checked = isConversationAvailableForRegisteredUsers,
onCheckedChange = {
conversationCreationViewModel.isConversationAvailableForRegisteredUsers.value = it
}
onCheckedChange = { conversationCreationViewModel.openConversationToRegisteredUsers(it) }
)
},
conversationCreationViewModel = conversationCreationViewModel
Expand All @@ -677,9 +669,7 @@ fun RoomCreationOptions(conversationCreationViewModel: ConversationCreationViewM
switch = {
Switch(
checked = isOpenForGuestAppUsers,
onCheckedChange = {
conversationCreationViewModel.openForGuestAppUsers.value = it
}
onCheckedChange = { conversationCreationViewModel.openConversationToGuestAppUsers(it) }
)
},
conversationCreationViewModel = conversationCreationViewModel
Expand All @@ -701,16 +691,12 @@ fun ConversationOption(
.fillMaxWidth()
.padding(start = 16.dp, end = 16.dp, bottom = 8.dp)
.then(
if (!conversationCreationViewModel.isPasswordEnabled.value) {
Modifier.clickable {
showPasswordDialog = true
}
} else if (conversationCreationViewModel.isPasswordEnabled.value) {
Modifier.clickable {
showPasswordChangeDialog = true
}
} else {
Modifier
when {
switch != null -> Modifier
conversationCreationViewModel.password.collectAsState().value.isEmpty() ->
Modifier.clickable { showPasswordDialog = true }

else -> Modifier.clickable { showPasswordChangeDialog = true }
}
),
horizontalArrangement = Arrangement.SpaceBetween,
Expand Down Expand Up @@ -794,7 +780,6 @@ fun ShowChangePassword(onDismiss: () -> Unit, conversationCreationViewModel: Con
TextButton(
onClick = {
conversationCreationViewModel.updatePassword(changedPassword)
conversationCreationViewModel.isPasswordEnabled.value = true
onDismiss()
},
enabled = changedPassword.isNotEmpty() && changedPassword.isNotBlank(),
Expand All @@ -805,7 +790,7 @@ fun ShowChangePassword(onDismiss: () -> Unit, conversationCreationViewModel: Con
Spacer(modifier = Modifier.height(4.dp))
TextButton(
onClick = {
conversationCreationViewModel.isPasswordEnabled.value = false
conversationCreationViewModel.updatePassword("")
onDismiss()
},
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp)
Expand Down Expand Up @@ -849,7 +834,6 @@ fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: Con
onClick = {
if (password.isNotEmpty() && password.isNotBlank()) {
conversationCreationViewModel.updatePassword(password)
conversationCreationViewModel.isPasswordEnabled(true)
onDismiss()
}
}
Expand All @@ -867,7 +851,6 @@ fun ShowPasswordDialog(onDismiss: () -> Unit, conversationCreationViewModel: Con

@Composable
fun CreateConversation(conversationCreationViewModel: ConversationCreationViewModel, context: Context) {
val selectedParticipants by conversationCreationViewModel.selectedParticipants.collectAsState()
val isCreatingRoom by conversationCreationViewModel.isCreatingRoom.collectAsState()
Box(
modifier = Modifier
Expand All @@ -878,12 +861,7 @@ fun CreateConversation(conversationCreationViewModel: ConversationCreationViewMo
Button(
enabled = !isCreatingRoom,
onClick = {
conversationCreationViewModel.createRoomAndAddParticipants(
roomType = CompanionClass.ROOM_TYPE_GROUP,
conversationName = conversationCreationViewModel.roomName.value,
participants = selectedParticipants.toSet(),
preset = conversationCreationViewModel.conversationPreset.value
) { roomToken ->
conversationCreationViewModel.createRoomAndAddParticipants { roomToken ->
val bundle = Bundle()
bundle.putString(BundleKeys.KEY_ROOM_TOKEN, roomToken)
val chatIntent = Intent(context, ChatActivity::class.java)
Expand All @@ -906,13 +884,6 @@ fun CreateConversation(conversationCreationViewModel: ConversationCreationViewMo
}
}

class CompanionClass {
companion object {
internal val TAG = ConversationCreationActivity::class.simpleName
internal const val ROOM_TYPE_GROUP = "2"
}
}

@Preview(name = "Light Mode")
@Preview(name = "Dark Mode", uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES)
@Preview(name = "RTL / Arabic", locale = "ar")
Expand Down
Loading
Loading