diff --git a/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift b/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift index 73ec3c827..d6b4be4d1 100644 --- a/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift +++ b/Classes/Swift/Voip/Views/CompositeViewControllers/ConferenceCallView.swift @@ -28,7 +28,7 @@ import linphonesw var conferenceGridView: VoipConferenceGridView? = nil var conferenceActiveSpeakerView: VoipConferenceActiveSpeakerView? = nil var conferenceAudioOnlyView: VoipConferenceAudioOnlyView? = nil - let conferenceJoinSpinner = RotatingSpinner() + let conferenceJoinSpinner = RotatingSpinner(color:VoipTheme.dark_grey_color) @objc var participantsListView : ParticipantsListView? = nil static let compositeDescription = UICompositeViewDescription(ConferenceCallView.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: nil, fullscreen: false, isLeftFragment: false,fragmentWith: nil) diff --git a/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift b/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift index e57a0708d..88d82def8 100644 --- a/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift +++ b/Classes/Swift/Voip/Views/Fragments/Conference/VoipConferenceActiveSpeakerView.swift @@ -57,13 +57,13 @@ class VoipConferenceActiveSpeakerView: UIView, UICollectionViewDataSource, UICol let layout: UICollectionViewFlowLayout = UICollectionViewFlowLayout() var fullScreenOpaqueMasqForNotchedDevices = UIView() - let conferenceJoinSpinner = RotatingSpinner() + let conferenceJoinSpinner = RotatingSpinner(color:VoipTheme.dark_grey_color) var conferenceViewModel: ConferenceViewModel? = nil { didSet { if let model = conferenceViewModel { - self.setJoininngSpeakerState(enabled: true) + self.setJoininngSpeakerState(enabled: false) self.activeSpeakerAvatar.showAsAvatarIcon() model.subject.readCurrentAndObserve { (subject) in self.subjectLabel.text = subject diff --git a/Classes/Swift/Voip/Widgets/RotatingSpinner.swift b/Classes/Swift/Voip/Widgets/RotatingSpinner.swift index a03f12671..72c262d8b 100644 --- a/Classes/Swift/Voip/Widgets/RotatingSpinner.swift +++ b/Classes/Swift/Voip/Widgets/RotatingSpinner.swift @@ -21,10 +21,10 @@ import Foundation class RotatingSpinner : UIImageView { - init () { + init (color:UIColor = .white) { super.init(frame: .zero) self.image = UIImage(named: "voip_spinner") - self.tint(UIColor.white) + self.tint(color) self.contentMode = .scaleAspectFit }