Merge pull request #2222 from minvws/bugfix/help-info-menu

5261 / 5262: Updated Helpdesk page with title and icons

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
+  }
+}

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
+  }
+}

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`.
@@ -788,6 +792,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? {
@@ -809,6 +820,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? {

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)
 	}