Skip to content

Commit

Permalink
v1.0 (eu-digital-green-certificates#76)
Browse files Browse the repository at this point in the history 
* v1.0

* Add vibration.

* Add l10n.
  • Loading branch information
@yspreen
yspreen authored May 16, 2021
1 parent cfa97b5 commit 1458f75
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 21 deletions.
24 changes: 17 additions & 7 deletions DGCAVerifier.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
CE345FB426446817003B457E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE345FB626446817003B457E /* Localizable.strings */; };
CE37B643263867D700DEE13D /* SecureBackground.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE37B642263867D700DEE13D /* SecureBackground.swift */; };
CE56B5052639F48E00FB31B1 /* SwiftDGC in Frameworks */ = {isa = PBXBuildFile; productRef = CE56B5042639F48E00FB31B1 /* SwiftDGC */; };
CE41B7E226445092005013C4 /* AppVersionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE41B7E126445092005013C4 /* AppVersionCell.swift */; };
CE59D1B626428D78004EBDD6 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE59D1B526428D78004EBDD6 /* Settings.swift */; };
CE713CD22651A65F003DD1DE /* SwiftDGC in Frameworks */ = {isa = PBXBuildFile; productRef = CE713CD12651A65F003DD1DE /* SwiftDGC */; };
CE8096D9263B07BB00A65AD6 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8096D8263B07BB00A65AD6 /* UIColor.swift */; };
CE81533C263FF8FE0030D777 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = CE81533B263FF8FE0030D777 /* README.md */; };
CE8912F52634C60E00CB92AF /* GatewayConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8912F42634C60E00CB92AF /* GatewayConnection.swift */; };
Expand Down Expand Up @@ -90,7 +92,6 @@
CEA6D70F261F8D2900715333 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
CEC7FEE0264C819D005561BA /* context.jsonc */ = {isa = PBXFileReference; lastKnownFileType = text; path = context.jsonc; sourceTree = SOURCE_ROOT; };
CED2725F26398683003D47A9 /* UIFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIFont.swift; sourceTree = "<group>"; };
CEDCA7972639E6E700FCB83E /* SwiftDGC */ = {isa = PBXFileReference; lastKnownFileType = folder; name = SwiftDGC; path = "../dgca-app-core-ios"; sourceTree = "<group>"; };
CEDCA79B2639E77800FCB83E /* Package.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; name = Package.resolved; path = DGCAVerifier.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; sourceTree = SOURCE_ROOT; };
CEFAD87E262714C4009AFEF9 /* EHNTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EHNTests.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand All @@ -101,9 +102,9 @@
buildActionMask = 2147483647;
files = (
CE8912FB2634C6B900CB92AF /* Alamofire in Frameworks */,
CE56B5052639F48E00FB31B1 /* SwiftDGC in Frameworks */,
CE1F155C2639F9E700736D48 /* SwiftyJSON in Frameworks */,
CE13CF00262DCC180070C80E /* FloatingPanel in Frameworks */,
CE713CD22651A65F003DD1DE /* SwiftDGC in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -216,7 +217,6 @@
CEA6D6DF261F8D2700715333 = {
isa = PBXGroup;
children = (
CEDCA7972639E6E700FCB83E /* SwiftDGC */,
CEA6D6EA261F8D2700715333 /* DGCAVerifier */,
CEA6D701261F8D2900715333 /* DGCAVerifierTests */,
CEA6D70C261F8D2900715333 /* DGCAVerifierUITests */,
Expand Down Expand Up @@ -289,8 +289,8 @@
packageProductDependencies = (
CE13CEFF262DCC180070C80E /* FloatingPanel */,
CE8912FA2634C6B900CB92AF /* Alamofire */,
CE56B5042639F48E00FB31B1 /* SwiftDGC */,
CE1F155B2639F9E700736D48 /* SwiftyJSON */,
CE713CD12651A65F003DD1DE /* SwiftDGC */,
);
productName = DGCAVerifier;
productReference = CEA6D6E8261F8D2700715333 /* DGCAVerifier.app */;
Expand Down Expand Up @@ -367,6 +367,7 @@
CE13CEFE262DCC180070C80E /* XCRemoteSwiftPackageReference "FloatingPanel" */,
CE8912F92634C6B900CB92AF /* XCRemoteSwiftPackageReference "Alamofire" */,
CE1F155A2639F9E700736D48 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
CE713CD02651A65F003DD1DE /* XCRemoteSwiftPackageReference "dgca-app-core-ios" */,
);
productRefGroup = CEA6D6E9261F8D2700715333 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -660,7 +661,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.4.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.t-systems.DGCAVerifier.dev";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand All @@ -681,7 +682,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 0.4.0;
MARKETING_VERSION = 1.0.0;
PRODUCT_BUNDLE_IDENTIFIER = "com.t-systems.DGCAVerifier.dev";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -831,6 +832,14 @@
minimumVersion = 5.0.1;
};
};
CE713CD02651A65F003DD1DE /* XCRemoteSwiftPackageReference "dgca-app-core-ios" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/eu-digital-green-certificates/dgca-app-core-ios";
requirement = {
branch = main;
kind = branch;
};
};
CE8912F92634C6B900CB92AF /* XCRemoteSwiftPackageReference "Alamofire" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Alamofire/Alamofire";
Expand All @@ -852,8 +861,9 @@
package = CE1F155A2639F9E700736D48 /* XCRemoteSwiftPackageReference "SwiftyJSON" */;
productName = SwiftyJSON;
};
CE56B5042639F48E00FB31B1 /* SwiftDGC */ = {
CE713CD12651A65F003DD1DE /* SwiftDGC */ = {
isa = XCSwiftPackageProductDependency;
package = CE713CD02651A65F003DD1DE /* XCRemoteSwiftPackageReference "dgca-app-core-ios" */;
productName = SwiftDGC;
};
CE8912FA2634C6B900CB92AF /* Alamofire */ = {
Expand Down
9 changes: 9 additions & 0 deletions DGCAVerifier.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
"version": "5.4.3"
}
},
{
"package": "SwiftDGC",
"repositoryURL": "https://github.com/eu-digital-green-certificates/dgca-app-core-ios",
"state": {
"branch": "main",
"revision": "0792980147e02bf6db0738af157bb2a8d31ea3cf",
"version": null
}
},
{
"package": "FloatingPanel",
"repositoryURL": "https://github.com/SCENEE/FloatingPanel",
Expand Down
1 change: 1 addition & 0 deletions DGCAVerifier/ViewControllers/Scan.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class ScanVC: SwiftDGC.ScanVC {
presentingViewer = controller

present(fpc, animated: true, completion: nil)
UIImpactFeedbackGenerator(style: .medium).impactOccurred()
}
}

