From f861241b95a3598ee747ace0d8f0947f607760cb Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Wed, 4 Sep 2024 14:32:07 +1000 Subject: [PATCH] fix more strings --- .../Settings/ThreadSettingsViewModel.swift | 12 +-- Session/Home/HomeVC.swift | 2 +- .../ic_bin.imageset/Contents.json | 12 +++ .../Images.xcassets/ic_bin.imageset/Icon.pdf | 61 +++++++++++++ .../UIContextualAction+Utilities.swift | 88 ++++++++++++------- 5 files changed, 134 insertions(+), 41 deletions(-) create mode 100644 Session/Meta/Images.xcassets/ic_bin.imageset/Contents.json create mode 100644 Session/Meta/Images.xcassets/ic_bin.imageset/Icon.pdf diff --git a/Session/Conversations/Settings/ThreadSettingsViewModel.swift b/Session/Conversations/Settings/ThreadSettingsViewModel.swift index 60e3edfc3..cdd3c7ac7 100644 --- a/Session/Conversations/Settings/ThreadSettingsViewModel.swift +++ b/Session/Conversations/Settings/ThreadSettingsViewModel.swift @@ -515,17 +515,11 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi ), confirmationInfo: ConfirmationModal.Info( title: "groupLeave".localized(), - body: .attributedText({ - if currentUserIsClosedGroupAdmin { - return "groupOnlyAdmin" - .put(key: "group_name", value: threadViewModel.displayName) - .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) - } - - return "groupLeaveDescription" + body: .attributedText( + "groupDeleteDescription" .put(key: "group_name", value: threadViewModel.displayName) .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) - }()), + ), confirmTitle: "leave".localized(), confirmStyle: .danger, cancelStyle: .alert_text diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index 7031d6665..f9e5e732e 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -802,7 +802,7 @@ final class HomeVC: BaseVC, LibSessionRespondingViewController, UITableViewDataS }() let destructiveAction: UIContextualAction.SwipeAction = { switch (threadViewModel.threadVariant, threadViewModel.threadIsNoteToSelf, threadViewModel.currentUserIsClosedGroupMember) { - case (.contact, true, _): return .hide + case (.contact, true, _): return .clear case (.legacyGroup, _, true), (.group, _, true), (.community, _, _): return .leave default: return .delete } diff --git a/Session/Meta/Images.xcassets/ic_bin.imageset/Contents.json b/Session/Meta/Images.xcassets/ic_bin.imageset/Contents.json new file mode 100644 index 000000000..bfbeb098c --- /dev/null +++ b/Session/Meta/Images.xcassets/ic_bin.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Icon.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Session/Meta/Images.xcassets/ic_bin.imageset/Icon.pdf b/Session/Meta/Images.xcassets/ic_bin.imageset/Icon.pdf new file mode 100644 index 000000000..f7706d500 --- /dev/null +++ b/Session/Meta/Images.xcassets/ic_bin.imageset/Icon.pdf @@ -0,0 +1,61 @@ +%PDF-1.7 + +1 0 obj + << >> +endobj + +2 0 obj + << /Filter /FlateDecode + /Length 3 0 R + >> +stream +xe“MŽÕ0„÷>E.€±û×½$ÖÀ¢A =FB#q~ÊyI;‚¬œ/îêê²óþÓËŸŸûË×϶ßÊûõ¶¿•ß¥×v<[»ïr•ß¸Ž&L‹`Uñmÿµ*ÿ_¼í¯EjôAªOa1ÞPBUÌYeÁGéS´)Ÿ&ìRÕ™yîsbShKõ˜Ø¨v¢¼í¥k ‰ºAD‚‚m +Îênì… A±&‡H£‡?!“„¼kŒÀˆðÑm eµS¶[a ís¾2Æb0£)D.&µYS4M}LkläËÆ^¨, »`rV†«q{NqÍFéÈÕg +“NÄc†ÕÝMÐC¬ 3Q¸ýç4öò-”ˆúRuÁ‡¤uxÇ1$…«ƒÕgRI»WŽŽh¦E6 ´¾1¤AÚaµ¨b§8â…梆½ÝüX]} ÷"戨¹%ƒfšOø( ùˆ¼%<&Æ3ÑÙd¡t³£ÏÍøÔÁs›-tPÃÁ¯ ÒJ¢g¼Cát\É#^œM¸@1!n ¹*Ê¥â½;b¼!¾Œ#Å„Zq_¿ B¼A%„4‹¯ZÍñÒJ"èaݺÀí\=)ñS¦À€I]3Ïú«Ëv ¹h:‡æ^#®>+ t<%ƒfšOø@¼ßËkùRþ~™õˆ +endstream +endobj + +3 0 obj + 507 +endobj + +4 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 25.000000 25.000000 ] + /Resources 1 0 R + /Contents 2 0 R + /Parent 5 0 R + >> +endobj + +5 0 obj + << /Kids [ 4 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +6 0 obj + << /Pages 5 0 R + /Type /Catalog + >> +endobj + +xref +0 7 +0000000000 65535 f +0000000010 00000 n +0000000034 00000 n +0000000625 00000 n +0000000647 00000 n +0000000820 00000 n +0000000894 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 6 0 R + /Size 7 +>> +startxref +953 +%%EOF \ No newline at end of file diff --git a/Session/Utilities/UIContextualAction+Utilities.swift b/Session/Utilities/UIContextualAction+Utilities.swift index 1016c3f77..f55207c22 100644 --- a/Session/Utilities/UIContextualAction+Utilities.swift +++ b/Session/Utilities/UIContextualAction+Utilities.swift @@ -36,6 +36,7 @@ public extension UIContextualAction { case block case leave case delete + case clear } static func configuration(for actions: [UIContextualAction]?) -> UISwipeActionsConfiguration? { @@ -113,6 +114,50 @@ public extension UIContextualAction { } completionHandler(true) } + + // MARK: -- clear + + case .clear: + return UIContextualAction( + title: "clear".localized(), + icon: UIImage(named: "ic_bin"), + themeTintColor: .white, + themeBackgroundColor: themeBackgroundColor, + side: side, + actionIndex: targetIndex, + indexPath: indexPath, + tableView: tableView + ) { _, _, completionHandler in + let confirmationModal: ConfirmationModal = ConfirmationModal( + info: ConfirmationModal.Info( + title: "clearMessages".localized(), + body: .text("clearMessagesNoteToSelfDescription".localized()), + confirmTitle: "clear".localized(), + confirmAccessibility: Accessibility( + identifier: "Clear" + ), + confirmStyle: .danger, + cancelStyle: .alert_text, + dismissOnConfirm: true, + onConfirm: { _ in + Storage.shared.writeAsync { db in + try SessionThread.deleteOrLeave( + db, + threadId: threadViewModel.threadId, + threadVariant: threadViewModel.threadVariant, + groupLeaveType: .silent, + calledFromConfigHandling: false + ) + } + + completionHandler(true) + }, + afterClosed: { completionHandler(false) } + ) + ) + + viewController?.present(confirmationModal, animated: true, completion: nil) + } // MARK: -- hide @@ -133,25 +178,10 @@ public extension UIContextualAction { completionHandler(true) default: - let confirmationModalExplanation: NSAttributedString = { - let message = String( - format: "noteToSelfHideDescription".localized(), - threadViewModel.displayName - ) - - return NSAttributedString(string: message) - .adding( - attributes: [ - .font: UIFont.boldSystemFont(ofSize: Values.smallFontSize) - ], - range: (message as NSString).range(of: threadViewModel.displayName) - ) - }() - let confirmationModal: ConfirmationModal = ConfirmationModal( info: ConfirmationModal.Info( title: "noteToSelfHide".localized(), - body: .attributedText(confirmationModalExplanation), + body: .text("noteToSelfHideDescription".localized()), confirmTitle: "hide".localized(), confirmAccessibility: Accessibility( identifier: "Hide" @@ -383,15 +413,17 @@ public extension UIContextualAction { }() let confirmationModalExplanation: NSAttributedString = { - if threadViewModel.currentUserIsClosedGroupAdmin == true { - return "groupOnlyAdmin" - .put(key: "group_name", value: threadViewModel.displayName) - .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) + switch threadViewModel.threadVariant { + case .legacyGroup, .group: + return "groupDeleteDescription" + .put(key: "group_name", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) + + default: + return "groupLeaveDescription" + .put(key: "group_name", value: threadViewModel.displayName) + .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) } - - return "groupLeaveDescription" - .put(key: "group_name", value: threadViewModel.displayName) - .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) }() let confirmationModal: ConfirmationModal = ConfirmationModal( @@ -453,8 +485,7 @@ public extension UIContextualAction { case .delete: return UIContextualAction( title: "delete".localized(), - icon: UIImage(named: "icon_bin"), - iconHeight: Values.mediumFontSize, + icon: UIImage(named: "ic_bin"), themeTintColor: .white, themeBackgroundColor: themeBackgroundColor, side: side, @@ -481,11 +512,6 @@ public extension UIContextualAction { string: "messageRequestsDelete".localized() ) } - guard threadViewModel.currentUserIsClosedGroupAdmin == false else { - return "groupOnlyAdmin" - .put(key: "group_name", value: threadViewModel.displayName) - .localizedFormatted(baseFont: .boldSystemFont(ofSize: Values.smallFontSize)) - } switch threadViewModel.threadVariant { case .contact: