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

Fix transfer popup texts

Browse source
This commit is contained in:
Benoit Martins 2026-03-27 11:48:06 +01:00
parent b764c068e5
commit eaa19e60ae
2 changed files with 49 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/GeneratedGit.swift
View file

@ -2,6 +2,6 @@ import Foundation
public enum AppGitInfo { public enum AppGitInfo {
public static let branch = "release/6.2" 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" public static let tag = "6.2.0-beta"
} }

76
Linphone/UI/Main/History/Fragments/StartCallFragment.swift
View file

@ -532,48 +532,58 @@ struct StartCallFragment: View {
} }
if isShowTransferPopup { if isShowTransferPopup {
PopupView( if let remoteAddress = callViewModel.currentCall?.remoteAddress, let transferAddress = self.transferAddress {
isShowPopup: $isShowTransferPopup, let currentCallNameTmp = remoteAddress.displayName
title: Text("history_dialog_delete_all_call_logs_title"), ?? remoteAddress.username
content: Text("history_dialog_delete_all_call_logs_message"), ?? String(remoteAddress.asStringUriOnly().dropFirst(4))
titleFirstButton: nil,
actionFirstButton: {},
titleSecondButton: Text("dialog_confirm"),
actionSecondButton: {
showingDialer = false
startCallViewModel.searchField = "" let transferAddressNameTmp = transferAddress.displayName
magicSearch.currentFilter = "" ?? transferAddress.username
?? String(transferAddress.asStringUriOnly().dropFirst(4))
magicSearch.searchForContacts() 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
if callViewModel.isTransferInsteadCall == true { startCallViewModel.searchField = ""
callViewModel.isTransferInsteadCall = false magicSearch.currentFilter = ""
}
resetCallView() magicSearch.searchForContacts()
delayColorDismiss() if callViewModel.isTransferInsteadCall == true {
callViewModel.isTransferInsteadCall = false
withAnimation {
isShowStartCallFragment.toggle()
if let transferAddress = self.transferAddress {
callViewModel.blindTransferCallTo(toAddress: transferAddress)
self.transferAddress = nil
} }
}
self.isShowTransferPopup.toggle() resetCallView()
},
titleThirdButton: Text("dialog_cancel"), delayColorDismiss()
actionThirdButton: {
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()
}
)
.background(.black.opacity(0.65))
.zIndex(3)
.onTapGesture {
self.isShowTransferPopup.toggle() self.isShowTransferPopup.toggle()
} }
)
.background(.black.opacity(0.65))
.zIndex(3)
.onTapGesture {
self.isShowTransferPopup.toggle()
} }
} }
} }