diff --git a/capacitor.config.ts b/capacitor.config.ts index 8755547a0..57d13b529 100644 --- a/capacitor.config.ts +++ b/capacitor.config.ts @@ -2,11 +2,15 @@ import { CapacitorConfig } from '@capacitor/cli' const config: CapacitorConfig = { appId: 'org.phidatalab.radar_armt', - appName: 'RADAR Questionnaire', + appName: 'RADAR Active RMT', webDir: 'www', server: { androidScheme: 'https' }, + loggingBehavior: 'none', + ios: { + scheme: 'RADAR Questionnaire' + }, plugins: { SplashScreen: { launchAutoHide: true, diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 3ceeb6a96..40a619386 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -8,26 +8,31 @@ /* Begin PBXBuildFile section */ 2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; }; + 4C4FF1572BEBFDF000B0D335 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4C4FF1562BEBFDF000B0D335 /* GoogleService-Info.plist */; }; 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; }; 504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; }; 504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; }; 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 */; }; + 704135CD8D02B14F5F414200 /* Pods_RADAR_Questionnaire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64300C0E7C8CE638425A12D0 /* Pods_RADAR_Questionnaire.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 2FAD9762203C412B000D30F8 /* config.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = config.xml; sourceTree = ""; }; + 4C4FF1562BEBFDF000B0D335 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../GoogleService-Info.plist"; sourceTree = ""; }; + 4C4FF1592BEC015000B0D335 /* RADAR Questionnaire.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "RADAR Questionnaire.entitlements"; sourceTree = ""; }; 50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = ""; }; - 504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 504EC3041FED79650016851F /* RADAR Questionnaire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "RADAR Questionnaire.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 504EC30C1FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 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 = ""; }; - AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 64300C0E7C8CE638425A12D0 /* Pods_RADAR_Questionnaire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RADAR_Questionnaire.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 76D0CE0D220067B194EAA22C /* Pods-RADAR Questionnaire.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RADAR Questionnaire.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RADAR Questionnaire/Pods-RADAR Questionnaire.debug.xcconfig"; sourceTree = ""; }; + 84676E1D2BB11F957E52E167 /* Pods-RADAR Questionnaire.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RADAR Questionnaire.release.xcconfig"; path = "Pods/Target Support Files/Pods-RADAR Questionnaire/Pods-RADAR Questionnaire.release.xcconfig"; sourceTree = ""; }; 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 = ""; }; 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 */ @@ -37,7 +42,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */, + 704135CD8D02B14F5F414200 /* Pods_RADAR_Questionnaire.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -47,7 +52,7 @@ 27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = { isa = PBXGroup; children = ( - AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */, + 64300C0E7C8CE638425A12D0 /* Pods_RADAR_Questionnaire.framework */, ); name = Frameworks; sourceTree = ""; @@ -55,6 +60,7 @@ 504EC2FB1FED79650016851F = { isa = PBXGroup; children = ( + 4C4FF1592BEC015000B0D335 /* RADAR Questionnaire.entitlements */, 504EC3061FED79650016851F /* App */, 504EC3051FED79650016851F /* Products */, 7F8756D8B27F46E3366F6CEA /* Pods */, @@ -65,7 +71,7 @@ 504EC3051FED79650016851F /* Products */ = { isa = PBXGroup; children = ( - 504EC3041FED79650016851F /* App.app */, + 504EC3041FED79650016851F /* RADAR Questionnaire.app */, ); name = Products; sourceTree = ""; @@ -76,6 +82,7 @@ 50379B222058CBB4000EE86E /* capacitor.config.json */, 504EC3071FED79650016851F /* AppDelegate.swift */, 504EC30B1FED79650016851F /* Main.storyboard */, + 4C4FF1562BEBFDF000B0D335 /* GoogleService-Info.plist */, 504EC30E1FED79650016851F /* Assets.xcassets */, 504EC3101FED79650016851F /* LaunchScreen.storyboard */, 504EC3131FED79650016851F /* Info.plist */, @@ -90,6 +97,8 @@ children = ( FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */, AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */, + 76D0CE0D220067B194EAA22C /* Pods-RADAR Questionnaire.debug.xcconfig */, + 84676E1D2BB11F957E52E167 /* Pods-RADAR Questionnaire.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -97,9 +106,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 504EC3031FED79650016851F /* App */ = { + 504EC3031FED79650016851F /* RADAR Questionnaire */ = { isa = PBXNativeTarget; - buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */; + buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "RADAR Questionnaire" */; buildPhases = ( 6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */, 504EC3001FED79650016851F /* Sources */, @@ -111,9 +120,9 @@ ); dependencies = ( ); - name = App; + name = "RADAR Questionnaire"; productName = App; - productReference = 504EC3041FED79650016851F /* App.app */; + productReference = 504EC3041FED79650016851F /* RADAR Questionnaire.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -145,7 +154,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 504EC3031FED79650016851F /* App */, + 504EC3031FED79650016851F /* RADAR Questionnaire */, ); }; /* End PBXProject section */ @@ -161,6 +170,7 @@ 50379B232058CBB4000EE86E /* capacitor.config.json in Resources */, 504EC30D1FED79650016851F /* Main.storyboard in Resources */, 2FAD9763203C412B000D30F8 /* config.xml in Resources */, + 4C4FF1572BEBFDF000B0D335 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -178,7 +188,7 @@ ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-RADAR Questionnaire-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -197,7 +207,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-RADAR Questionnaire/Pods-RADAR Questionnaire-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -342,9 +352,10 @@ }; 504EC3171FED79650016851F /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */; + baseConfigurationReference = 76D0CE0D220067B194EAA22C /* Pods-RADAR Questionnaire.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = "RADAR Questionnaire.entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = App/Info.plist; @@ -362,9 +373,10 @@ }; 504EC3181FED79650016851F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */; + baseConfigurationReference = 84676E1D2BB11F957E52E167 /* Pods-RADAR Questionnaire.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = "RADAR Questionnaire.entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; INFOPLIST_FILE = App/Info.plist; @@ -391,7 +403,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */ = { + 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "RADAR Questionnaire" */ = { isa = XCConfigurationList; buildConfigurations = ( 504EC3171FED79650016851F /* Debug */, diff --git a/ios/App/App/App.entitlements b/ios/App/App/App.entitlements index 903def2af..9b377f2b9 100644 --- a/ios/App/App/App.entitlements +++ b/ios/App/App/App.entitlements @@ -4,5 +4,9 @@ aps-environment development + com.apple.developer.healthkit + + com.apple.developer.healthkit.access + diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist index 33dcdb6ab..d0dc5840c 100644 --- a/ios/App/App/Info.plist +++ b/ios/App/App/Info.plist @@ -2,10 +2,14 @@ + BGTaskSchedulerPermittedIdentifiers + + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleDevelopmentRegion en CFBundleDisplayName - radar-questionnaire + RADAR Active RMT CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -19,11 +23,24 @@ CFBundleShortVersionString 3.3.1 CFBundleVersion - 3.3.1 + 1 + CFBundleURLTypes + + + CFBundleURLSchemes + + org.phidatalab.radar-armt + + + LSRequiresIPhoneOS NSCameraUsageDescription Need camera access for scanning QR codes + NSHealthShareUsageDescription + Read Health Data + NSHealthUpdateUsageDescription + Read Health Data NSMicrophoneUsageDescription Need microphone access for uploading audio UIBackgroundModes @@ -40,18 +57,20 @@ armv7 + UIRequiresFullScreen + + UIStatusBarStyle + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown UIViewControllerBasedStatusBarAppearance diff --git a/ios/App/Podfile b/ios/App/Podfile index 0ebeb182c..9bce24c48 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -34,7 +34,7 @@ def capacitor_pods pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins' end -target 'App' do +target 'RADAR Questionnaire' do capacitor_pods # Add your Pods here pod 'Firebase/Messaging' diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index 541df989f..078df2623 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -350,6 +350,6 @@ SPEC CHECKSUMS: PerfoodCapacitorHealthkit: 88f6e78b319072c4d0aec439b2fcc14d3f05d311 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 -PODFILE CHECKSUM: 1824f14cf780f76e09325666adc4a167d6b3b5b6 +PODFILE CHECKSUM: 4eeca94f0e0d84a74c743aa0b5dac0b22e8137d4 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/ios/App/RADAR Questionnaire.entitlements b/ios/App/RADAR Questionnaire.entitlements new file mode 100644 index 000000000..9b377f2b9 --- /dev/null +++ b/ios/App/RADAR Questionnaire.entitlements @@ -0,0 +1,12 @@ + + + + + aps-environment + development + com.apple.developer.healthkit + + com.apple.developer.healthkit.access + + +