diff --git a/MetaPluginDemo.xcodeproj/project.pbxproj b/MetaPluginDemo.xcodeproj/project.pbxproj index e16ff50..6808502 100755 --- a/MetaPluginDemo.xcodeproj/project.pbxproj +++ b/MetaPluginDemo.xcodeproj/project.pbxproj @@ -7,14 +7,14 @@ objects = { /* Begin PBXBuildFile section */ + 4518C54D2EE1B6B20051D965 /* WebIdAutoIdProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4518C54C2EE1B6B20051D965 /* WebIdAutoIdProductPlugin */; }; + 4518C5502EE1B6DA0051D965 /* WebIdEIdProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4518C54F2EE1B6DA0051D965 /* WebIdEIdProductPlugin */; }; + 4518C5532EE1B6F50051D965 /* WebIdVideoIdProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4518C5522EE1B6F50051D965 /* WebIdVideoIdProductPlugin */; }; + 4518C5562EE1B7520051D965 /* WebIdAccountIdProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4518C5552EE1B7520051D965 /* WebIdAccountIdProductPlugin */; }; 4C40CAAA291A6DE700D76323 /* EWebIdEnv.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C40CAA9291A6DE700D76323 /* EWebIdEnv.swift */; }; 4C40CABB291A717000D76323 /* CustomizedPluginTheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C40CABA291A717000D76323 /* CustomizedPluginTheme.swift */; }; 4C40CABD291A718D00D76323 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 4C40CABC291A718D00D76323 /* LICENSE.txt */; }; 4C4DEF962BB56D5F00F28680 /* WebIdMetaPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4C4DEF952BB56D5F00F28680 /* WebIdMetaPlugin */; }; - 4C4DEF982BB56D5F00F28680 /* WebIdPayOnServerProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4C4DEF972BB56D5F00F28680 /* WebIdPayOnServerProductPlugin */; }; - 4C4DEF9A2BB56D5F00F28680 /* WebIdEIdOnServerProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4C4DEF992BB56D5F00F28680 /* WebIdEIdOnServerProductPlugin */; }; - 4C4DEF9C2BB56D5F00F28680 /* WebIdAutoIdentOnServerProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4C4DEF9B2BB56D5F00F28680 /* WebIdAutoIdentOnServerProductPlugin */; }; - 4C62C1D42BB577CD0070AA6F /* WebIdVideoIdentProductPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = 4C62C1D32BB577CD0070AA6F /* WebIdVideoIdentProductPlugin */; }; 4C63AACE288193F10046A02E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C63AACD288193F10046A02E /* AppDelegate.swift */; }; 4C63AAD0288193F10046A02E /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C63AACF288193F10046A02E /* SceneDelegate.swift */; }; 4C63AAD2288193F10046A02E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C63AAD1288193F10046A02E /* ViewController.swift */; }; @@ -120,11 +120,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4C4DEF982BB56D5F00F28680 /* WebIdPayOnServerProductPlugin in Frameworks */, - 4C4DEF9A2BB56D5F00F28680 /* WebIdEIdOnServerProductPlugin in Frameworks */, + 4518C5562EE1B7520051D965 /* WebIdAccountIdProductPlugin in Frameworks */, + 4518C5532EE1B6F50051D965 /* WebIdVideoIdProductPlugin in Frameworks */, 4C4DEF962BB56D5F00F28680 /* WebIdMetaPlugin in Frameworks */, - 4C4DEF9C2BB56D5F00F28680 /* WebIdAutoIdentOnServerProductPlugin in Frameworks */, - 4C62C1D42BB577CD0070AA6F /* WebIdVideoIdentProductPlugin in Frameworks */, + 4518C5502EE1B6DA0051D965 /* WebIdEIdProductPlugin in Frameworks */, + 4518C54D2EE1B6B20051D965 /* WebIdAutoIdProductPlugin in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -253,10 +253,10 @@ name = MetaPluginDemo; packageProductDependencies = ( 4C4DEF952BB56D5F00F28680 /* WebIdMetaPlugin */, - 4C4DEF972BB56D5F00F28680 /* WebIdPayOnServerProductPlugin */, - 4C4DEF992BB56D5F00F28680 /* WebIdEIdOnServerProductPlugin */, - 4C4DEF9B2BB56D5F00F28680 /* WebIdAutoIdentOnServerProductPlugin */, - 4C62C1D32BB577CD0070AA6F /* WebIdVideoIdentProductPlugin */, + 4518C54C2EE1B6B20051D965 /* WebIdAutoIdProductPlugin */, + 4518C54F2EE1B6DA0051D965 /* WebIdEIdProductPlugin */, + 4518C5522EE1B6F50051D965 /* WebIdVideoIdProductPlugin */, + 4518C5552EE1B7520051D965 /* WebIdAccountIdProductPlugin */, ); productName = MetaPluginDemo; productReference = 4C63AACA288193F10046A02E /* MetaPluginDemo.app */; @@ -340,10 +340,10 @@ mainGroup = 4C63AAC1288193F10046A02E; packageReferences = ( C8B6F1CD2BB467E50023D2BF /* XCRemoteSwiftPackageReference "webid-meta-plugin-spm" */, - C8B6F1CE2BB468100023D2BF /* XCRemoteSwiftPackageReference "webid-pay-on-server-product-plugin-spm" */, - C8B6F1CF2BB4682D0023D2BF /* XCRemoteSwiftPackageReference "webid-eid-on-server-product-plugin-spm" */, - C8B6F1D02BB468600023D2BF /* XCRemoteSwiftPackageReference "webid-auto-ident-on-server-product-plugin-spm" */, - 4C62C1D22BB577B70070AA6F /* XCRemoteSwiftPackageReference "webid-video-ident-product-plugin-spm" */, + 4518C54B2EE1B6B20051D965 /* XCRemoteSwiftPackageReference "webid-autoid-product-plugin-spm" */, + 4518C54E2EE1B6DA0051D965 /* XCRemoteSwiftPackageReference "webid-eid-product-plugin-spm" */, + 4518C5512EE1B6F50051D965 /* XCRemoteSwiftPackageReference "webid-videoid-product-plugin-spm" */, + 4518C5542EE1B7520051D965 /* XCRemoteSwiftPackageReference "webid-accountid-product-plugin-spm" */, ); productRefGroup = 4C63AACB288193F10046A02E /* Products */; projectDirPath = ""; @@ -796,12 +796,36 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 4C62C1D22BB577B70070AA6F /* XCRemoteSwiftPackageReference "webid-video-ident-product-plugin-spm" */ = { + 4518C54B2EE1B6B20051D965 /* XCRemoteSwiftPackageReference "webid-autoid-product-plugin-spm" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-video-ident-product-plugin-spm"; + repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-autoid-product-plugin-spm"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 15.0.0; + minimumVersion = 21.2.2; + }; + }; + 4518C54E2EE1B6DA0051D965 /* XCRemoteSwiftPackageReference "webid-eid-product-plugin-spm" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-eid-product-plugin-spm"; + requirement = { + kind = upToNextMinorVersion; + minimumVersion = 21.2.2; + }; + }; + 4518C5512EE1B6F50051D965 /* XCRemoteSwiftPackageReference "webid-videoid-product-plugin-spm" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-videoid-product-plugin-spm"; + requirement = { + kind = upToNextMinorVersion; + minimumVersion = 21.2.2; + }; + }; + 4518C5542EE1B7520051D965 /* XCRemoteSwiftPackageReference "webid-accountid-product-plugin-spm" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-accountid-product-plugin-spm"; + requirement = { + kind = upToNextMinorVersion; + minimumVersion = 21.2.2; }; }; C8B6F1CD2BB467E50023D2BF /* XCRemoteSwiftPackageReference "webid-meta-plugin-spm" */ = { @@ -809,61 +833,37 @@ repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-meta-plugin-spm.git"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 15.0.0; - }; - }; - C8B6F1CE2BB468100023D2BF /* XCRemoteSwiftPackageReference "webid-pay-on-server-product-plugin-spm" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-pay-on-server-product-plugin-spm.git"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 15.0.0; - }; - }; - C8B6F1CF2BB4682D0023D2BF /* XCRemoteSwiftPackageReference "webid-eid-on-server-product-plugin-spm" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-eid-on-server-product-plugin-spm.git"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 15.0.0; - }; - }; - C8B6F1D02BB468600023D2BF /* XCRemoteSwiftPackageReference "webid-auto-ident-on-server-product-plugin-spm" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://api.webid-solutions.de/releases/ios/spm/SwiftPackages/webid-auto-ident-on-server-product-plugin-spm.git"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 15.0.0; + minimumVersion = 21.2.2; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + 4518C54C2EE1B6B20051D965 /* WebIdAutoIdProductPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 4518C54B2EE1B6B20051D965 /* XCRemoteSwiftPackageReference "webid-autoid-product-plugin-spm" */; + productName = WebIdAutoIdProductPlugin; + }; + 4518C54F2EE1B6DA0051D965 /* WebIdEIdProductPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 4518C54E2EE1B6DA0051D965 /* XCRemoteSwiftPackageReference "webid-eid-product-plugin-spm" */; + productName = WebIdEIdProductPlugin; + }; + 4518C5522EE1B6F50051D965 /* WebIdVideoIdProductPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 4518C5512EE1B6F50051D965 /* XCRemoteSwiftPackageReference "webid-videoid-product-plugin-spm" */; + productName = WebIdVideoIdProductPlugin; + }; + 4518C5552EE1B7520051D965 /* WebIdAccountIdProductPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 4518C5542EE1B7520051D965 /* XCRemoteSwiftPackageReference "webid-accountid-product-plugin-spm" */; + productName = WebIdAccountIdProductPlugin; + }; 4C4DEF952BB56D5F00F28680 /* WebIdMetaPlugin */ = { isa = XCSwiftPackageProductDependency; package = C8B6F1CD2BB467E50023D2BF /* XCRemoteSwiftPackageReference "webid-meta-plugin-spm" */; productName = WebIdMetaPlugin; }; - 4C4DEF972BB56D5F00F28680 /* WebIdPayOnServerProductPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = C8B6F1CE2BB468100023D2BF /* XCRemoteSwiftPackageReference "webid-pay-on-server-product-plugin-spm" */; - productName = WebIdPayOnServerProductPlugin; - }; - 4C4DEF992BB56D5F00F28680 /* WebIdEIdOnServerProductPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = C8B6F1CF2BB4682D0023D2BF /* XCRemoteSwiftPackageReference "webid-eid-on-server-product-plugin-spm" */; - productName = WebIdEIdOnServerProductPlugin; - }; - 4C4DEF9B2BB56D5F00F28680 /* WebIdAutoIdentOnServerProductPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = C8B6F1D02BB468600023D2BF /* XCRemoteSwiftPackageReference "webid-auto-ident-on-server-product-plugin-spm" */; - productName = WebIdAutoIdentOnServerProductPlugin; - }; - 4C62C1D32BB577CD0070AA6F /* WebIdVideoIdentProductPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = 4C62C1D22BB577B70070AA6F /* XCRemoteSwiftPackageReference "webid-video-ident-product-plugin-spm" */; - productName = WebIdVideoIdentProductPlugin; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 4C63AAC2288193F10046A02E /* Project object */; diff --git a/MetaPluginDemo/CustomizedPluginTheme.swift b/MetaPluginDemo/CustomizedPluginTheme.swift index 6b4b7f7..bc6aa1e 100755 --- a/MetaPluginDemo/CustomizedPluginTheme.swift +++ b/MetaPluginDemo/CustomizedPluginTheme.swift @@ -11,16 +11,20 @@ import WebIdUiKitComponents class CustomizedPluginTheme { /** - * Creates a ``WebidAppTheme`` to use in light mode or, if older than iOS 13.0, standard mode. + * Creates a ``WebIdThemeV4`` to use in light mode or standard mode. */ - internal static func getLightVersion() -> WebidAppTheme { - WebidAppTheme() + internal static func getLightVersion() -> WebIdThemeV4 { + WebIdThemeV4.makeLightTheme { config in + // customize theming here + } } /** - * Creates a ``WebidAppTheme`` to use in dark mode. + * Creates a ``WebIdThemeV4`` to use in dark mode. */ - internal static func getDarkVersion() -> WebidAppTheme { - WebidAppTheme() + internal static func getDarkVersion() -> WebIdThemeV4 { + WebIdThemeV4.makeDarkTheme { config in + // customize theming here + } } } diff --git a/MetaPluginDemo/ViewController.swift b/MetaPluginDemo/ViewController.swift index 4eadb05..735d2d9 100755 --- a/MetaPluginDemo/ViewController.swift +++ b/MetaPluginDemo/ViewController.swift @@ -5,15 +5,15 @@ import UIKit import WebIdIosSdk +import WebIdUiKitComponents import WebIdPluginCore import WebIdMetaPlugin -import WebIdUiKitComponents -import WebIdVideoIdentProductPlugin -import WebIdPayOnServerProductPlugin -import WebIdEIdOnServerProductPlugin -import WebIdAutoIdentOnServerProductPlugin +import WebIdVideoIdProductPlugin +import WebIdAccountIdProductPlugin +import WebIdEIdProductPlugin +import WebIdAutoIdProductPlugin -/// Demo App which starts the ``VideoIdentProductPlugin`` and handles its result +/// Demo App which starts the ``VideoIdProductPlugin`` and handles its result class ViewController: UIViewController, IProductPluginWebidDelegate { @@ -149,7 +149,7 @@ class ViewController: additionalResult: String?, faultOriginator: String ) { - if let container = failreasonContainer as? AutoIdOnServerProductPluginFailReasonContainer { + if let container = failreasonContainer as? AutoIdProductPluginFailReasonContainer { writeLog(entry: "\(L10n.productJourneyFinishedWithFailure) \(container.failreason)") } } @@ -174,16 +174,16 @@ class ViewController: private func getChosenPlugins() -> [any IProductPluginWebId] { var plugins = [any IProductPluginWebId]() if cbAutoIdOnServer.isChecked { - plugins.append(AutoIdentOnServerProductPlugin()) + plugins.append(AutoIdProductPlugin()) } if cbPayOnServer.isChecked { - plugins.append(PayOnServerProductPlugin()) + plugins.append(AccountIdProductPlugin()) } if cbEIdOnServer.isChecked { - plugins.append(EidOnServerProductPlugin()) + plugins.append(EIdProductPlugin()) } if cbViPP.isChecked { - plugins.append(VideoIdentProductPlugin()) + plugins.append(VideoIdProductPlugin()) } return plugins } diff --git a/README.md b/README.md index 8bca1ca..9075355 100755 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ You should have been supplied with a username and an api-key for your environmen Replace the placeholders in the Credentials class.
-In order to run a video-ident process, you will need to create it first outside of the app. +In order to run a VideoID process, you will need to create it first outside of the app. From the process creation request to the server, you should have received an action-id, consisting of 9 numbers. Insert this number in the Credentials class, by replacing the placeholder string with the action-id as a string.
@@ -46,12 +46,12 @@ To implement or experiment with different themes, navigate to the file Customize E.G. ``` -internal static func getLightVersion() -> WebidAppTheme { - WebidAppTheme( - Background: UIColor.blue, - PrimaryColor: UI.Color.cyan - ) -} + internal static func getLightVersion() -> WebIdThemeV4 { + WebIdThemeV4.makeLightTheme { config in + config.colors.action.primary = .red + config.colors.background.primary = .blue + } + } ``` Consult the theming guide to see what items can be manipulated.