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 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"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -532,10 +532,19 @@ struct StartCallFragment: View {
|
||||||
}
|
}
|
||||||
|
|
||||||
if isShowTransferPopup {
|
if isShowTransferPopup {
|
||||||
|
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(
|
PopupView(
|
||||||
isShowPopup: $isShowTransferPopup,
|
isShowPopup: $isShowTransferPopup,
|
||||||
title: Text("history_dialog_delete_all_call_logs_title"),
|
title: Text("call_transfer_confirm_dialog_tittle"),
|
||||||
content: Text("history_dialog_delete_all_call_logs_message"),
|
content: Text(String(format: String(localized: "call_transfer_confirm_dialog_message"), currentCallNameTmp, transferAddressNameTmp)),
|
||||||
titleFirstButton: nil,
|
titleFirstButton: nil,
|
||||||
actionFirstButton: {},
|
actionFirstButton: {},
|
||||||
titleSecondButton: Text("dialog_confirm"),
|
titleSecondButton: Text("dialog_confirm"),
|
||||||
|
|
@ -577,6 +586,7 @@ struct StartCallFragment: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
.navigationTitle("")
|
.navigationTitle("")
|
||||||
.navigationBarHidden(true)
|
.navigationBarHidden(true)
|
||||||
.onAppear {
|
.onAppear {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue