From bce59716aef2b457288e9cce6632767bb2ff2f93 Mon Sep 17 00:00:00 2001 From: Rool Paap Date: Wed, 11 Jan 2023 12:54:32 +0100 Subject: [PATCH] 5261 / 5262: Updated Helpdesk page with title and icons --- .../icon_menu_call.imageset/Contents.json | 15 +++++++++++++++ .../icon_menu_call.pdf | Bin 0 -> 5762 bytes .../icon_menu_phone.imageset/Contents.json | 15 +++++++++++++++ .../icon_menu_phone.pdf | Bin 0 -> 2651 bytes .../Localization/en.lproj/Localizable.strings | 2 +- .../Resources/R.generated.swift | 18 ++++++++++++++++++ .../Interface/Holder/HolderCoordinator.swift | 6 +++--- 7 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_call.imageset/Contents.json create mode 100644 Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_call.imageset/icon_menu_call.pdf create mode 100644 Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_phone.imageset/Contents.json create mode 100644 Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_phone.imageset/icon_menu_phone.pdf diff --git a/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_call.imageset/Contents.json b/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_call.imageset/Contents.json new file mode 100644 index 000000000..637ccf110 --- /dev/null +++ b/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_call.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "icon_menu_call.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_call.imageset/icon_menu_call.pdf b/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_call.imageset/icon_menu_call.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f7579033b4e528702516c54a100d4075ccb4b3b0 GIT binary patch literal 5762 zcmZ{oOK&5`6@~ZxD|$14y>P4E55O=G&%{BH1ewU$8D1zHdaOVq6G;x7{Q7+7c9Rmj zX|7sVRkzN4pQ?8sKYaI09xj|1C%Ni~dRiY0|y#|Ozma4DP2 z7uG#o+50g3jI<|#MPm$$#y-WCa>yX_x%853cWfw}WhpEg*L$VWhbhe}+tmA_5~04E zm(CJfZs_z8|M=*;32XBv+-^6maSF3j`{ZPL!F06Z!_bNpr0%nK%M|2P!-|7T^VusV zIkXT2YZkgb3yH0S+wF@7q?9FLauKaf9*EN-B(Y|p8Hyme6FtmF=?!3@VZF ztUddc{*fFWpmYW~0y))M4^9&28hY7sI-%|GhjYRX=n;krI9F!!Qtki z6m!Kui5x{3bxb5%n4mTid`BwRkwUJVhKg^V8H5>?#H?(%&R^!f?9Ot}HW`LMDWeOr76 z`%JygX9JrSp2@iI3J7`tnPh-4$x7(}}RFPvJ@n+l1V7%`2{FFn;4oWVfqI1!P>$3S)1j=-BkjiW(?oh$1N};ZMEmU|CRgPR=5#chC zEJ!RF;nNLb}bDlQ94AS$JTC#l3%$^986?HL9j zq1w4oHF}vheTibQ3nB$hL1P|#~*&=-I3qT-~aos{dn{7 z?(=>T{AK^?{_fl3uj3D|uZQP1nsnvsr0I75eEj8Uw|^e>vU$6xdw)E<><^r%XU&uF z$C`{M`P@x}A;asTD`#r>x*XQ$lU9*-}h3^oVfe1HGHJ?QPV`0nY& Q%;9a(4e#Fl{;%KtAE0i69RL6T literal 0 HcmV?d00001 diff --git a/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_phone.imageset/Contents.json b/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_phone.imageset/Contents.json new file mode 100644 index 000000000..139c47c0f --- /dev/null +++ b/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_phone.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "icon_menu_phone.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true + } +} diff --git a/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_phone.imageset/icon_menu_phone.pdf b/Sources/CTR/Infrastructure/Resources/Assets.xcassets/Menu/Holder/icon_menu_phone.imageset/icon_menu_phone.pdf new file mode 100644 index 0000000000000000000000000000000000000000..277513af7d28c91b237c27daeca3686c1977af16 GIT binary patch literal 2651 zcmb7G(QeZ)6n*zs_+`@euq1Zkw3VhwtYZiPVsyMsJcQKSiqZs<3;|!ywQC>CqFW*?sU!8t~l6Vgu#OxAmrB~q-)Y)P@vKrBkdhq`45 zk|5f%Ko!s?MsuI4i3nyvur}-|W&m!pDJA7n@sLe`OlFClE%*d;hSW?buZ31Rl(Ys^ zB&8~sN||^!l3a3Bxdj{)ak4xqip4^doYXr1 z5D*Fg6jufFZE|mq7aw_-PJp6%!p3RnV6n|n@&HD{vFjoX`;&U-SfR1#fwk&Q7AT{~tNFc;GK&UWyXfShxtJ0p2 zh^B#GWe)+`p&r2tv?d=`;eY@Wav~oPtIV@IiB6gQH&q55Sb5B7dc{p6ON61S*$xO_ zI*=eBy!UWG{YMADD%uQ(+xR1QQ5txtv;ie$TK3o(Ez;uB~ zU$kvE4*dQTT`1^DKmPoxd3swtY6ra2+g)|l{owcES^#nR(mP&2r)S#ep?mIYJ#cen z**Lm&*N(cSjOM=L!P}}Qj4KC4w;BWCwv)cuZAmIO6>PZAv+kZLRvhUc2#J`=36m*s zK*CV?x*Dsddz^;;==B53_<|j}%lz_Esa$b_-6Jw?N4y1;lTPyhlGN@;kfhf%T_snf zbqeK+5IFYLuF*X+Z}0Ur*>O5_dws@FciXdrDe0!`Ms5nW2B&wsUz*h0Yhcxnwj5c= L6+1b3`TpiN-47E@ literal 0 HcmV?d00001 diff --git a/Sources/CTR/Infrastructure/Resources/Localization/en.lproj/Localizable.strings b/Sources/CTR/Infrastructure/Resources/Localization/en.lproj/Localizable.strings index 9e74be233..fa0ccb7d7 100644 --- a/Sources/CTR/Infrastructure/Resources/Localization/en.lproj/Localizable.strings +++ b/Sources/CTR/Infrastructure/Resources/Localization/en.lproj/Localizable.strings @@ -1049,4 +1049,4 @@ "verifier_updateApp_button" = "Install update"; "verifier_updateApp_content" = "To continue, install the latest version of the app."; "verifier_updateApp_errorMessage" = "Can't open App Store"; -"verifier_updateApp_title" = "Time for an update"; +"verifier_updateApp_title" = "Time for an update"; \ No newline at end of file diff --git a/Sources/CTR/Infrastructure/Resources/R.generated.swift b/Sources/CTR/Infrastructure/Resources/R.generated.swift index 7060861b4..2ca88d958 100644 --- a/Sources/CTR/Infrastructure/Resources/R.generated.swift +++ b/Sources/CTR/Infrastructure/Resources/R.generated.swift @@ -542,12 +542,16 @@ struct R: Rswift.Validatable { static let icon_menu_addpapercertificate = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_addpapercertificate") /// Image `icon_menu_addvisitorpass`. static let icon_menu_addvisitorpass = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_addvisitorpass") + /// Image `icon_menu_call`. + static let icon_menu_call = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_call") /// Image `icon_menu_faq`. static let icon_menu_faq = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_faq") /// Image `icon_menu_hamburger`. static let icon_menu_hamburger = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_hamburger") /// Image `icon_menu_howitworks`. static let icon_menu_howitworks = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_howitworks") + /// Image `icon_menu_phone`. + static let icon_menu_phone = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_phone") /// Image `icon_menu_risklevel`. static let icon_menu_risklevel = Rswift.ImageResource(bundle: R.hostingBundle, name: "icon_menu_risklevel") /// Image `icon_menu_storeddata`. @@ -786,6 +790,13 @@ struct R: Rswift.Validatable { } #endif + #if os(iOS) || os(tvOS) + /// `UIImage(named: "icon_menu_call", bundle: ..., traitCollection: ...)` + static func icon_menu_call(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_menu_call, compatibleWith: traitCollection) + } + #endif + #if os(iOS) || os(tvOS) /// `UIImage(named: "icon_menu_faq", bundle: ..., traitCollection: ...)` static func icon_menu_faq(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { @@ -807,6 +818,13 @@ struct R: Rswift.Validatable { } #endif + #if os(iOS) || os(tvOS) + /// `UIImage(named: "icon_menu_phone", bundle: ..., traitCollection: ...)` + static func icon_menu_phone(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { + return UIKit.UIImage(resource: R.image.icon_menu_phone, compatibleWith: traitCollection) + } + #endif + #if os(iOS) || os(tvOS) /// `UIImage(named: "icon_menu_risklevel", bundle: ..., traitCollection: ...)` static func icon_menu_risklevel(compatibleWith traitCollection: UIKit.UITraitCollection? = nil) -> UIKit.UIImage? { diff --git a/Sources/CTR/Interface/Holder/HolderCoordinator.swift b/Sources/CTR/Interface/Holder/HolderCoordinator.swift index 6f8f01bb4..3f675019d 100644 --- a/Sources/CTR/Interface/Holder/HolderCoordinator.swift +++ b/Sources/CTR/Interface/Holder/HolderCoordinator.swift @@ -727,11 +727,11 @@ extension HolderCoordinator: HolderCoordinatorDelegate { self?.openUrl(faqUrl, inApp: true) } - let itemHelpdesk: MenuViewModel.Item = .row(title: L.holder_helpInfo_helpdesk(), subTitle: nil, icon: I.icon_menu_faq()!, overrideColor: nil) { [weak self] in + let itemHelpdesk: MenuViewModel.Item = .row(title: L.holder_helpInfo_helpdesk(), subTitle: nil, icon: I.icon_menu_call()!, overrideColor: nil) { [weak self] in self?.userWishesToSeeHelpdesk() } - let itemAboutThisApp: MenuViewModel.Item = .row(title: L.holderMenuAbout(), subTitle: nil, icon: I.icon_menu_aboutthisapp()!, overrideColor: nil) { [weak self] in + let itemAboutThisApp: MenuViewModel.Item = .row(title: L.holderMenuAbout(), subTitle: nil, icon: I.icon_menu_phone()!, overrideColor: nil) { [weak self] in self?.navigateToAboutThisApp() } @@ -744,7 +744,7 @@ extension HolderCoordinator: HolderCoordinatorDelegate { ] }() - let viewController = MenuViewController(viewModel: MenuViewModel(title: L.holder_menu_helpInfo(), items: items)) + let viewController = MenuViewController(viewModel: MenuViewModel(title: L.holder_helpInfo_title(), items: items)) navigationController.pushViewController(viewController, animated: true) }