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

fix unblock modals

Browse Source
pull/1023/head
Ryan ZHAO 7 months ago
parent b39845f265
commit 7acd299858
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -155,8 +155,8 @@ extension ConversationVC:
self.viewModel.threadData.displayName self.viewModel.threadData.displayName
), ),
body: .attributedText( body: .attributedText(
"blockUnblockDescription" "blockUnblockName"
.put(key: "name", value: self.viewModel.threadData.displayName) .put(key: "name", value: viewModel.threadData.displayName)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize)) .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
), ),
confirmTitle: "blockUnblock".localized(), confirmTitle: "blockUnblock".localized(),

7
Session/Conversations/Settings/ThreadSettingsViewModel.swift
Unescape Escape View File

@ -697,7 +697,12 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
threadViewModel.displayName threadViewModel.displayName
) )
}(), }(),
body: (threadViewModel.threadIsBlocked == true ? .none : body: (threadViewModel.threadIsBlocked == true ?
.attributedText(
"blockUnblockName"
.put(key: "name", value: threadViewModel.displayName)
.localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
) :
.attributedText( .attributedText(
"blockDescription" "blockDescription"
.put(key: "name", value: threadViewModel.displayName) .put(key: "name", value: threadViewModel.displayName)

11
Session/Settings/BlockedContactsViewModel.swift
Unescape Escape View File

@ -180,27 +180,28 @@ public class BlockedContactsViewModel: SessionTableViewModel, NavigatableStateHo
return info.title?.text return info.title?.text
} }
let confirmationTitle: String = { let confirmationBody: NSAttributedString = {
let name: String = contactNames.first ?? "" let name: String = contactNames.first ?? ""
switch contactNames.count { switch contactNames.count {
case 1: case 1:
return "blockUnblockName" return "blockUnblockName"
.put(key: "name", value: name) .put(key: "name", value: name)
.localized() .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
case 2: case 2:
return "blockUnblockNameTwo" return "blockUnblockNameTwo"
.put(key: "name", value: name) .put(key: "name", value: name)
.localized() .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
default: default:
return "blockUnblockNameMultiple" return "blockUnblockNameMultiple"
.put(key: "name", value: name) .put(key: "name", value: name)
.put(key: "count", value: contactNames.count - 1) .put(key: "count", value: contactNames.count - 1)
.localized() .localizedFormatted(baseFont: .systemFont(ofSize: Values.smallFontSize))
} }
}() }()
let confirmationModal: ConfirmationModal = ConfirmationModal( let confirmationModal: ConfirmationModal = ConfirmationModal(
info: ConfirmationModal.Info( info: ConfirmationModal.Info(
title: confirmationTitle, title: "blockUnblock".localized(),
body: .attributedText(confirmationBody),
confirmTitle: "blockUnblock".localized(), confirmTitle: "blockUnblock".localized(),
confirmStyle: .danger, confirmStyle: .danger,
cancelStyle: .alert_text cancelStyle: .alert_text

Write Preview
Loading…
Cancel
Save