keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

imp: modal of hiding recovery password permanently

Browse Source
pull/891/head
Ryan Zhao 2 years ago
parent 01f202ac79
commit cf63d6e48f
49 changed files with 148 additions and 47 deletions
Show Stats Download Patch File Download Diff File

4
Session/Home/HomeVC.swift
Unescape Escape View File

@ -811,9 +811,7 @@ final class HomeVC: BaseVC, SessionUtilRespondingViewController, UITableViewData
if let recoveryPasswordView: RecoveryPasswordView = try? RecoveryPasswordView() {
let viewController: SessionHostingViewController = SessionHostingViewController(rootView: recoveryPasswordView)
viewController.setNavBarTitle("recovery_password_title".localized())
self.navigationController?.pushViewController(viewController, animated: true) {
Storage.shared.writeAsync { db in db[.hasViewedSeed] = true }
}
self.navigationController?.pushViewController(viewController, animated: true)
} else {
let targetViewController: UIViewController = ConfirmationModal(
info: ConfirmationModal.Info(

1
Session/Meta/Translations/ar.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/be.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/bg.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/bn.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/cs.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/da.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/de.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/el.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/eo.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/es-ES.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/fa.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/fi.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/fil.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/fr.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/hi.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/hr.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/hu.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/id.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/it.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/ja.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/ko.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/ku.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/lt.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/lv.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/ne-NP.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/nl.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/no.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/pl.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/pt-BR.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/pt-PT.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/ro.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/ru.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/si-LK.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/sk.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/sl.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/sv-SE.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/th.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/tr.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/uk.lproj/Localizable.strings
Unescape Escape View File

@ -859,3 +859,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_warning_1" = "Without your recovery password, you cannot load your account on new devices.";
"hide_recovery_password_modal_warning_2" = "We strongly recommend you save your recovery password in a safe and secure place before continuing.";
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/vi.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/zh-CN.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Meta/Translations/zh-TW.lproj/Localizable.strings
Unescape Escape View File

@ -861,3 +861,4 @@ The point that a message will disappear in a disappearing message update message
"hide_recovery_password_modal_confirmation" = "Are you sure you want to permanently hide your recovery password on this device? This cannot be undone.";
"view_qr_code_button_title" = "View QR";
"view_mnemonic_button_title" = "View Password";
"yes_button_title" = "Yes";

1
Session/Onboarding/Onboarding.swift
Unescape Escape View File

@ -160,6 +160,7 @@ enum Onboarding {
// Clear any data which gets set during Onboarding
Storage.shared.write { db in
db[.hasViewedSeed] = false
db[.hideRecoveryPasswordPermanently] = false
try SessionThread.deleteAll(db)
try Profile.deleteAll(db)

48
Session/Settings/RecoveryPasswordView.swift
Unescape Escape View File

@ -206,7 +206,7 @@ struct RecoveryPasswordView: View {
)
Button {
hideRecoveryPassword()
} label: {
Text("hide_button_title".localized())
.bold()
@ -226,7 +226,10 @@ struct RecoveryPasswordView: View {
}
}
.padding(.horizontal, Values.largeSpacing)
.padding(.vertical, Values.mediumSpacing)
}
}.onAppear {
Storage.shared.writeAsync { db in db[.hasViewedSeed] = true }
}
}
@ -234,10 +237,51 @@ struct RecoveryPasswordView: View {
UIPasteboard.general.string = self.mnemonic
self.copied = true
}
private func hideRecoveryPassword() {
let modal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "hide_recovery_password_modal_title".localized(),
body: .text(
"hide_recovery_password_modal_warning_1".localized() +
"\n\n" +
"hide_recovery_password_modal_warning_2".localized()
),
confirmTitle: "continue_2".localized(),
confirmStyle: .danger,
cancelStyle: .textPrimary,
onConfirm: { modal in
guard let presentingViewController: UIViewController = modal.presentingViewController else {
return
}
let continueModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info(
title: "hide_recovery_password_modal_title".localized(),
body: .text("hide_recovery_password_modal_confirmation".localized()),
confirmTitle: "TXT_CANCEL_TITLE".localized(),
confirmStyle: .textPrimary,
cancelTitle: "yes_button_title".localized(),
cancelStyle: .danger,
onCancel: { modal in
modal.dismiss(animated: true) {
Storage.shared.writeAsync { db in db[.hideRecoveryPasswordPermanently] = true }
self.host.controller?.navigationController?.popViewController(animated: true)
}
}
)
)
return presentingViewController.present(continueModal, animated: true, completion: nil)
}
)
)
self.host.controller?.present(modal, animated: true)
}
}
struct RecoveryPasswordView_Previews: PreviewProvider {
static var previews: some View {
RecoveryPasswordView(hardcode: "Voyage urban toyed maverick peculiar tuxedo penguin tree grass building listen speak withdraw terminal plane ")
RecoveryPasswordView(hardcode: "Voyage urban toyed maverick peculiar tuxedo penguin tree grass building listen speak withdraw terminal plane")
}
}

92
Session/Settings/SettingsViewModel.swift
Unescape Escape View File

