diff --git a/DGCAWallet.xcodeproj/project.pbxproj b/DGCAWallet.xcodeproj/project.pbxproj index 475fe7a..1f23172 100644 --- a/DGCAWallet.xcodeproj/project.pbxproj +++ b/DGCAWallet.xcodeproj/project.pbxproj @@ -7,9 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 5C07262D26AEAA64006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; - 5C07262E26AEAA64006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; - 5C07262F26AEAA65006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; + 5C07263326AFE167006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; + 5C07263426AFE167006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; + 5C07263526AFE168006C4986 /* context.jsonc in Resources */ = {isa = PBXBuildFile; fileRef = 5CFEDB1A269DBB4C00074F66 /* context.jsonc */; }; 5C50CF09269700550015EE29 /* CheckValidityVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF07269700540015EE29 /* CheckValidityVC.swift */; }; 5C50CF0A269700550015EE29 /* CheckValidityVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF07269700540015EE29 /* CheckValidityVC.swift */; }; 5C50CF0B269700550015EE29 /* CheckValidityVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C50CF07269700540015EE29 /* CheckValidityVC.swift */; }; @@ -567,7 +567,7 @@ DA01661E26554992005B73A1 /* OpenSourceNotices.json in Resources */, CEA6D6F5261F8D2900715333 /* Assets.xcassets in Resources */, 5C50CF0C269700550015EE29 /* CheckValidityVC.xib in Resources */, - 5C07262D26AEAA64006C4986 /* context.jsonc in Resources */, + 5C07263326AFE167006C4986 /* context.jsonc in Resources */, CEA6D6F3261F8D2700715333 /* Main.storyboard in Resources */, 5C50CF14269700710015EE29 /* RuleValidationResultVC.xib in Resources */, DA017DE626552259006E4D49 /* Licenses.storyboard in Resources */, @@ -580,7 +580,7 @@ buildActionMask = 2147483647; files = ( 5C50CF15269700710015EE29 /* RuleValidationResultVC.xib in Resources */, - 5C07262E26AEAA64006C4986 /* context.jsonc in Resources */, + 5C07263426AFE167006C4986 /* context.jsonc in Resources */, 5C50CF2B26972BCA0015EE29 /* CellWithTitleAndDescriptionTVC.xib in Resources */, 5C50CF3326972BFD0015EE29 /* CellWithDateAndCountryTVC.xib in Resources */, 5C50CF0D269700550015EE29 /* CheckValidityVC.xib in Resources */, @@ -593,7 +593,7 @@ buildActionMask = 2147483647; files = ( 5C50CF16269700710015EE29 /* RuleValidationResultVC.xib in Resources */, - 5C07262F26AEAA65006C4986 /* context.jsonc in Resources */, + 5C07263526AFE168006C4986 /* context.jsonc in Resources */, 5C50CF2C26972BCA0015EE29 /* CellWithTitleAndDescriptionTVC.xib in Resources */, 5C50CF3426972BFD0015EE29 /* CellWithDateAndCountryTVC.xib in Resources */, 5C50CF0E269700550015EE29 /* CheckValidityVC.xib in Resources */, @@ -894,7 +894,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 9FH6TNGWF2; INFOPLIST_FILE = DGCAWallet/SupportingFiles/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.1; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.0; + MARKETING_VERSION = 1.1.0.1; PRODUCT_BUNDLE_IDENTIFIER = "com.t-systems.pu-ds.dgca.wallet.dev"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Digital Green Certificate Wallet"; @@ -918,7 +918,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 9; + CURRENT_PROJECT_VERSION = 10; DEVELOPMENT_TEAM = 9FH6TNGWF2; INFOPLIST_FILE = DGCAWallet/SupportingFiles/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.1; @@ -926,7 +926,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.0; + MARKETING_VERSION = 1.1.0.1; PRODUCT_BUNDLE_IDENTIFIER = "com.t-systems.pu-ds.dgca.wallet.dev"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Digital Green Certificate Wallet"; diff --git a/DGCAWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DGCAWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 84e706b..d775bcc 100644 --- a/DGCAWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DGCAWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -24,7 +24,7 @@ "repositoryURL": "https://github.com/eu-digital-green-certificates/dgc-certlogic-ios.git", "state": { "branch": "main", - "revision": "80c9ff3697b3e3e0e875e5e0a41b2dbbfa4a9ca6", + "revision": "8f07a22ec2adc2335b4a4cb75b408c8c93d86208", "version": null } }, @@ -33,7 +33,7 @@ "repositoryURL": "https://github.com/eu-digital-green-certificates/dgca-app-core-ios", "state": { "branch": "main", - "revision": "3125cb47aea8b8ebf1491122ac0d452f63606c68", + "revision": "ea7f671dd19260ba93681114ff6518eae9725129", "version": null } }, diff --git a/DGCAWallet/SupportingFiles/en.lproj/Localizable.strings b/DGCAWallet/SupportingFiles/en.lproj/Localizable.strings index a85e2ac..86fb9f6 100644 --- a/DGCAWallet/SupportingFiles/en.lproj/Localizable.strings +++ b/DGCAWallet/SupportingFiles/en.lproj/Localizable.strings @@ -71,3 +71,4 @@ "info_without_waranty" = "This check gives an indication on eligibility to travel based on your certificate. Restriction of free movement in response to the coronavirus pandemic are subject to change and might be based on additional information not available to and within this application."; "issuer.country" = "Issuer Country"; "test.type" = "Type of Test"; +"section.name" = "Name"; diff --git a/DGCAWallet/ViewControllers/Scan.swift b/DGCAWallet/ViewControllers/Scan.swift index 27c1db1..dc437e5 100644 --- a/DGCAWallet/ViewControllers/Scan.swift +++ b/DGCAWallet/ViewControllers/Scan.swift @@ -34,6 +34,7 @@ class ScanVC: SwiftDGC.ScanVC { override func viewDidLoad() { super.viewDidLoad() + applicationType = .wallet createBackButton() } }