From d2cb48d81a670045370ee920e426a06a5015fd67 Mon Sep 17 00:00:00 2001 From: Felix Schmidt Date: Tue, 1 Nov 2022 15:00:09 +0100 Subject: [PATCH 001/153] 14274: Adapt `HomeTestRegistrationTableViewCell` with all the new changes for self test submission. --- .../Contents.json | 12 ++ .../Illu_WarningAfterSelfTest.pdf | Bin 0 -> 34171 bytes .../Localization/de.lproj/Localizable.strings | 6 +- .../HealthCertificateCellViewModel.swift | 2 + .../HomeTestRegistrationCellModel.swift | 6 +- .../HomeTestRegistrationTableViewCell.swift | 7 +- .../HomeTestRegistrationTableViewCell.xib | 160 ++++++++++-------- .../HomeTestRegistrationCellModelTests.swift | 2 +- .../ENA/Source/View Helpers/AppStrings.swift | 1 + .../ENA/ENA/Source/Views/GradientView.swift | 43 +++-- 10 files changed, 144 insertions(+), 95 deletions(-) create mode 100644 src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json create mode 100644 src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Illu_WarningAfterSelfTest.pdf diff --git a/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json b/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json new file mode 100644 index 00000000000..3192a149d5e --- /dev/null +++ b/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "Illu_WarningAfterSelfTest.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Illu_WarningAfterSelfTest.pdf b/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Illu_WarningAfterSelfTest.pdf new file mode 100644 index 0000000000000000000000000000000000000000..59b99695a3f3b919b22da232cca7b2d22cfe99b0 GIT binary patch literal 34171 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 literal 0 HcmV?d00001 diff --git a/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.strings b/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.strings index d86ec72d86d..d742cfccc60 100644 --- a/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.strings +++ b/src/xcode/ENA/ENA/Resources/Localization/de.lproj/Localizable.strings @@ -1395,9 +1395,11 @@ Bei ausgeschalteter Hintergrundaktualisierung müssen Sie die App täglich aufru /* Home Test Registration Card */ -"Home_TestRegistration_Title" = "Sie lassen sich testen?"; +"Home_TestRegistration_Title" = "Tests erfassen und andere warnen"; -"Home_TestRegistration_Body" = "Finden Sie Teststellen in Ihrer Umgebung und registrieren Sie einen Test, um andere schneller warnen zu können, oder Ihr digitales COVID-Testzertifikat anzufordern."; +"Home_TestRegistration_Subtitle" = "Selbsttest, PCR- und Schnelltest"; + +"Home_TestRegistration_Body" = "Warnen Sie andere, wenn Sie positiv getestet sind oder fordern Sie Ihr digitales COVID-Testzertifikat an. Finden Sie Teststellen in Ihrer Umgebung."; "Home_TestRegistration_Button" = "Weiter"; diff --git a/src/xcode/ENA/ENA/Source/Scenes/HealthCertificates/HealthCertifiedPerson/Cells/HealthCertificate/HealthCertificateCellViewModel.swift b/src/xcode/ENA/ENA/Source/Scenes/HealthCertificates/HealthCertifiedPerson/Cells/HealthCertificate/HealthCertificateCellViewModel.swift index 5773604db8c..915a1a44a03 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/HealthCertificates/HealthCertifiedPerson/Cells/HealthCertificate/HealthCertificateCellViewModel.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/HealthCertificates/HealthCertifiedPerson/Cells/HealthCertificate/HealthCertificateCellViewModel.swift @@ -189,6 +189,8 @@ final class HealthCertificateCellViewModel { return UIImage(named: "Icon_CurrentlyUsedCertificate_green") case .blueRedTilted, .blueOnly, .solidGrey, .whiteWithGreyBorder, .whiteToLightBlue: return UIImage(named: "Icon_CurrentlyUsedCertificate_grey") + default: + return nil } }() diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationCellModel.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationCellModel.swift index ba118294397..8171f6d9dae 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationCellModel.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationCellModel.swift @@ -9,10 +9,12 @@ class HomeTestRegistrationCellModel { // MARK: - Internal var title = AppStrings.Home.TestRegistration.title + var subtitle = AppStrings.Home.TestRegistration.subtitle var description = AppStrings.Home.TestRegistration.description var buttonTitle = AppStrings.Home.TestRegistration.button - var image = UIImage(named: "Illu_Hand_with_phone-initial") + var image = UIImage(named: "Illu_WarningAfterSelfTest") var tintColor: UIColor = .enaColor(for: .textPrimary1) - var accessibilityIdentifier = AccessibilityIdentifiers.Home.submitCardButton + var gradientViewType: GradientView.GradientType = .bottomLightBlueToTopWhite + var buttonAccessibilityIdentifier = AccessibilityIdentifiers.Home.submitCardButton } diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.swift index 24daa568e1d..3833fdfdcfa 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.swift @@ -36,12 +36,14 @@ final class HomeTestRegistrationTableViewCell: UITableViewCell { // MARK: - Internal func configure(with cellModel: HomeTestRegistrationCellModel, onPrimaryAction: @escaping () -> Void) { + gradientView.type = cellModel.gradientViewType titleLabel.text = cellModel.title + subtitleLabel.text = cellModel.subtitle descriptionLabel.text = cellModel.description illustrationView.image = cellModel.image button.setTitle(cellModel.buttonTitle, for: .normal) - button.accessibilityIdentifier = cellModel.accessibilityIdentifier + button.accessibilityIdentifier = cellModel.buttonAccessibilityIdentifier self.tintColor = tintColor @@ -50,7 +52,10 @@ final class HomeTestRegistrationTableViewCell: UITableViewCell { // MARK: - Private + + @IBOutlet private var gradientView: GradientView! @IBOutlet private var titleLabel: ENALabel! + @IBOutlet private var subtitleLabel: ENALabel! @IBOutlet private var descriptionLabel: ENALabel! @IBOutlet private var illustrationView: UIImageView! @IBOutlet private var button: ENAButton! diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib index 39a5b389584..39ecef45643 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib @@ -1,10 +1,11 @@ - + - + + @@ -21,89 +22,92 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + + - + + + + - - - - - - - - - + + + + + + - - - - + - + + + + + + + - + @@ -111,9 +115,9 @@ - + - + @@ -130,26 +134,31 @@ + + + + + - + - + - + - + @@ -162,5 +171,8 @@ + + + diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift index 641278a6c29..c33aea04cf9 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift @@ -16,7 +16,7 @@ class HomeTestRegistrationCellModelTests: CWATestCase { XCTAssertEqual(cellModel.description, AppStrings.Home.TestRegistration.description) XCTAssertEqual(cellModel.buttonTitle, AppStrings.Home.TestRegistration.button) XCTAssertEqual(cellModel.image, UIImage(named: "Illu_Hand_with_phone-initial")) - XCTAssertEqual(cellModel.accessibilityIdentifier, AccessibilityIdentifiers.Home.submitCardButton) + XCTAssertEqual(cellModel.buttonAccessibilityIdentifier, AccessibilityIdentifiers.Home.submitCardButton) } } diff --git a/src/xcode/ENA/ENA/Source/View Helpers/AppStrings.swift b/src/xcode/ENA/ENA/Source/View Helpers/AppStrings.swift index f6fc884d19a..f0cbb749c4c 100644 --- a/src/xcode/ENA/ENA/Source/View Helpers/AppStrings.swift +++ b/src/xcode/ENA/ENA/Source/View Helpers/AppStrings.swift @@ -1004,6 +1004,7 @@ enum AppStrings { enum TestRegistration { static let title = NSLocalizedString("Home_TestRegistration_Title", comment: "") + static let subtitle = NSLocalizedString("Home_TestRegistration_Subtitle", comment: "") static let description = NSLocalizedString("Home_TestRegistration_Body", comment: "") static let button = NSLocalizedString("Home_TestRegistration_Button", comment: "") } diff --git a/src/xcode/ENA/ENA/Source/Views/GradientView.swift b/src/xcode/ENA/ENA/Source/Views/GradientView.swift index 54f34a0197a..492296c099c 100644 --- a/src/xcode/ENA/ENA/Source/Views/GradientView.swift +++ b/src/xcode/ENA/ENA/Source/Views/GradientView.swift @@ -61,6 +61,7 @@ class GradientView: UIView { case green case whiteWithGreyBorder case whiteToLightBlue + case bottomLightBlueToTopWhite var starsColor: UIColor? { @@ -96,6 +97,14 @@ class GradientView: UIView { // MARK: - Private private let imageView: UIImageView = UIImageView() + + private var isDarkMode: Bool { + if #available(iOS 13, *) { + return UITraitCollection.current.userInterfaceStyle == .dark + } else { + return false + } + } private func setupView() { imageView.translatesAutoresizingMaskIntoConstraints = false @@ -196,11 +205,6 @@ class GradientView: UIView { gradientLayer.borderWidth = 0 case .solidDarkGreen: - var isDarkMode: Bool = false - if #available(iOS 13.0, *) { - isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark - } - let lightColors = [ UIColor(red: 42 / 255, green: 142 / 255, blue: 75 / 255, alpha: 1).cgColor, UIColor(red: 42 / 255, green: 142 / 255, blue: 75 / 255, alpha: 1).cgColor @@ -227,11 +231,6 @@ class GradientView: UIView { gradientLayer.endPoint = CGPoint(x: 0.75, y: 0.5) case .whiteWithGreyBorder: - var isDarkMode: Bool = false - if #available(iOS 13.0, *) { - isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark - } - let lightColors = [ UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor, UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor @@ -251,11 +250,6 @@ class GradientView: UIView { gradientLayer.borderWidth = 2 case .whiteToLightBlue: - var isDarkMode: Bool = false - if #available(iOS 13.0, *) { - isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark - } - let lightColors = [ UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor, UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor, @@ -271,6 +265,25 @@ class GradientView: UIView { gradientLayer.locations = [0.0, 0.6, 1.0] gradientLayer.startPoint = CGPoint(x: 0.0, y: 0.0) gradientLayer.endPoint = CGPoint(x: 1.0, y: 0.95) + + case .bottomLightBlueToTopWhite: + let lightColors = [ + UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor, + UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor, + UIColor(red: 227 / 255, green: 243 / 255, blue: 255 / 255, alpha: 1).cgColor + ] + + // --todo Update when dark colors defined + let darkColors = [ + UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor, + UIColor(red: 255 / 255, green: 255 / 255, blue: 255 / 255, alpha: 1).cgColor, + UIColor(red: 227 / 255, green: 243 / 255, blue: 255 / 255, alpha: 1).cgColor + ] + + gradientLayer.colors = isDarkMode ? lightColors : darkColors + gradientLayer.locations = [0, 0.34, 0.85] + gradientLayer.startPoint = CGPoint(x: 0.25, y: 0) + gradientLayer.endPoint = CGPoint(x: 0.75, y: 1) } } From 0d4734308d0b6066971276887704a4f7d8b5c8cf Mon Sep 17 00:00:00 2001 From: Felix Schmidt Date: Tue, 1 Nov 2022 15:10:11 +0100 Subject: [PATCH 002/153] 14274: Adapt unit tests for `HomeTestRegistrationCellModel`. --- .../__tests__/HomeTestRegistrationCellModelTests.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift index c33aea04cf9..c359b5b5c7d 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/__tests__/HomeTestRegistrationCellModelTests.swift @@ -13,9 +13,11 @@ class HomeTestRegistrationCellModelTests: CWATestCase { // THEN XCTAssertEqual(cellModel.title, AppStrings.Home.TestRegistration.title) + XCTAssertEqual(cellModel.subtitle, AppStrings.Home.TestRegistration.subtitle) XCTAssertEqual(cellModel.description, AppStrings.Home.TestRegistration.description) XCTAssertEqual(cellModel.buttonTitle, AppStrings.Home.TestRegistration.button) - XCTAssertEqual(cellModel.image, UIImage(named: "Illu_Hand_with_phone-initial")) + XCTAssertEqual(cellModel.image, UIImage(named: "Illu_WarningAfterSelfTest-initial")) + XCTAssertEqual(cellModel.gradientViewType, .bottomLightBlueToTopWhite) XCTAssertEqual(cellModel.buttonAccessibilityIdentifier, AccessibilityIdentifiers.Home.submitCardButton) } From e407024e1592615925416b78176d8d4cf5a2d826 Mon Sep 17 00:00:00 2001 From: Felix Schmidt Date: Thu, 3 Nov 2022 17:58:35 +0100 Subject: [PATCH 003/153] 14274: Add dark mode appearance. Improve large font displaying. --- .../Contents.json | 12 +++++++- .../Illu_WarningAfterSelfTest_dark.pdf | Bin 0 -> 32617 bytes ...df => Illu_WarningAfterSelfTest_light.pdf} | Bin .../HomeTestRegistrationTableViewCell.swift | 23 ++++++++++++-- .../HomeTestRegistrationTableViewCell.xib | 29 +++++++++--------- .../ENA/ENA/Source/Views/GradientView.swift | 10 +++--- 6 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Illu_WarningAfterSelfTest_dark.pdf rename src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/{Illu_WarningAfterSelfTest.pdf => Illu_WarningAfterSelfTest_light.pdf} (100%) diff --git a/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json b/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json index 3192a149d5e..c91c6e3c63e 100644 --- a/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json +++ b/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Contents.json @@ -1,7 +1,17 @@ { "images" : [ { - "filename" : "Illu_WarningAfterSelfTest.pdf", + "filename" : "Illu_WarningAfterSelfTest_light.pdf", + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "Illu_WarningAfterSelfTest_dark.pdf", "idiom" : "universal" } ], diff --git a/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Illu_WarningAfterSelfTest_dark.pdf b/src/xcode/ENA/ENA/Resources/Assets/Assets.xcassets/Illustrations/Illu_WarningAfterSelfTest.imageset/Illu_WarningAfterSelfTest_dark.pdf new file mode 100644 index 0000000000000000000000000000000000000000..213a32fee17b885fb6a6fae813bff50c740ec684 GIT binary patch literal 32617 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 .accessibilityLarge { - illustrationView.superview?.isHidden = true + illustrationView.isHidden = true } else { - illustrationView.superview?.isHidden = false + illustrationView.isHidden = false } } @@ -89,3 +95,16 @@ final class HomeTestRegistrationTableViewCell: UITableViewCell { } } + +extension UIView { + func roundCorners(corners: UIRectCorner, radius: CGFloat) { + let path = UIBezierPath( + roundedRect: bounds, + byRoundingCorners: corners, + cornerRadii: CGSize(width: radius, height: radius) + ) + let mask = CAShapeLayer() + mask.path = path.cgPath + layer.mask = mask + } +} diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib index 39ecef45643..d70b93f96eb 100644 --- a/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib +++ b/src/xcode/ENA/ENA/Source/Scenes/Home/Cells/TestRegistration/HomeTestRegistrationTableViewCell.xib @@ -1,9 +1,10 @@ - + + - + @@ -18,17 +19,17 @@ - + - - + + - + - + @@ -63,7 +64,7 @@ - + @@ -83,14 +84,14 @@ - + - +