@ -215,14 +215,21 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
.eraseToAnyPublisher()
// MARK: - Content
private struct State: Equatable {
let profile: Profile
let hideRecoveryPasswordPermanently: Bool
}
let title: String = "vc_settings_title".localized()
lazy var observation: TargetObservation = ObservationBuilder
.databaseObservation(self) { [weak self, dependencies] db -> Profile in
Profile.fetchOrCreateCurrentUser(db, using: dependencies)
.databaseObservation(self) { [weak self, dependencies] db -> State in
State(
profile: Profile.fetchOrCreateCurrentUser(db, using: dependencies),
hideRecoveryPasswordPermanently: db[.hideRecoveryPasswordPermanently]
)
}
.map { [weak self] profile -> [SectionModel] in
.map { [weak self] state -> [SectionModel] in
return [
SectionModel(
model: .profileInfo,
@ -230,9 +237,9 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
SessionCell.Info(
id: .avatar,
accessory: .profile(
id: profile.id,
id: state.profile.id,
size: .hero,
profile: profile
profile: state.profile
),
styling: SessionCell.StyleInfo(
alignment: .centerHugging,
@ -243,13 +250,13 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
label: "Profile picture"
),
onTap: {
self?.updateProfilePicture(currentFileName: profile.profilePictureFileName)
self?.updateProfilePicture(currentFileName: state.profile.profilePictureFileName)
}
),
SessionCell.Info(
id: .profileName,
title: SessionCell.TextInfo(
profile.displayName(),
state.profile.displayName(),
font: .titleLarge,
alignment: .center,
interaction: .editable
@ -261,7 +268,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
),
accessibility: Accessibility(
identifier: "Username",
label: profile.displayName()
label: state.profile.displayName()
),
onTap: { self?.setIsEditing(true) }
)
@ -273,7 +280,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
SessionCell.Info(
id: .sessionId,
title: SessionCell.TextInfo(
profile.id,
state.profile.id,
font: .monoLarge,
alignment: .center,
interaction: .copy
@ -284,7 +291,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
),
accessibility: Accessibility(
identifier: "Session ID",
label: profile.id
label: state.profile.id
)
),
SessionCell.Info(
@ -293,14 +300,14 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
style: .bordered,
title: "copy".localized(),
run: { button in
self?.copySessionId(profile.id, button: button)
self?.copySessionId(state.profile.id, button: button)
}
),
rightAccessory: .button(
style: .bordered,
title: "share".localized(),
run: { _ in
self?.shareSessionId(profile.id)
self?.shareSessionId(state.profile.id)
}
),
styling: SessionCell.StyleInfo(
@ -406,7 +413,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
),
title: "vc_settings_invite_a_friend_button_title".localized(),
onTap: {
let invitation: String = "Hey, I've been using Session to chat with complete privacy and security. Come join me! Download it at https://getsession.org/. My Session ID is \(profile.id) !"
let invitation: String = "Hey, I've been using Session to chat with complete privacy and security. Come join me! Download it at https://getsession.org/. My Session ID is \(state.profile.id) !"
self?.transitionToScreen(
UIActivityViewController(
@ -416,7 +423,9 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
transitionType: .present
)
}
),
)
].appending(
state.hideRecoveryPasswordPermanently ? nil :
SessionCell.Info(
id: .recoveryPhrase,
leftAccessory: .icon(
@ -441,33 +450,36 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
self?.transitionToScreen(targetViewController, transitionType: .present)
}
}
),
SessionCell.Info(
id: .help,
leftAccessory: .icon(
UIImage(named: "icon_help")?
.withRenderingMode(.alwaysTemplate)
),
title: "HELP_TITLE".localized(),
onTap: {
self?.transitionToScreen(
SessionTableViewController(viewModel: HelpViewModel())
)
}
),
SessionCell.Info(
id: .clearData,
leftAccessory: .icon(
UIImage(named: "icon_bin")?
.withRenderingMode(.alwaysTemplate)
),
title: "vc_settings_clear_all_data_button_title".localized(),
styling: SessionCell.StyleInfo(tintColor: .danger),
onTap: {
self?.transitionToScreen(NukeDataModal(), transitionType: .present)
}
)
]
).appending(
contentsOf: [
SessionCell.Info(
id: .help,
leftAccessory: .icon(
UIImage(named: "icon_help")?
.withRenderingMode(.alwaysTemplate)
),
title: "HELP_TITLE".localized(),
onTap: {
self?.transitionToScreen(
SessionTableViewController(viewModel: HelpViewModel())
)
}
),
SessionCell.Info(
id: .clearData,
leftAccessory: .icon(
UIImage(named: "icon_bin")?
.withRenderingMode(.alwaysTemplate)
),
title: "vc_settings_clear_all_data_button_title".localized(),
styling: SessionCell.StyleInfo(tintColor: .danger),
onTap: {
self?.transitionToScreen(NukeDataModal(), transitionType: .present)
}
)
]
)
)
]
}

3
SessionMessagingKit/Utilities/Preferences.swift
Unescape Escape View File

@ -53,6 +53,9 @@ public extension Setting.BoolKey {
/// A flag indicating whether the user has ever viewed their seed
static let hasViewedSeed: Setting.BoolKey = "hasViewedSeed"
/// A flag indicating whether the user hides the recovery password permanently
static let hideRecoveryPasswordPermanently: Setting.BoolKey = "hideRecoveryPasswordPermanently"
/// A flag indicating whether the user has ever saved a thread
static let hasSavedThread: Setting.BoolKey = "hasSavedThread"

4
SessionUIKit/Components/ConfirmationModal.swift
Unescape Escape View File

@ -113,9 +113,9 @@ public class ConfirmationModal: Modal, UITextFieldDelegate {
result.isLayoutMarginsRelativeArrangement = true
result.layoutMargins = UIEdgeInsets(
top: Values.largeSpacing,
left: Values.largeSpacing,
left: Values.veryLargeSpacing,
bottom: Values.verySmallSpacing,
right: Values.largeSpacing
right: Values.veryLargeSpacing
)
return result

Write Preview
Loading…
Cancel
Save