witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Logout on the account profile page

Browse source
This commit is contained in:
Benoit Martins 2025-01-03 11:12:26 +01:00
parent 11053b2ca3
commit 35eb8cb8df
3 changed files with 145 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Linphone/Localizable.xcstrings
View file

@ -6,6 +6,15 @@
},
": %@" : {
},
"." : {
},
"[Forgotten password?](https://subscribe.linphone.org/)" : {
},
"[https://sip.linphone.org](https://sip.linphone.org)" : {
},
"[linphone.org/contact](https://linphone.org/contact)" : {
"shouldTranslate" : false
@ -3882,6 +3891,40 @@
}
}
},
"manage_account_dialog_remove_account_message" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "If you wish to delete your account permanently, go to: https://sip.linphone.org"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Si vous souhaitez supprimer définitivement votre compte rendez-vous sur : https://sip.linphone.org"
}
}
}
},
"manage_account_dialog_remove_account_title" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Sign out of your account?"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Se déconnecter du compte ?"
}
}
}
},
"manage_account_edit_picture" : {
"localizations" : {
"en" : {
@ -3948,6 +3991,23 @@
}
}
},
"manage_account_settings" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Account settings"
}
},
"fr" : {
"stringUnit" : {
"state" : "translated",
"value" : "Paramètres de compte"
}
}
}
},
"manage_account_status_cleared_summary" : {
"extractionState" : "manual",
"localizations" : {

84
Linphone/UI/Main/Settings/Fragments/AccountProfileFragment.swift
View file

@ -37,6 +37,7 @@ struct AccountProfileFragment: View {
@State private var selectedImage: UIImage?
@State private var removedImage = false
@State private var isShowPopup = false
@State private var isShowLogoutPopup = false
@State private var flag = true
@FocusState var isDisplayNameFocused: Bool
@ -529,18 +530,59 @@ struct AccountProfileFragment: View {
.transition(.move(edge: .top))
}
HStack(alignment: .center) {
Text("contact_details_actions_title")
.default_text_style_800(styleSize: 18)
.frame(maxWidth: .infinity, alignment: .leading)
}
.padding(.top, 20)
.padding(.bottom, 10)
.padding(.horizontal, 20)
.background(Color.gray100)
VStack(spacing: 0) {
VStack(spacing: 15) {
Text("manage_account_dialog_international_prefix_help_message")
.default_text_style_700(styleSize: 15)
.frame(maxWidth: .infinity, alignment: .leading)
VStack(spacing: 18) {
Button(action: {
}, label: {
HStack {
Image("gear")
.renderingMode(.template)
.resizable()
.foregroundStyle(Color.grayMain2c700)
.frame(width: 25, height: 25)
Text("manage_account_settings")
.foregroundStyle(Color.grayMain2c700)
.default_text_style(styleSize: 16)
.frame(maxWidth: .infinity, alignment: .leading)
}
})
Divider()
Button(action: {
isShowLogoutPopup = true
}, label: {
HStack {
Image("sign-out")
.renderingMode(.template)
.resizable()
.foregroundStyle(Color.redDanger500)
.frame(width: 25, height: 25)
Text("manage_account_delete")
.foregroundStyle(Color.redDanger500)
.default_text_style(styleSize: 16)
.frame(maxWidth: .infinity, alignment: .leading)
}
})
}
.padding(.vertical, 30)
.padding(.vertical, 20)
.padding(.horizontal, 20)
}
.background(.white)
.cornerRadius(15)
.padding(.all)
.padding(.horizontal)
}
.frame(maxWidth: sharedMainViewModel.maxWidth)
.onAppear {
@ -570,6 +612,36 @@ struct AccountProfileFragment: View {
self.isShowPopup.toggle()
}
}
if self.isShowLogoutPopup {
let localizedString = NSLocalizedString("manage_account_dialog_remove_account_message", comment: "")
let components = localizedString.components(separatedBy: " ")
let textPart = components.dropLast().joined(separator: " ")
let contentPopup1 = Text(textPart + " ")
let contentPopup2 = Text("[https://sip.linphone.org](https://sip.linphone.org)").underline()
PopupView(
isShowPopup: $isShowLogoutPopup,
title: Text("manage_account_dialog_remove_account_title"),
content: contentPopup1 + contentPopup2,
titleFirstButton: Text("Cancel"),
actionFirstButton: {
self.isShowLogoutPopup.toggle()
},
titleSecondButton: Text("manage_account_delete"),
actionSecondButton: {
if accountProfileViewModel.accountModelIndex != nil {
CoreContext.shared.accounts[accountProfileViewModel.accountModelIndex!].logout()
}
}
)
.background(.black.opacity(0.65))
.onTapGesture {
self.isShowLogoutPopup.toggle()
}
}
}
}

7
Linphone/UI/Main/Viewmodel/AccountModel.swift
View file

@ -241,6 +241,13 @@ class AccountModel: ObservableObject {
}
}
}
func logout() {
CoreContext.shared.doOnCoreQueue { core in
Log.info("Account \(self.account.displayName()) has been removed")
core.removeAccount(account: self.account)
}
}
}
class AccountDeviceModel: ObservableObject {