Merge pull request #424 from corona-warn-app/development

Beta Release - Prod
corona-warn-app · Jun 9, 2020 · dd8e88d · dd8e88d
2 parents 92bf40c + 8c8353b
commit dd8e88d
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 46 deletions.
diff --git a/cfg/VERSION b/cfg/VERSION
@@ -1 +1 @@
-0.8.2.1623
+0.5.0.1682
diff --git a/cfg/central-signing/NAASSigning.xcconfig b/cfg/central-signing/NAASSigning.xcconfig
@@ -1,2 +1,2 @@
 CODE_SIGN_IDENTITY = iPhone Distribution
-PROVISIONING_PROFILE_SPECIFIER = 523TP53AQF/Corona-Warn-App-Dev
+PROVISIONING_PROFILE_SPECIFIER = 523TP53AQF/Corona-Warn-App
diff --git a/cfg/central-signing/NaasSigningExportOptions.plist b/cfg/central-signing/NaasSigningExportOptions.plist
@@ -8,8 +8,8 @@
 	<string>app-store</string>
 	<key>provisioningProfiles</key>
 	<dict>
-		<key>de.rki.coronawarnapp-dev</key>
-		<string>Corona-Warn-App-Dev</string>
+		<key>de.rki.coronawarnapp</key>
+		<string>Corona-Warn-App</string>
 	</dict>
 </dict>
 </plist>
diff --git a/src/xcode/ENA/ENA.xcodeproj/project.pbxproj b/src/xcode/ENA/ENA.xcodeproj/project.pbxproj
@@ -2436,7 +2436,7 @@
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1623;
+				CURRENT_PROJECT_VERSION = 1682;
 				DEVELOPMENT_TEAM = $IPHONE_APP_DEV_TEAM;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -2452,14 +2452,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.2;
+				MARKETING_VERSION = 0.5.0;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
 					"-DSQLCIPHER_CRYPTO_CC",
 					"-DNDEBUG",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = COMMUNITY;
@@ -2597,7 +2597,7 @@
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1623;
+				CURRENT_PROJECT_VERSION = 1682;
 				DEVELOPMENT_TEAM = $IPHONE_APP_DEV_TEAM;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -2612,14 +2612,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.2;
+				MARKETING_VERSION = 0.5.0;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
 					"-DSQLCIPHER_CRYPTO_CC",
 					"-DNDEBUG",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG UITESTING";
@@ -2813,7 +2813,7 @@
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENATest.entitlements";
 				CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1623;
+				CURRENT_PROJECT_VERSION = 1682;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -2827,14 +2827,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.2;
+				MARKETING_VERSION = 0.5.0;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
 					"-DSQLCIPHER_CRYPTO_CC",
 					"-DNDEBUG",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = $IPHONE_APP_DIST_PROF_SPECIFIER;
 				SWIFT_OBJC_BRIDGING_HEADER = "ENA-Bridging-Header.h";
@@ -2852,7 +2852,7 @@
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements";
 				CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1623;
+				CURRENT_PROJECT_VERSION = 1682;
 				GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1";
 				INFOPLIST_FILE = ENA/Resources/Info.plist;
 				IPHONE_APP_CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -2862,14 +2862,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.2;
+				MARKETING_VERSION = 0.5.0;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
 					"-DSQLCIPHER_CRYPTO_CC",
 					"-DNDEBUG",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = $IPHONE_APP_DIST_PROF_SPECIFIER;
 				SWIFT_OBJC_BRIDGING_HEADER = "ENA-Bridging-Header.h";
@@ -3053,7 +3053,7 @@
 				CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements";
 				CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1623;
+				CURRENT_PROJECT_VERSION = 1682;
 				GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1";
 				INFOPLIST_FILE = ENA/Resources/Info.plist;
 				IPHONE_APP_CODE_SIGN_IDENTITY = "iPhone Developer";