Expand Down
20 changes: 20 additions & 0 deletions Localization/DGCAVerifier/en.xcloc/Localized Contents/en.xliff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,26 @@
<tool tool-id="com.apple.dt.xcode" tool-name="Xcode" tool-version="12.5" build-num="12E262"/>
</header>
<body>
<trans-unit id="3C9-S9-3Vo.text" xml:space="preserve">
<source>EU Digital Green Certificate</source>
<target>EU Digital Green Certificate</target>
<note>Class = "UILabel"; text = "EU Digital Green Certificate"; ObjectID = "3C9-S9-3Vo";</note>
</trans-unit>
<trans-unit id="6ZX-Be-rar.title" xml:space="preserve">
<source>Settings</source>
<target>Settings</target>
<note>Class = "UINavigationItem"; title = "Settings"; ObjectID = "6ZX-Be-rar";</note>
</trans-unit>
<trans-unit id="MwP-Io-S91.headerTitle" xml:space="preserve">
<source>Links</source>
<target>Links</target>
<note>Class = "UITableViewSection"; headerTitle = "Links"; ObjectID = "MwP-Io-S91";</note>
</trans-unit>
<trans-unit id="U16-Hl-qjj.text" xml:space="preserve">
<source>GitHub Page</source>
<target>GitHub Page</target>
<note>Class = "UILabel"; text = "GitHub Page"; ObjectID = "U16-Hl-qjj";</note>
</trans-unit>
<trans-unit id="YKH-hO-t7T.text" xml:space="preserve">
<source>App Version 1.0.1</source>
<target>App Version 1.0.1</target>
Expand All @@ -96,6 +111,11 @@
<target>Trusted Public Keys</target>
<note>Class = "UITableViewSection"; headerTitle = "Trusted Public Keys"; ObjectID = "eFb-hd-Bdj";</note>
</trans-unit>
<trans-unit id="gMd-yI-bmR.text" xml:space="preserve">
<source>Privacy Information</source>
<target>Privacy Information</target>
<note>Class = "UILabel"; text = "Privacy Information"; ObjectID = "gMd-yI-bmR";</note>
</trans-unit>
<trans-unit id="pZh-NG-LMB.text" xml:space="preserve">
<source>Reload</source>
<target>Reload</target>
Expand Down
14 changes: 7 additions & 7 deletions ...en.xcloc/Source Contents/DGCAVerifier/Storyboards/Base.lproj/CertificateViewer.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Max Mustermann" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DVW-2y-e4I">
<rect key="frame" x="16" y="32" width="343" height="38.333333333333343"/>
<rect key="frame" x="16" y="32" width="305" height="38.333333333333343"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="32"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
Expand Down Expand Up @@ -132,7 +132,6 @@
<constraints>
<constraint firstAttribute="trailing" secondItem="9hO-yQ-B4J" secondAttribute="trailing" constant="16" id="1gH-1K-TaY"/>
<constraint firstItem="DVW-2y-e4I" firstAttribute="top" secondItem="yEe-AH-rsr" secondAttribute="top" constant="32" id="6Py-fR-Th3"/>
<constraint firstAttribute="trailing" secondItem="DVW-2y-e4I" secondAttribute="trailing" constant="16" id="7qh-Db-iAm"/>
<constraint firstItem="91E-ya-yA8" firstAttribute="centerX" secondItem="yEe-AH-rsr" secondAttribute="centerX" id="E8r-tf-ykp"/>
<constraint firstItem="NIJ-V3-NpL" firstAttribute="top" secondItem="9hO-yQ-B4J" secondAttribute="bottom" constant="16" id="GFZ-yy-x5z"/>
<constraint firstItem="Enm-XG-fIc" firstAttribute="bottom" secondItem="NIJ-V3-NpL" secondAttribute="bottom" id="NWZ-cm-Psu"/>
Expand Down Expand Up @@ -162,12 +161,12 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YKQ-nV-gL0">
<rect key="frame" x="323" y="60" width="36" height="36"/>
<rect key="frame" x="329" y="68" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="36" id="Zxq-Yo-AZT"/>
<constraint firstAttribute="height" constant="36" id="sPS-Rz-i1M"/>
<constraint firstAttribute="width" secondItem="YKQ-nV-gL0" secondAttribute="height" multiplier="1:1" id="I01-2e-CPw"/>
<constraint firstAttribute="height" constant="30" id="sPS-Rz-i1M"/>
</constraints>
<state key="normal" image="gear_white"/>
<state key="normal" backgroundImage="gear_white"/>
<connections>
<action selector="settingsButton" destination="WCj-Xf-fml" eventType="touchUpInside" id="Ncw-yx-grf"/>
</connections>
Expand All @@ -177,6 +176,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="fKu-7E-jAI" firstAttribute="bottom" secondItem="NIJ-V3-NpL" secondAttribute="top" id="36H-da-mo3"/>
<constraint firstItem="YKQ-nV-gL0" firstAttribute="top" secondItem="ghT-Ae-92i" secondAttribute="top" constant="24" id="6de-XA-YN7"/>
<constraint firstAttribute="trailing" secondItem="yEe-AH-rsr" secondAttribute="trailing" id="6hb-Qt-RV8"/>
<constraint firstItem="fKu-7E-jAI" firstAttribute="top" secondItem="Zct-pN-WQt" secondAttribute="top" id="ArD-jJ-uNk"/>
<constraint firstItem="Sd1-4U-jsd" firstAttribute="top" secondItem="Zct-pN-WQt" secondAttribute="top" id="E6p-gk-4o7"/>
Expand All @@ -189,7 +189,7 @@
<constraint firstAttribute="trailing" secondItem="Sd1-4U-jsd" secondAttribute="trailing" priority="100" id="Xl8-Re-0ql"/>
<constraint firstAttribute="trailing" secondItem="YKQ-nV-gL0" secondAttribute="trailing" constant="16" id="d8Y-GS-Ubd"/>
<constraint firstAttribute="bottomMargin" secondItem="yEe-AH-rsr" secondAttribute="bottom" id="xEk-Du-C7N"/>
<constraint firstItem="YKQ-nV-gL0" firstAttribute="top" secondItem="ghT-Ae-92i" secondAttribute="top" constant="16" id="xTI-Xq-JiW"/>
<constraint firstItem="YKQ-nV-gL0" firstAttribute="leading" secondItem="DVW-2y-e4I" secondAttribute="trailing" constant="8" id="zxW-E4-xci"/>
</constraints>
</view>
<connections>
Expand Down
Loading

0 comments on commit 1458f75

Please sign in to comment.