diff --git a/.gitattributes b/.gitattributes index b7909861..4695966a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,5 @@ TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database7.swift filter=git- TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database8.swift filter=git-crypt diff=git-crypt TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database9.swift filter=git-crypt diff=git-crypt TwoFAS/Content/Assets/Assets.car filter=git-crypt diff=git-crypt +TwoFAS/Content/AssetsWatch/Assets.car filter=git-crypt diff=git-crypt TwoFAS/TwoFAS/Other/Guides/** filter=git-crypt diff=git-crypt \ No newline at end of file diff --git a/TwoFAS/Content/Assets/Assets.car b/TwoFAS/Content/Assets/Assets.car index ea454fc1..30f9c421 100644 Binary files a/TwoFAS/Content/Assets/Assets.car and b/TwoFAS/Content/Assets/Assets.car differ diff --git a/TwoFAS/Content/AssetsWatch/Assets.car b/TwoFAS/Content/AssetsWatch/Assets.car new file mode 100644 index 00000000..4f82c865 Binary files /dev/null and b/TwoFAS/Content/AssetsWatch/Assets.car differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database0.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database0.swift index 8959b38b..9b227dcf 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database0.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database0.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database1.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database1.swift index 9855976f..db7a821c 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database1.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database1.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database2.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database2.swift index a9da9cf3..33a721f4 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database2.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database2.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database3.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database3.swift index 1a47dab2..1cb00e5e 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database3.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database3.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database4.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database4.swift index 275660ff..ec446411 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database4.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database4.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database5.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database5.swift index 5b6b1085..734ce5cc 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database5.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database5.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database6.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database6.swift index 9678cf75..e20f47ce 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database6.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database6.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database7.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database7.swift index dd5c52df..23486928 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database7.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database7.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database8.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database8.swift index 5e904caf..f9afa714 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database8.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database8.swift differ diff --git a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database9.swift b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database9.swift index 0e57c696..5c577fd2 100644 Binary files a/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database9.swift and b/TwoFAS/Content/Sources/IconDescriptionDatabaseImpl+Database9.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database0.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database0.swift index b1c696d9..d4513c53 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database0.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database0.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database1.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database1.swift index f62b6161..3cdbf33c 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database1.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database1.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database2.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database2.swift index 852a429e..a90854f2 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database2.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database2.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database3.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database3.swift index 8154a460..d38fe2b6 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database3.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database3.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database4.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database4.swift index 0e3c7749..5b40bfda 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database4.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database4.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database5.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database5.swift index 02a342da..28279c75 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database5.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database5.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database6.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database6.swift index 0055ec4e..c06e5958 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database6.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database6.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database7.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database7.swift index b86c9f22..53800c10 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database7.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database7.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database8.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database8.swift index f2b325f4..e874d299 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database8.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database8.swift differ diff --git a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database9.swift b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database9.swift index ad84d2d2..48ef0849 100644 Binary files a/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database9.swift and b/TwoFAS/Content/Sources/ServiceDefinitionDatabaseImpl+Database9.swift differ diff --git a/TwoFAS/TwoFAS.xcodeproj/project.pbxproj b/TwoFAS/TwoFAS.xcodeproj/project.pbxproj index f87dff3e..f93d585d 100644 --- a/TwoFAS/TwoFAS.xcodeproj/project.pbxproj +++ b/TwoFAS/TwoFAS.xcodeproj/project.pbxproj @@ -251,6 +251,7 @@ C23BAB042545A861009B1EF8 /* CloudKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = C23BAB032545A861009B1EF8 /* CloudKit.swift */; }; C23BAB142545AEF5009B1EF8 /* ConstStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = C23BAB132545AEF5009B1EF8 /* ConstStorage.swift */; }; C23EBF122651276800FA9E81 /* Kronos in Frameworks */ = {isa = PBXBuildFile; productRef = C23EBF112651276800FA9E81 /* Kronos */; }; + C23FC6312BCD49BB0040FE5C /* Assets.car in Resources */ = {isa = PBXBuildFile; fileRef = C23FC62F2BCD49BB0040FE5C /* Assets.car */; }; C23FD50A2814635400E4E9C5 /* ComposeServiceWebExtensionFlowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C23FD5092814635400E4E9C5 /* ComposeServiceWebExtensionFlowController.swift */; }; C23FD5102814648C00E4E9C5 /* ComposeServiceWebExtensionModuleInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = C23FD50F2814648C00E4E9C5 /* ComposeServiceWebExtensionModuleInteractor.swift */; }; C23FD51228146E2E00E4E9C5 /* ComposeServiceWebExtensionPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = C23FD51128146E2E00E4E9C5 /* ComposeServiceWebExtensionPresenter.swift */; }; @@ -580,7 +581,6 @@ C274CA3F2BAB8BE3008E7212 /* ServiceDefinitionDatabaseImpl+Database7.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2E53B672B62DDFB008E1E70 /* ServiceDefinitionDatabaseImpl+Database7.swift */; }; C274CA402BAB8BE3008E7212 /* ServiceDefinitionDatabaseImpl+Database1.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2E53B622B62DDFB008E1E70 /* ServiceDefinitionDatabaseImpl+Database1.swift */; }; C274CA412BAB8BE3008E7212 /* ServiceDefinitionDatabaseImpl+Database0.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2E53B582B62DDFB008E1E70 /* ServiceDefinitionDatabaseImpl+Database0.swift */; }; - C274CA452BAB8BE3008E7212 /* Assets.car in Resources */ = {isa = PBXBuildFile; fileRef = C2E53B882B62DE13008E1E70 /* Assets.car */; }; C274CA4A2BAB8C23008E7212 /* CommonWatch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C274CA232BAB8B92008E7212 /* CommonWatch.framework */; }; C274CA4F2BAB8C35008E7212 /* CommonWatch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C274CA232BAB8B92008E7212 /* CommonWatch.framework */; }; C274CA532BAB8C35008E7212 /* ContentWatch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C274CA492BAB8BE3008E7212 /* ContentWatch.framework */; }; @@ -2115,6 +2115,7 @@ C23BAAF32545A1E9009B1EF8 /* SyncHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncHandler.swift; sourceTree = ""; }; C23BAB032545A861009B1EF8 /* CloudKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKit.swift; sourceTree = ""; }; C23BAB132545AEF5009B1EF8 /* ConstStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstStorage.swift; sourceTree = ""; }; + C23FC62F2BCD49BB0040FE5C /* Assets.car */ = {isa = PBXFileReference; lastKnownFileType = file; path = Assets.car; sourceTree = ""; }; C23FD5092814635400E4E9C5 /* ComposeServiceWebExtensionFlowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComposeServiceWebExtensionFlowController.swift; sourceTree = ""; }; C23FD50F2814648C00E4E9C5 /* ComposeServiceWebExtensionModuleInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComposeServiceWebExtensionModuleInteractor.swift; sourceTree = ""; }; C23FD51128146E2E00E4E9C5 /* ComposeServiceWebExtensionPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComposeServiceWebExtensionPresenter.swift; sourceTree = ""; }; @@ -4639,6 +4640,14 @@ path = Flow; sourceTree = ""; }; + C23FC6302BCD49BB0040FE5C /* AssetsWatch */ = { + isa = PBXGroup; + children = ( + C23FC62F2BCD49BB0040FE5C /* Assets.car */, + ); + path = AssetsWatch; + sourceTree = ""; + }; C23FD50828144A4B00E4E9C5 /* WebExtension */ = { isa = PBXGroup; children = ( @@ -7704,6 +7713,7 @@ C2E53B4C2B62DDCB008E1E70 /* Content */ = { isa = PBXGroup; children = ( + C23FC6302BCD49BB0040FE5C /* AssetsWatch */, C2E53B872B62DE13008E1E70 /* Assets */, C2E53B562B62DDFB008E1E70 /* Sources */, C2E53B4D2B62DDCB008E1E70 /* Content.h */, @@ -9123,7 +9133,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - C274CA452BAB8BE3008E7212 /* Assets.car in Resources */, + C23FC6312BCD49BB0040FE5C /* Assets.car in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/TwoFAS/update.swift b/TwoFAS/update.swift index 7a122ed0..6cafabf7 100755 Binary files a/TwoFAS/update.swift and b/TwoFAS/update.swift differ