From 726a4afdd1d1bc7d2ea3a96b596e29bd9b9bdf37 Mon Sep 17 00:00:00 2001 From: Christophe Deschamps Date: Mon, 19 Sep 2022 16:04:12 +0200 Subject: [PATCH] Fix (for good) background color for Me participant + repositionned the Me sticker bottom right in AS Landscape iso top right --- Classes/Swift/Voip/Theme/VoipTheme.swift | 2 +- .../Conference/VoipConferenceActiveSpeakerView.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/Swift/Voip/Theme/VoipTheme.swift b/Classes/Swift/Voip/Theme/VoipTheme.swift index f6fc4c05a..a4f46a259 100644 --- a/Classes/Swift/Voip/Theme/VoipTheme.swift +++ b/Classes/Swift/Voip/Theme/VoipTheme.swift @@ -66,7 +66,7 @@ import UIKit static let voipBackgroundColor = LightDarkColor(voip_gray_blue_color,voip_dark_color) static let voipBackgroundBWColor = LightDarkColor(UIColor.white,voip_dark_color) static let voipParticipantBackgroundColor = LightDarkColor(voip_gray_background,voip_dark_color2) - static let voipParticipantMeBackgroundColor = LightDarkColor(voip_gray_background,voip_dark_color3) + static let voipParticipantMeBackgroundColor = LightDarkColor(voip_dark_color3,voip_dark_color3) static let voipExtraButtonsBackgroundColor = LightDarkColor(voip_gray,voip_dark_color3) static let voipToolbarBackgroundColor = LightDarkColor(toolbar_color,voip_dark_color4) static let voipDrawableColor = LightDarkColor(voip_dark_gray,.white) diff --git a/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift b/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift index 2d9a3eda7..23d32277b 100644 --- a/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift +++ b/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift @@ -376,8 +376,8 @@ class VoipConferenceActiveSpeakerView: UIView, UICollectionViewDataSource, UICol if (UIDevice.current.orientation == .landscapeLeft) { // work around some constraints issues with Notch on the left. bounceGrids() } - meGrid.width(grid_height).height(grid_height).toRightOf(activeSpeakerView,withLeftMargin: ActiveCallOrConferenceView.content_inset).alignParentTop().alignParentRight().done() - grid.width(grid_height).toRightOf(activeSpeakerView,withLeftMargin: ActiveCallOrConferenceView.content_inset).alignUnder(view: meGrid, withMargin: ActiveCallOrConferenceView.content_inset).alignParentBottom().alignParentRight().done() + meGrid.width(grid_height).height(grid_height).toRightOf(activeSpeakerView,withLeftMargin: ActiveCallOrConferenceView.content_inset).alignParentBottom().alignParentRight().done() + grid.width(grid_height).toRightOf(activeSpeakerView,withLeftMargin: ActiveCallOrConferenceView.content_inset).alignParentTop().alignAbove(view: meGrid, withMargin: ActiveCallOrConferenceView.content_inset).alignParentRight().done() layout.scrollDirection = .vertical activeSpeakerAvatar.square(Avatar.diameter_for_call_views_land).center().done() }