mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug fix:

Browse source 
-shows the "backToCallButton" when accessing the "TransferCallView" and the "AddCallView" from the "ExtraButtonMenu" in active calls
-delete the first blank character in the entered DTMF
-disable the hide action of the "ExtraButtonMenu" when clicking between buttons, in the background
-closes the "NumpadView" and the "CallStatsView" when the call ends
-displays the "StatusBar" in "Incoming/OutgoingCallView"
-define the height of the "EneteredDtmfTextView" (no longer automatic since the blank character has been removed)
This commit is contained in:
Quentin Monnier 2022-07-13 17:44:55 +02:00 • committed by QuentinArguillere
parent 2c98100035
commit 3ba84b99d8
6 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Classes/DialerView.m
View file

@ -175,10 +175,11 @@ static UICompositeViewDescription *compositeDescription = nil;
_padView.hidden = !IPAD && UIInterfaceOrientationIsLandscape(toInterfaceOrientation);
if (linphone_core_get_calls_nb(LC)) {
_backButton.hidden = FALSE;
_addContactButton.hidden = TRUE;
} else {
_backButton.hidden = TRUE;
_addContactButton.hidden = FALSE;
}
_addContactButton.hidden = FALSE;
}
- (void)viewDidAppear:(BOOL)animated {

2
Classes/Swift/Voip/ViewModels/CallData.swift
View file

@ -42,7 +42,7 @@ class CallData {
let callState = MutableLiveData<Call.State>()
let iFrameReceived = MutableLiveData(false)
let outgoingEarlyMedia = MutableLiveData<Bool>()
let enteredDTMF = MutableLiveData(" ")
let enteredDTMF = MutableLiveData("")
var chatRoom: ChatRoom? = nil

16
Classes/Swift/Voip/Views/CompositeViewControllers/ActiveCallOrConferenceView.swift
View file

@ -245,7 +245,7 @@ import linphonesw
ControlsViewModel.shared.hideExtraButtons.readCurrentAndObserve { (_) in
self.hideModalSubview(view: self.extraButtonsView)
}
self.view.onClick {
shadingMask.onClick {
if (!self.extraButtonsView.isHidden) {
self.hideModalSubview(view: self.extraButtonsView)
}
@ -261,7 +261,11 @@ import linphonesw
self.numpadView?.removeFromSuperview()
self.shadingMask.isHidden = true
})
}
} else {
self.numpadView?.removeFromSuperview()
self.shadingMask.isHidden = true
}
}
// Call stats
@ -273,7 +277,11 @@ import linphonesw
self.currentCallStatsVew?.removeFromSuperview()
self.shadingMask.isHidden = true
})
}
} else {
self.currentCallStatsVew?.removeFromSuperview()
self.shadingMask.isHidden = true
}
}
// Video activation dialog request
@ -351,6 +359,8 @@ import linphonesw
participantsListView?.removeFromSuperview()
participantsListView = nil
ControlsViewModel.shared.numpadVisible.value = false
ControlsViewModel.shared.callStatsVisible.value = false
ControlsViewModel.shared.fullScreenMode.value = false
super.viewWillDisappear(animated)
}

2
Classes/Swift/Voip/Views/CompositeViewControllers/IncomingCallView.swift
View file

@ -27,7 +27,7 @@ import linphonesw
// Layout constants
let buttons_distance_from_center_x = 38
static let compositeDescription = UICompositeViewDescription(IncomingCallView.self, statusBar: nil, tabBar: nil, sideMenu: nil, fullscreen: true, isLeftFragment: false,fragmentWith: nil)
static let compositeDescription = UICompositeViewDescription(IncomingCallView.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: nil, fullscreen: false, isLeftFragment: false,fragmentWith: nil)
static func compositeViewDescription() -> UICompositeViewDescription! { return compositeDescription }
func compositeViewDescription() -> UICompositeViewDescription! { return type(of: self).compositeDescription }

2
Classes/Swift/Voip/Views/CompositeViewControllers/OutgoingCallView.swift
View file

@ -32,7 +32,7 @@ import linphonesw
var shadingMask = UIView()
static let compositeDescription = UICompositeViewDescription(OutgoingCallView.self, statusBar: nil, tabBar: nil, sideMenu: nil, fullscreen: true, isLeftFragment: false,fragmentWith: nil)
static let compositeDescription = UICompositeViewDescription(OutgoingCallView.self, statusBar: StatusBarView.self, tabBar: nil, sideMenu: nil, fullscreen: false, isLeftFragment: false,fragmentWith: nil)
static func compositeViewDescription() -> UICompositeViewDescription! { return compositeDescription }
func compositeViewDescription() -> UICompositeViewDescription! { return OutgoingCallView.compositeDescription }

4
Classes/Swift/Voip/Views/Fragments/NumpadView.swift
View file

@ -25,6 +25,7 @@ import linphonesw
// Layout constants
let side_margins = 10.0
let margin_top = 100.0
let eneteredDtmf_size = 40.0
let button_size = 70
let button_vertical_space = 17.0
let button_horizontal_space = 14.0
@ -44,6 +45,7 @@ import linphonesw
callData.callState.observe { state in
if (state == Call.State.End) {
//never happens
onDismissAction()
}
}
@ -59,7 +61,7 @@ import linphonesw
let eneteredDtmf = StyledLabel(VoipTheme.dtmf_label)
addSubview(eneteredDtmf)
_ = eneteredDtmf.matchParentSideBorders().alignUnder(view:hide,withMargin:side_margins)
eneteredDtmf.height(eneteredDtmf_size).matchParentSideBorders().alignUnder(view:hide,withMargin:side_margins).done()
callData.enteredDTMF.readCurrentAndObserve { (dtmfs) in
eneteredDtmf.text = dtmfs
}