diff --git a/Classes/Swift/Conference/ViewModels/ConferenceWaitingRoomViewModel.swift b/Classes/Swift/Conference/ViewModels/ConferenceWaitingRoomViewModel.swift index 246f5f905..4b00f24dd 100644 --- a/Classes/Swift/Conference/ViewModels/ConferenceWaitingRoomViewModel.swift +++ b/Classes/Swift/Conference/ViewModels/ConferenceWaitingRoomViewModel.swift @@ -39,7 +39,7 @@ class ConferenceWaitingRoomViewModel: ControlsViewModel { } func reset() { - joinLayout.value = .Grid + joinLayout.value = .ActiveSpeaker // TODO add setting joinInProgress.value = false isMicrophoneMuted.value = !micAuthorized() isMuteMicrophoneEnabled.value = true diff --git a/Classes/Swift/Voip/Views/Fragments/Conference/VoipActiveSpeakerParticipantCell.swift b/Classes/Swift/Voip/Views/Fragments/Conference/VoipActiveSpeakerParticipantCell.swift index 4e74b6b5b..707a3baf1 100644 --- a/Classes/Swift/Voip/Views/Fragments/Conference/VoipActiveSpeakerParticipantCell.swift +++ b/Classes/Swift/Voip/Views/Fragments/Conference/VoipActiveSpeakerParticipantCell.swift @@ -124,8 +124,9 @@ class VoipActiveSpeakerParticipantCell: UICollectionViewCell { contentView.addSubview(displayName) displayName.matchParentSideBorders(insetedByDx:ActiveCallView.bottom_displayname_margin_left).alignParentBottom(withMargin:ActiveCallView.bottom_displayname_margin_bottom).done() - contentView.addSubview(pauseLabel) - pauseLabel.toRightOf(displayName).alignParentBottom(withMargin:ActiveCallView.bottom_displayname_margin_bottom).done() + // Paused label commented out (Android 10.06.2022) + // contentView.addSubview(pauseLabel) + //pauseLabel.toRightOf(displayName).alignParentBottom(withMargin:ActiveCallView.bottom_displayname_margin_bottom).done() contentView.matchParentDimmensions().done() makeHeightMatchWidth().done() diff --git a/Classes/Swift/Voip/Views/Fragments/Conference/VoipGridParticipantCell.swift b/Classes/Swift/Voip/Views/Fragments/Conference/VoipGridParticipantCell.swift index 82aa1e10f..ffa83dd39 100644 --- a/Classes/Swift/Voip/Views/Fragments/Conference/VoipGridParticipantCell.swift +++ b/Classes/Swift/Voip/Views/Fragments/Conference/VoipGridParticipantCell.swift @@ -30,6 +30,7 @@ class VoipGridParticipantCell: UICollectionViewCell { static let avatar_size = 80.0 let switch_camera_button_margins = 8.0 let switch_camera_button_size = 30 + let pause_label_left_margin = 5 let videoView = UIView() @@ -129,7 +130,7 @@ class VoipGridParticipantCell: UICollectionViewCell { displayName.alignParentLeft(withMargin:ActiveCallView.bottom_displayname_margin_left).alignParentBottom(withMargin:ActiveCallView.bottom_displayname_margin_bottom).done() contentView.addSubview(pauseLabel) - pauseLabel.toRightOf(displayName).alignParentBottom(withMargin:ActiveCallView.bottom_displayname_margin_bottom).done() + pauseLabel.toRightOf(displayName,withLeftMargin: pause_label_left_margin).alignParentBottom(withMargin:ActiveCallView.bottom_displayname_margin_bottom).done() contentView.matchParentDimmensions().done() }