diff --git a/capacitor.config.json b/capacitor.config.json new file mode 100644 index 00000000..18f42003 --- /dev/null +++ b/capacitor.config.json @@ -0,0 +1,6 @@ +{ + "appId": "com.brownspank.timesafari", + "appName": "TimeSafari", + "webDir": "dist", + "bundledWebRuntime": false +} diff --git a/capacitor.config.ts b/capacitor.config.ts deleted file mode 100644 index f5e0e126..00000000 --- a/capacitor.config.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { CapacitorConfig } from '@capacitor/cli'; - -const config: CapacitorConfig = { - appId: 'app.timesafari', - appName: 'TimeSafari', - webDir: 'dist', - bundledWebRuntime: false, - server: { - cleartext: true, - }, - plugins: { - App: { - appUrlOpen: { - handlers: [ - { - url: "timesafari://*", - autoVerify: true - } - ] - } - } - } -}; - -export default config; diff --git a/ios/.gitignore b/ios/.gitignore index e017b71f..f4702997 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -1,16 +1,13 @@ App/build -App/output App/Pods - -App/*.xcodeproj/xcuserdata/ -App/*.xcworkspace/xcuserdata/ -App/*/public - -# Generated Config files -App/*/capacitor.config.json -App/*/config.xml +App/output +App/App/public +DerivedData +xcuserdata # Cordova plugins for Capacitor capacitor-cordova-ios-plugins -DerivedData +# Generated Config files +App/App/capacitor.config.json +App/App/config.xml diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 1a3f1d76..848ad8dc 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 2BC611FE3D7967BDB623FF21 /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0C2082015AEE6A0776A3EAB /* Pods_App.framework */; }; 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; }; 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; @@ -15,6 +14,7 @@ 504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; }; 504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; }; 50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; }; + A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -27,10 +27,8 @@ 504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = ""; }; - 821226CEE4D47A540167CC8F /* Pods-Time Safari.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Time Safari.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Time Safari/Pods-Time Safari.debug.xcconfig"; sourceTree = ""; }; + AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = ""; }; - E0C2082015AEE6A0776A3EAB /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - EF03C3F99471948925ED5AC3 /* Pods-Time Safari.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Time Safari.release.xcconfig"; path = "Pods/Target Support Files/Pods-Time Safari/Pods-Time Safari.release.xcconfig"; sourceTree = ""; }; FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -39,7 +37,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2BC611FE3D7967BDB623FF21 /* Pods_App.framework in Frameworks */, + A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -49,7 +47,7 @@ 27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = { isa = PBXGroup; children = ( - E0C2082015AEE6A0776A3EAB /* Pods_App.framework */, + AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */, ); name = Frameworks; sourceTree = ""; @@ -92,8 +90,6 @@ children = ( FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */, AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */, - 821226CEE4D47A540167CC8F /* Pods-Time Safari.debug.xcconfig */, - EF03C3F99471948925ED5AC3 /* Pods-Time Safari.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -116,7 +112,7 @@ dependencies = ( ); name = App; - productName = "Time Safari"; + productName = App; productReference = 504EC3041FED79650016851F /* App.app */; productType = "com.apple.product-type.application"; }; @@ -126,8 +122,8 @@ 504EC2FC1FED79650016851F /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 920; - LastUpgradeCheck = 920; + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 0920; TargetAttributes = { 504EC3031FED79650016851F = { CreatedOnToolsVersion = 9.2; @@ -145,6 +141,8 @@ Base, ); mainGroup = 504EC2FB1FED79650016851F; + packageReferences = ( + ); productRefGroup = 504EC3051FED79650016851F /* Products */; projectDirPath = ""; projectRoot = ""; @@ -350,14 +348,14 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 12; - DEVELOPMENT_TEAM = GM3FS5JQPH; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 7XVXYPEQYJ; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.4.4; + MARKETING_VERSION = 1.0; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; - PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; + PRODUCT_BUNDLE_IDENTIFIER = com.brownspank.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_VERSION = 5.0; @@ -371,13 +369,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 12; - DEVELOPMENT_TEAM = GM3FS5JQPH; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = 7XVXYPEQYJ; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.4.4; - PRODUCT_BUNDLE_IDENTIFIER = app.timesafari; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.brownspank.timesafari; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; SWIFT_VERSION = 5.0; diff --git a/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/ios/App/App.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png index f5aba734..adf6ba01 100644 Binary files a/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and b/ios/App/App/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png differ diff --git a/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json index b1a84833..9b7d382d 100644 --- a/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,14 +1,14 @@ { - "images": [ + "images" : [ { - "idiom": "universal", - "size": "1024x1024", - "filename": "AppIcon-512@2x.png", - "platform": "ios" + "filename" : "AppIcon-512@2x.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" } ], - "info": { - "author": "xcode", - "version": 1 + "info" : { + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 99bea7db..2a84039a 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -22,10 +22,6 @@ $(CURRENT_PROJECT_VERSION) LSRequiresIPhoneOS - NSCameraUsageDescription - Upload photos and scan friends' QR codes - NSPhotoLibraryUsageDescription - Upload photos for gifts UILaunchStoryboardName LaunchScreen UIMainStoryboardFile @@ -49,16 +45,5 @@ UIViewControllerBasedStatusBarAppearance - - CFBundleURLTypes - - - CFBundleURLName - app.timesafari - CFBundleURLSchemes - - timesafari - - - + diff --git a/ios/App/Podfile b/ios/App/Podfile index 3607f7e2..e5417ad9 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -11,6 +11,7 @@ install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' + pod 'CapacitorMlkitBarcodeScanning', :path => '../../node_modules/@capacitor-mlkit/barcode-scanning' pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app' pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera' pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem' diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index 2c00f4a7..f513a8ba 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -8,10 +8,71 @@ PODS: - CapacitorCordova (6.2.1) - CapacitorFilesystem (6.0.3): - Capacitor + - CapacitorMlkitBarcodeScanning (6.2.0): + - Capacitor + - GoogleMLKit/BarcodeScanning (= 5.0.0) - CapacitorShare (6.0.3): - Capacitor - CapawesomeCapacitorFilePicker (6.2.0): - Capacitor + - GoogleDataTransport (9.4.1): + - GoogleUtilities/Environment (~> 7.7) + - nanopb (< 2.30911.0, >= 2.30908.0) + - PromisesObjC (< 3.0, >= 1.2) + - GoogleMLKit/BarcodeScanning (5.0.0): + - GoogleMLKit/MLKitCore + - MLKitBarcodeScanning (~> 4.0.0) + - GoogleMLKit/MLKitCore (5.0.0): + - MLKitCommon (~> 10.0.0) + - GoogleToolboxForMac/DebugUtils (2.3.2): + - GoogleToolboxForMac/Defines (= 2.3.2) + - GoogleToolboxForMac/Defines (2.3.2) + - GoogleToolboxForMac/Logger (2.3.2): + - GoogleToolboxForMac/Defines (= 2.3.2) + - "GoogleToolboxForMac/NSData+zlib (2.3.2)": + - GoogleToolboxForMac/Defines (= 2.3.2) + - "GoogleToolboxForMac/NSDictionary+URLArguments (2.3.2)": + - GoogleToolboxForMac/DebugUtils (= 2.3.2) + - GoogleToolboxForMac/Defines (= 2.3.2) + - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)" + - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)" + - GoogleUtilities/Environment (7.13.3): + - GoogleUtilities/Privacy + - PromisesObjC (< 3.0, >= 1.2) + - GoogleUtilities/Logger (7.13.3): + - GoogleUtilities/Environment + - GoogleUtilities/Privacy + - GoogleUtilities/Privacy (7.13.3) + - GoogleUtilities/UserDefaults (7.13.3): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GoogleUtilitiesComponents (1.1.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (3.5.0) + - MLImage (1.0.0-beta5) + - MLKitBarcodeScanning (4.0.0): + - MLKitCommon (~> 10.0) + - MLKitVision (~> 6.0) + - MLKitCommon (10.0.0): + - GoogleDataTransport (~> 9.0) + - GoogleToolboxForMac/Logger (~> 2.1) + - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" + - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" + - GoogleUtilities/UserDefaults (~> 7.0) + - GoogleUtilitiesComponents (~> 1.0) + - GTMSessionFetcher/Core (< 4.0, >= 1.1) + - MLKitVision (6.0.0): + - GoogleToolboxForMac/Logger (~> 2.1) + - "GoogleToolboxForMac/NSData+zlib (~> 2.1)" + - GTMSessionFetcher/Core (< 4.0, >= 1.1) + - MLImage (= 1.0.0-beta5) + - MLKitCommon (~> 10.0) + - nanopb (2.30910.0): + - nanopb/decode (= 2.30910.0) + - nanopb/encode (= 2.30910.0) + - nanopb/decode (2.30910.0) + - nanopb/encode (2.30910.0) + - PromisesObjC (2.4.0) DEPENDENCIES: - "Capacitor (from `../../node_modules/@capacitor/ios`)" @@ -19,9 +80,25 @@ DEPENDENCIES: - "CapacitorCamera (from `../../node_modules/@capacitor/camera`)" - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)" - "CapacitorFilesystem (from `../../node_modules/@capacitor/filesystem`)" + - "CapacitorMlkitBarcodeScanning (from `../../node_modules/@capacitor-mlkit/barcode-scanning`)" - "CapacitorShare (from `../../node_modules/@capacitor/share`)" - "CapawesomeCapacitorFilePicker (from `../../node_modules/@capawesome/capacitor-file-picker`)" +SPEC REPOS: + trunk: + - GoogleDataTransport + - GoogleMLKit + - GoogleToolboxForMac + - GoogleUtilities + - GoogleUtilitiesComponents + - GTMSessionFetcher + - MLImage + - MLKitBarcodeScanning + - MLKitCommon + - MLKitVision + - nanopb + - PromisesObjC + EXTERNAL SOURCES: Capacitor: :path: "../../node_modules/@capacitor/ios" @@ -33,6 +110,8 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/ios" CapacitorFilesystem: :path: "../../node_modules/@capacitor/filesystem" + CapacitorMlkitBarcodeScanning: + :path: "../../node_modules/@capacitor-mlkit/barcode-scanning" CapacitorShare: :path: "../../node_modules/@capacitor/share" CapawesomeCapacitorFilePicker: @@ -44,9 +123,22 @@ SPEC CHECKSUMS: CapacitorCamera: 9bc7b005d0e6f1d5f525b8137045b60cffffce79 CapacitorCordova: 8d93e14982f440181be7304aa9559ca631d77fff CapacitorFilesystem: 59270a63c60836248812671aa3b15df673fbaf74 + CapacitorMlkitBarcodeScanning: 7652be9c7922f39203a361de735d340ae37e134e CapacitorShare: d2a742baec21c8f3b92b361a2fbd2401cdd8288e CapawesomeCapacitorFilePicker: c40822f0a39f86855321943c7829d52bca7f01bd + GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a + GoogleMLKit: 90ba06e028795a50261f29500d238d6061538711 + GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34 + GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 + GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe + GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 + MLImage: 1824212150da33ef225fbd3dc49f184cf611046c + MLKitBarcodeScanning: 9cb0ec5ec65bbb5db31de4eba0a3289626beab4e + MLKitCommon: afcd11b6c0735066a0dde8b4bf2331f6197cbca2 + MLKitVision: 90922bca854014a856f8b649d1f1f04f63fd9c79 + nanopb: 438bc412db1928dac798aa6fd75726007be04262 + PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 -PODFILE CHECKSUM: 1e9280368fd410520414f5741bf8fdfe7847b965 +PODFILE CHECKSUM: 7e7e09e6937de7f015393aecf2cf7823645689b3 COCOAPODS: 1.16.2