@@ -3063,14 +3063,14 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.8.2;
+				MARKETING_VERSION = 0.5.0;
 				OTHER_CFLAGS = (
 					"-DSQLITE_HAS_CODEC",
 					"-DSQLITE_TEMP_STORE=3",
 					"-DSQLCIPHER_CRYPTO_CC",
 					"-DNDEBUG",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "de.rki.coronawarnapp-dev";
+				PRODUCT_BUNDLE_IDENTIFIER = de.rki.coronawarnapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = $IPHONE_APP_DIST_PROF_SPECIFIER;
 				SWIFT_OBJC_BRIDGING_HEADER = "ENA-Bridging-Header.h";

diff --git a/src/xcode/ENA/ENA/Resources/Storyboards/ExposureSubmission.storyboard b/src/xcode/ENA/ENA/Resources/Storyboards/ExposureSubmission.storyboard
@@ -151,7 +151,7 @@
         <!--Exposure SubmissionQR Scanner Navigation Controller-->
         <scene sceneID="HrB-NV-jDk">
             <objects>
-                <navigationController storyboardIdentifier="testD" modalPresentationStyle="fullScreen" interfaceStyle="dark" id="BYY-Kq-aHb" customClass="ExposureSubmissionQRScannerNavigationController" customModule="ENA" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController modalPresentationStyle="fullScreen" interfaceStyle="dark" id="BYY-Kq-aHb" customClass="ExposureSubmissionQRScannerNavigationController" customModule="ENA" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationItem key="navigationItem" largeTitleDisplayMode="never" id="aXv-uE-SC5"/>
                     <splitViewMasterSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="iPc-CN-Pgt">

diff --git a/src/xcode/ENA/ENA/Resources/Storyboards/Home.storyboard b/src/xcode/ENA/ENA/Resources/Storyboards/Home.storyboard
@@ -18,14 +18,27 @@
                         <collectionViewLayout key="collectionViewLayout" id="RLB-nP-3jY" customClass="Home"/>
                         <cells/>
                     </collectionView>
-                    <navigationItem key="navigationItem" id="Dij-1A-sIJ"/>
+                    <navigationItem key="navigationItem" id="Dij-1A-sIJ">
+                        <barButtonItem key="leftBarButtonItem" enabled="NO" image="Corona-Warn-App" id="ths-kN-SxR"/>
+                        <barButtonItem key="rightBarButtonItem" style="plain" id="3Np-ca-45C">
+                            <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="infoLight" lineBreakMode="middleTruncation" id="Y0j-bH-Esc">
+                                <rect key="frame" x="369.66666666666669" y="10.333333333333334" width="24.333333333333314" height="23.666666666666664"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <connections>
+                                    <action selector="infoButtonTapped" destination="nDx-eK-JR9" eventType="primaryActionTriggered" id="tno-WT-OuO"/>
+                                </connections>
+                            </button>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="A19-MT-Age" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="2376.811594202899" y="639.50892857142856"/>
         </scene>
     </scenes>
     <resources>
+        <image name="Corona-Warn-App" width="121" height="40"/>
         <namedColor name="ENA Separator Color">
             <color red="0.96100002527236938" green="0.96100002527236938" blue="0.96100002527236938" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

diff --git a/.../ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionQRScannerViewController.swift b/.../ENA/ENA/Source/Scenes/ExposureSubmission/ExposureSubmissionQRScannerViewController.swift
@@ -69,7 +69,7 @@ final class ExposureSubmissionQRScannerNavigationController: UINavigationControl
 final class ExposureSubmissionQRScannerViewController: UIViewController, QRScannerViewController {
 	@IBOutlet var focusView: ExposureSubmissionQRScannerFocusView!
 	@IBOutlet var flashButton: UIButton!
-	@IBOutlet weak var instructionLabel: DynamicTypeLabel!
+	@IBOutlet var instructionLabel: DynamicTypeLabel!
 
 	weak var delegate: ExposureSubmissionQRScannerDelegate?
 
@@ -95,6 +95,11 @@ final class ExposureSubmissionQRScannerViewController: UIViewController, QRScann
 	private func setupView() {
 		navigationItem.title = AppStrings.ExposureSubmissionQRScanner.title
 		instructionLabel.text = AppStrings.ExposureSubmissionQRScanner.instruction
+
+		instructionLabel.layer.shadowColor = UIColor.enaColor(for: .textPrimary1Contrast).cgColor
+		instructionLabel.layer.shadowOpacity = 1
+		instructionLabel.layer.shadowRadius = 3
+		instructionLabel.layer.shadowOffset = .init(width: 0, height: 0)
 	}
 
 	private func prepareScanning() {

diff --git a/src/xcode/ENA/ENA/Source/Scenes/Home/HomeViewController.swift b/src/xcode/ENA/ENA/Source/Scenes/Home/HomeViewController.swift
@@ -84,7 +84,6 @@ final class HomeViewController: UIViewController {
 		configureDataSource()
 		updateSections()
 		applySnapshotFromSections()
-		configureUI()
 		homeInteractor.updateTestResults()
 		setupAccessibility()
 	}
@@ -96,11 +95,8 @@ final class HomeViewController: UIViewController {
 
 	override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
 		super.traitCollectionDidChange(previousTraitCollection)
-		if self.traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle {
-			let image = UIImage(named: "Corona-Warn-App")
-			let leftItem = UIBarButtonItem(image: image, style: .plain, target: nil, action: nil)
-			leftItem.isEnabled = false
-			self.navigationItem.leftBarButtonItem = leftItem
+		if traitCollection.userInterfaceStyle != previousTraitCollection?.userInterfaceStyle {
+			navigationItem.leftBarButtonItem?.image = UIImage(named: "Corona-Warn-App")
 		}
 	}
 
@@ -116,8 +112,7 @@ final class HomeViewController: UIViewController {
 
 	// MARK: Actions
 
-	@objc
-	private func infoButtonTapped() {
+	@IBAction private func infoButtonTapped() {
 		present(
 			AppStoryboard.riskLegend.initiateInitial(),
 			animated: true,
@@ -334,22 +329,6 @@ final class HomeViewController: UIViewController {
 	func updateSections() {
 		sections = homeInteractor.sections
 	}
-
-	private func configureUI() {
-		collectionView.backgroundColor = .clear
-		let infoImage = UIImage(systemName: "info.circle")
-		navigationItem.rightBarButtonItem = UIBarButtonItem(
-			image: infoImage,
-			style: .plain,
-			target: self,
-			action: #selector(infoButtonTapped)
-		)
-		let image = UIImage(named: "Corona-Warn-App")
-		let leftItem = UIBarButtonItem(image: image, style: .plain, target: nil, action: nil)
-		leftItem.isEnabled = false
-		navigationItem.leftBarButtonItem = leftItem
-	}
-
 }
 
 // MARK: - Update test state.