mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-04-17 20:08:31 +00:00
Fix transfer popup texts
This commit is contained in:
parent
b764c068e5
commit
eaa19e60ae
2 changed files with 49 additions and 39 deletions
|
|
@ -2,6 +2,6 @@ import Foundation
|
|||
|
||||
public enum AppGitInfo {
|
||||
public static let branch = "release/6.2"
|
||||
public static let commit = "153ca0f6c"
|
||||
public static let commit = "b764c068e"
|
||||
public static let tag = "6.2.0-beta"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -532,48 +532,58 @@ struct StartCallFragment: View {
|
|||
}
|
||||
|
||||
if isShowTransferPopup {
|
||||
PopupView(
|
||||
isShowPopup: $isShowTransferPopup,
|
||||
title: Text("history_dialog_delete_all_call_logs_title"),
|
||||
content: Text("history_dialog_delete_all_call_logs_message"),
|
||||
titleFirstButton: nil,
|
||||
actionFirstButton: {},
|
||||
titleSecondButton: Text("dialog_confirm"),
|
||||
actionSecondButton: {
|
||||
showingDialer = false
|
||||
|
||||
startCallViewModel.searchField = ""
|
||||
magicSearch.currentFilter = ""
|
||||
|
||||
magicSearch.searchForContacts()
|
||||
|
||||
if callViewModel.isTransferInsteadCall == true {
|
||||
callViewModel.isTransferInsteadCall = false
|
||||
}
|
||||
|
||||
resetCallView()
|
||||
|
||||
delayColorDismiss()
|
||||
|
||||
withAnimation {
|
||||
isShowStartCallFragment.toggle()
|
||||
if let transferAddress = self.transferAddress {
|
||||
callViewModel.blindTransferCallTo(toAddress: transferAddress)
|
||||
self.transferAddress = nil
|
||||
if let remoteAddress = callViewModel.currentCall?.remoteAddress, let transferAddress = self.transferAddress {
|
||||
let currentCallNameTmp = remoteAddress.displayName
|
||||
?? remoteAddress.username
|
||||
?? String(remoteAddress.asStringUriOnly().dropFirst(4))
|
||||
|
||||
let transferAddressNameTmp = transferAddress.displayName
|
||||
?? transferAddress.username
|
||||
?? String(transferAddress.asStringUriOnly().dropFirst(4))
|
||||
|
||||
PopupView(
|
||||
isShowPopup: $isShowTransferPopup,
|
||||
title: Text("call_transfer_confirm_dialog_tittle"),
|
||||
content: Text(String(format: String(localized: "call_transfer_confirm_dialog_message"), currentCallNameTmp, transferAddressNameTmp)),
|
||||
titleFirstButton: nil,
|
||||
actionFirstButton: {},
|
||||
titleSecondButton: Text("dialog_confirm"),
|
||||
actionSecondButton: {
|
||||
showingDialer = false
|
||||
|
||||
startCallViewModel.searchField = ""
|
||||
magicSearch.currentFilter = ""
|
||||
|
||||
magicSearch.searchForContacts()
|
||||
|
||||
if callViewModel.isTransferInsteadCall == true {
|
||||
callViewModel.isTransferInsteadCall = false
|
||||
}
|
||||
|
||||
resetCallView()
|
||||
|
||||
delayColorDismiss()
|
||||
|
||||
withAnimation {
|
||||
isShowStartCallFragment.toggle()
|
||||
if let transferAddress = self.transferAddress {
|
||||
callViewModel.blindTransferCallTo(toAddress: transferAddress)
|
||||
self.transferAddress = nil
|
||||
}
|
||||
}
|
||||
|
||||
self.isShowTransferPopup.toggle()
|
||||
},
|
||||
titleThirdButton: Text("dialog_cancel"),
|
||||
actionThirdButton: {
|
||||
self.isShowTransferPopup.toggle()
|
||||
}
|
||||
|
||||
self.isShowTransferPopup.toggle()
|
||||
},
|
||||
titleThirdButton: Text("dialog_cancel"),
|
||||
actionThirdButton: {
|
||||
)
|
||||
.background(.black.opacity(0.65))
|
||||
.zIndex(3)
|
||||
.onTapGesture {
|
||||
self.isShowTransferPopup.toggle()
|
||||
}
|
||||
)
|
||||
.background(.black.opacity(0.65))
|
||||
.zIndex(3)
|
||||
.onTapGesture {
|
||||
self.isShowTransferPopup.toggle()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue