diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bec1a73617..0b71730af6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,10 +92,10 @@ jobs: - name: Bundle iOS JS run: npx react-native bundle --dev false --entry-file index.js --bundle-output ios/main.jsbundle --platform ios --verbose # - name: Build App - # # xcodebuild -workspace PrivateKit.xcworkspace -configuration Debug -scheme PrivateKit - # # xcodebuild -workspace PrivateKit.xcworkspace -scheme PrivateKit archive -archivePath PrivateKit.xcarchive -allowProvisioningUpdates - # # xcodebuild -exportArchive -archivePath ./PrivateKit.xcarchive -exportPath . -exportOptionsPlist PrivateKit/Info.plist - # run: xcodebuild -workspace PrivateKit.xcworkspace -scheme PrivateKit archive -archivePath PrivateKit.xcarchive -allowProvisioningUpdates + # # xcodebuild -workspace COVIDSafePaths.xcworkspace -configuration Debug -scheme COVIDSafePaths + # # xcodebuild -workspace COVIDSafePaths.xcworkspace -scheme COVIDSafePaths archive -archivePath COVIDSafePaths.xcarchive -allowProvisioningUpdates + # # xcodebuild -exportArchive -archivePath ./COVIDSafePaths.xcarchive -exportPath . -exportOptionsPlist COVIDSafePaths/Info.plist + # run: xcodebuild -workspace COVIDSafePaths.xcworkspace -scheme COVIDSafePaths archive -archivePath COVIDSafePaths.xcarchive -allowProvisioningUpdates # working-directory: ./ios # - name: Upload Artifact # uses: actions/upload-artifact@v1 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 756eb1d43c..13f1026e7e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -2,11 +2,11 @@ ## 1. Purpose -A primary goal of Private Kit is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof). +A primary goal of COVID Safe Paths is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof). This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior. -We invite all those who participate in Private Kit to help us create safe and positive experiences for everyone. +We invite all those who participate in COVID Safe Paths to help us create safe and positive experiences for everyone. ## 2. Open [Source/Culture/Tech] Citizenship @@ -45,7 +45,7 @@ The following behaviors are considered harassment and are unacceptable within ou ## 5. Weapons Policy -No weapons will be allowed at Private Kit events, community spaces, or in other spaces covered by the scope of this Code of Conduct. Weapons include but are not limited to guns, explosives (including fireworks), and large knives such as those used for hunting or display, as well as any other item used for the purpose of causing injury or harm to others. Anyone seen in possession of one of these items will be asked to leave immediately, and will only be allowed to return without the weapon. Community members are further expected to comply with all state and local laws on this matter. +No weapons will be allowed at COVID Safe Paths events, community spaces, or in other spaces covered by the scope of this Code of Conduct. Weapons include but are not limited to guns, explosives (including fireworks), and large knives such as those used for hunting or display, as well as any other item used for the purpose of causing injury or harm to others. Anyone seen in possession of one of these items will be asked to leave immediately, and will only be allowed to return without the weapon. Community members are further expected to comply with all state and local laws on this matter. ## 6. Consequences of Unacceptable Behavior @@ -57,7 +57,7 @@ If a community member engages in unacceptable behavior, the community organizers ## 7. Reporting Guidelines -If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. privatekit@media.mit.edu. +If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. @@ -65,7 +65,7 @@ Additionally, community organizers are available to help community members engag ## 8. Addressing Grievances -If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Private Kit with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies. +If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify COVID Safe Paths with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies. @@ -77,7 +77,7 @@ This code of conduct and its related procedures also applies to unacceptable beh ## 10. Contact info -privatekit@media.mit.edu +tech@pathcheck.org ## 11. License and attribution diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e67df887ac..bef9ac0122 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,7 +25,7 @@ cd ~ # get to your home directory or where ever you want to go git clone https://github.com/YOURACCOUNT/ -# set upstream against Private Kit repository +# set upstream against COVID Safe Paths repository git remote add upstream https://github.com/tripleblindmarket/covid-safe-paths.git ``` @@ -63,11 +63,11 @@ notes to yourself. It's as simple as `git commit -m "commit message goes here"`! 5. Rebase your feature branch with upstream/develop to avoid any code conflicts: ```bash -# 1. Rebase Base(Private Kit) repository with fork repository - develop branch +# 1. Rebase Base(COVID Safe Paths) repository with fork repository - develop branch git checkout develop # switch to base branch(local) -git fetch upstream # fetch latest commits from "Private kit" develop branch +git fetch upstream # fetch latest commits from "COVID Safe Paths" develop branch git rebase upstream/develop # rebase code against your forked develop branch(local) @@ -81,7 +81,7 @@ git rebase develop # now rebase your feature branch(local) against develop branc git push origin feature/ # after resolving all conflicts, push your new feature branch to the remote forked repository -# now your feature branch is ready for PR against Private Kit develop branch. +# now your feature branch is ready for PR against COVID Safe Paths develop branch. ``` 6. Start a PR to submit your changes back to the original project: diff --git a/README.md b/README.md index 37063e522f..2987fc394f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# COVID Safe Paths ![Android and iOS build on MacOS](https://github.com/tripleblindmarket/private-kit/workflows/Android%20and%20iOS%20build%20on%20MacOS/badge.svg) +# COVID Safe Paths ![Android and iOS build on MacOS](https://github.com/tripleblindmarket/covid-safe-paths/workflows/Android%20and%20iOS%20build%20on%20MacOS/badge.svg) **applying the technology and philosophy of Private Kit to COVID** @@ -24,7 +24,7 @@ Safe Paths logs your device’s location once every five minutes and stores 28 d **Downloads for COVID Safe Paths:** _coming soon!_ -**Downloads for Private Kit:** [Google Play](https://play.google.com/store/apps/details?id=edu.mit.privatekit) | [Apple Store](https://apps.apple.com/us/app/private-kit-prototype/id1501903733) +**Downloads for COVID Safe Paths:** [Google Play](https://play.google.com/store/apps/details?id=edu.mit.privatekit) | [Apple Store](https://apps.apple.com/us/app/private-kit-prototype/id1501903733) # Development Overview diff --git a/android/app/BUCK b/android/app/BUCK index b14dd35981..073ed8126e 100644 --- a/android/app/BUCK +++ b/android/app/BUCK @@ -35,12 +35,12 @@ android_library( android_build_config( name = "build_config", - package = "edu.mit.privatekit", + package = "org.pathcheck.covidsafepaths", ) android_resource( name = "res", - package = "edu.mit.privatekit", + package = "org.pathcheck.covidsafepaths", res = "src/main/res", ) diff --git a/android/app/build.gradle b/android/app/build.gradle index 1707f3c155..2494aec099 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -128,7 +128,7 @@ android { } defaultConfig { - applicationId "edu.mit.privatekit" + applicationId "org.pathcheck.covidsafepaths" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled true diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 814f7e75f4..ad16b43852 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.pathcheck.covidsafepaths"> @@ -42,7 +42,7 @@ + android:value="covidsafepaths_kit_notification_channel"/> diff --git a/android/app/src/main/java/edu/mit/privatekit/MainActivity.java b/android/app/src/main/java/edu/mit/covidsafepaths/MainActivity.java similarity index 93% rename from android/app/src/main/java/edu/mit/privatekit/MainActivity.java rename to android/app/src/main/java/edu/mit/covidsafepaths/MainActivity.java index 0f251097d0..2248c5e9c1 100644 --- a/android/app/src/main/java/edu/mit/privatekit/MainActivity.java +++ b/android/app/src/main/java/edu/mit/covidsafepaths/MainActivity.java @@ -1,4 +1,4 @@ -package edu.mit.privatekit; +package org.pathcheck.covidsafepaths; import android.os.Bundle; import com.facebook.react.ReactActivity; @@ -21,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) { */ @Override protected String getMainComponentName() { - return "PrivateKit"; + return "COVIDSafePaths"; } @Override diff --git a/android/app/src/main/java/edu/mit/privatekit/MainApplication.java b/android/app/src/main/java/edu/mit/covidsafepaths/MainApplication.java similarity index 98% rename from android/app/src/main/java/edu/mit/privatekit/MainApplication.java rename to android/app/src/main/java/edu/mit/covidsafepaths/MainApplication.java index 4753fd1062..e1613f26b5 100644 --- a/android/app/src/main/java/edu/mit/privatekit/MainApplication.java +++ b/android/app/src/main/java/edu/mit/covidsafepaths/MainApplication.java @@ -1,4 +1,4 @@ -package edu.mit.privatekit; +package org.pathcheck.covidsafepaths; import android.app.Application; import android.content.Context; diff --git a/android/app/src/main/java/edu/mit/privatekit/SplashActivity.java b/android/app/src/main/java/edu/mit/covidsafepaths/SplashActivity.java similarity index 91% rename from android/app/src/main/java/edu/mit/privatekit/SplashActivity.java rename to android/app/src/main/java/edu/mit/covidsafepaths/SplashActivity.java index ab95e4fc2c..3d5de7d83a 100644 --- a/android/app/src/main/java/edu/mit/privatekit/SplashActivity.java +++ b/android/app/src/main/java/edu/mit/covidsafepaths/SplashActivity.java @@ -1,4 +1,4 @@ -package edu.mit.privatekit; +package org.pathcheck.covidsafepaths; import android.content.Intent; import android.os.Bundle; diff --git a/android/settings.gradle b/android/settings.gradle index 4ca2a16990..270a128887 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'PrivateKit' +rootProject.name = 'COVIDSafePaths' include ':react-native-reanimated' project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android') include ':react-native-gesture-handler' diff --git a/app.json b/app.json index 6dbbaad415..4948d42b8b 100644 --- a/app.json +++ b/app.json @@ -1,4 +1,4 @@ { - "name": "PrivateKit", + "name": "COVIDSafePaths", "displayName": "COVID Safe Paths" } diff --git a/app/services/BroadcastingService.js b/app/services/BroadcastingService.js index 1aecdacadb..2131b27ec0 100644 --- a/app/services/BroadcastingService.js +++ b/app/services/BroadcastingService.js @@ -239,7 +239,7 @@ export default class BroadcastingServices { setTimeout( () => Alert.alert( - 'Private Kit requires bluetooth to be enabled', + 'COVID Safe Paths requires bluetooth to be enabled', 'Would you like to enable Bluetooth?', [ { diff --git a/app/services/LocationService.js b/app/services/LocationService.js index 7db145aee0..cb9f15b25b 100644 --- a/app/services/LocationService.js +++ b/app/services/LocationService.js @@ -270,7 +270,7 @@ export default class LocationServices { BackgroundGeolocation.on('stop', () => { PushNotification.localNotification({ title: 'Location Tracking Was Disabled', - message: 'Private Kit requires location services.', + message: 'COVID Safe Paths requires location services.', }); console.log('[INFO] stop'); }); diff --git a/app/views/Export.js b/app/views/Export.js index 2ec78f0d16..fafa225df1 100644 --- a/app/views/Export.js +++ b/app/views/Export.js @@ -76,9 +76,9 @@ function ExportScreen(props) { var options = {}; var jsonData = JSON.stringify(locationData); - const title = 'PrivateKit.json'; + const title = 'COVIDSafePaths.json'; const filename = unixtimeUTC + '.json'; - const message = 'Here is my location log from Private Kit.'; + const message = 'Here is my location log from COVID Safe Paths.'; if (isPlatformiOS()) { var url = RNFS.DocumentDirectoryPath + '/' + filename; await RNFS.writeFile(url, jsonData, 'utf8') diff --git a/app/views/LocationTracking.js b/app/views/LocationTracking.js index 413b96a5c1..9024c319c0 100644 --- a/app/views/LocationTracking.js +++ b/app/views/LocationTracking.js @@ -420,14 +420,21 @@ class LocationTracking extends Component { translucent={true} /> {this.getPulseIfNeeded()} + - - {this.getMainText()} + + {this.state.currentState === StateEnum.AT_RISK && + this.getMainText()} {this.getSubSubText()} + + + {this.state.currentState !== StateEnum.AT_RISK && + this.getMainText()} {this.getSubText()} {this.getCTAIfNeeded()} + + BuildableName = "COVIDSafePaths.app" + BlueprintName = "COVIDSafePaths" + ReferencedContainer = "container:COVIDSafePaths.xcodeproj"> + BuildableName = "COVIDSafePathsTests.xctest" + BlueprintName = "COVIDSafePathsTests" + ReferencedContainer = "container:COVIDSafePaths.xcodeproj"> @@ -59,9 +59,9 @@ + BuildableName = "COVIDSafePaths.app" + BlueprintName = "COVIDSafePaths" + ReferencedContainer = "container:COVIDSafePaths.xcodeproj"> @@ -70,9 +70,9 @@ + BuildableName = "COVIDSafePathsTests.xctest" + BlueprintName = "COVIDSafePathsTests" + ReferencedContainer = "container:COVIDSafePaths.xcodeproj"> @@ -92,9 +92,9 @@ + BuildableName = "COVIDSafePaths.app" + BlueprintName = "COVIDSafePaths" + ReferencedContainer = "container:COVIDSafePaths.xcodeproj"> @@ -109,9 +109,9 @@ + BuildableName = "COVIDSafePaths.app" + BlueprintName = "COVIDSafePaths" + ReferencedContainer = "container:COVIDSafePaths.xcodeproj"> diff --git a/ios/PrivateKit.xcworkspace/contents.xcworkspacedata b/ios/COVIDSafePaths.xcworkspace/contents.xcworkspacedata similarity index 78% rename from ios/PrivateKit.xcworkspace/contents.xcworkspacedata rename to ios/COVIDSafePaths.xcworkspace/contents.xcworkspacedata index c5874645dc..5f95f2b777 100644 --- a/ios/PrivateKit.xcworkspace/contents.xcworkspacedata +++ b/ios/COVIDSafePaths.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:COVIDSafePaths.xcodeproj"> diff --git a/ios/PrivateKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/COVIDSafePaths.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from ios/PrivateKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to ios/COVIDSafePaths.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/ios/PrivateKit/AppDelegate.h b/ios/COVIDSafePaths/AppDelegate.h similarity index 100% rename from ios/PrivateKit/AppDelegate.h rename to ios/COVIDSafePaths/AppDelegate.h diff --git a/ios/PrivateKit/AppDelegate.m b/ios/COVIDSafePaths/AppDelegate.m similarity index 96% rename from ios/PrivateKit/AppDelegate.m rename to ios/COVIDSafePaths/AppDelegate.m index 762ac663b4..3ac9fe66fb 100644 --- a/ios/PrivateKit/AppDelegate.m +++ b/ios/COVIDSafePaths/AppDelegate.m @@ -23,7 +23,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( [GMSServices provideAPIKey:@"AIzaSyB0-TLHy-0Nmed6rYG1IkvwqVtjAKHV9lk"]; RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions]; RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge - moduleName:@"PrivateKit" + moduleName:@"COVIDSafePaths" initialProperties:nil]; rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1]; @@ -82,8 +82,8 @@ - (void)application:(UIApplication *)application didReceiveLocalNotification:(UI - (void)applicationWillTerminate:(UIApplication *)application { UILocalNotification *notification = [[UILocalNotification alloc] init]; notification.fireDate = [NSDate dateWithTimeIntervalSinceNow:0]; - notification.alertTitle = @"Private Kit Was Closed"; - notification.alertBody = @"Private Kit requires to be running."; + notification.alertTitle = @"COVID Safe Paths Was Closed"; + notification.alertBody = @"COVID Safe Paths requires to be running."; notification.timeZone = [NSTimeZone defaultTimeZone]; notification.soundName = UILocalNotificationDefaultSoundName; notification.applicationIconBadgeNumber = 0; diff --git a/ios/PrivateKit/Base.lproj/LaunchScreen.xib b/ios/COVIDSafePaths/Base.lproj/LaunchScreen.xib similarity index 100% rename from ios/PrivateKit/Base.lproj/LaunchScreen.xib rename to ios/COVIDSafePaths/Base.lproj/LaunchScreen.xib diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/Contents.json rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-1024@1x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-1024@1x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-1024@1x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-1024@1x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-1.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-1.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-1.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-1.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-2.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-2.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-2.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x-2.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@2x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@3x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@3x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-20@3x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-20@3x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x-1.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x-1.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x-1.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x-1.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29@2x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29@3x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29@3x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-29@3x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-29@3x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-30.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-30.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-30.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-30.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x-1.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x-1.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x-1.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x-1.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-40@2x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-40@3x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-40@3x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-40@3x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-40@3x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-60@2x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-60@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-60@2x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-60@2x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-60@3x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-60@3x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-60@3x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-60@3x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-76.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-76.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-76.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-76.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-76@2x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-76@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-76@2x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-76@2x.png diff --git a/ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-83.5@2x.png b/ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-83.5@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/AppIcon.appiconset/icon-ios-83.5@2x.png rename to ios/COVIDSafePaths/Images.xcassets/AppIcon.appiconset/icon-ios-83.5@2x.png diff --git a/ios/PrivateKit/Images.xcassets/Contents.json b/ios/COVIDSafePaths/Images.xcassets/Contents.json similarity index 100% rename from ios/PrivateKit/Images.xcassets/Contents.json rename to ios/COVIDSafePaths/Images.xcassets/Contents.json diff --git a/ios/PrivateKit/Images.xcassets/bgImage.imageset/Contents.json b/ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Contents.json similarity index 100% rename from ios/PrivateKit/Images.xcassets/bgImage.imageset/Contents.json rename to ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Contents.json diff --git a/ios/PrivateKit/Images.xcassets/bgImage.imageset/Home screen.png b/ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Home screen.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/bgImage.imageset/Home screen.png rename to ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Home screen.png diff --git a/ios/PrivateKit/Images.xcassets/bgImage.imageset/Home screen@2x.png b/ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Home screen@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/bgImage.imageset/Home screen@2x.png rename to ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Home screen@2x.png diff --git a/ios/PrivateKit/Images.xcassets/bgImage.imageset/Home screen@3x.png b/ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Home screen@3x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/bgImage.imageset/Home screen@3x.png rename to ios/COVIDSafePaths/Images.xcassets/bgImage.imageset/Home screen@3x.png diff --git a/ios/PrivateKit/Images.xcassets/logoImage.imageset/PrivateKitLogo.png b/ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/COVIDSafePathsLogo.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/logoImage.imageset/PrivateKitLogo.png rename to ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/COVIDSafePathsLogo.png diff --git a/ios/PrivateKit/Images.xcassets/logoImage.imageset/PrivateKitLogo@2x.png b/ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/COVIDSafePathsLogo@2x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/logoImage.imageset/PrivateKitLogo@2x.png rename to ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/COVIDSafePathsLogo@2x.png diff --git a/ios/PrivateKit/Images.xcassets/logoImage.imageset/PrivateKitLogo@3x.png b/ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/COVIDSafePathsLogo@3x.png similarity index 100% rename from ios/PrivateKit/Images.xcassets/logoImage.imageset/PrivateKitLogo@3x.png rename to ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/COVIDSafePathsLogo@3x.png diff --git a/ios/PrivateKit/Images.xcassets/logoImage.imageset/Contents.json b/ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/Contents.json similarity index 65% rename from ios/PrivateKit/Images.xcassets/logoImage.imageset/Contents.json rename to ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/Contents.json index c89936df58..55d77ffc31 100644 --- a/ios/PrivateKit/Images.xcassets/logoImage.imageset/Contents.json +++ b/ios/COVIDSafePaths/Images.xcassets/logoImage.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "PrivateKitLogo.png", + "filename" : "COVIDSafePathsLogo.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "PrivateKitLogo@2x.png", + "filename" : "COVIDSafePathsLogo@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "PrivateKitLogo@3x.png", + "filename" : "COVIDSafePathsLogo@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/ios/PrivateKit/Info.plist b/ios/COVIDSafePaths/Info.plist similarity index 77% rename from ios/PrivateKit/Info.plist rename to ios/COVIDSafePaths/Info.plist index 167234cedb..c5562370f7 100644 --- a/ios/PrivateKit/Info.plist +++ b/ios/COVIDSafePaths/Info.plist @@ -27,24 +27,24 @@ CFBundleVersion 19 LSRequiresIPhoneOS - + NSAppTransportSecurity NSAllowsArbitraryLoads - + NSExceptionDomains - + NSLocationAlwaysAndWhenInUseUsageDescription - We log your location to enable new opportunities for researchers studying refugee migration, wellbeing, and community traffic analysis in a privacy-preserving way. + Your location history will be saved on your device, and only shared with others if you choose to do so. NSLocationAlwaysUsageDescription - We log your location to enable new opportunities for researchers studying refugee migration, wellbeing, and community traffic analysis in a privacy-preserving way. + Your location history will be saved on your device, and only shared with others if you choose to do so. NSLocationWhenInUseUsageDescription - We log your location to enable new opportunities for researchers studying refugee migration, wellbeing, and community traffic analysis in a privacy-preserving way. + Your location history will be saved on your device, and only shared with others if you choose to do so. NSMainNibFile LaunchScreen NSMotionUsageDescription - We use your accelerometer for accurate location history to enable new opportunities for researchers studying refugee migration, wellbeing, and community traffic analysis in a privacy-preserving way. + We use your accelerometer for accurate location history. UIAppFonts IBMPlexSans-Bold.ttf @@ -80,6 +80,6 @@ UIInterfaceOrientationPortrait UIViewControllerBasedStatusBarAppearance - + diff --git a/ios/PrivateKit/main.m b/ios/COVIDSafePaths/main.m similarity index 100% rename from ios/PrivateKit/main.m rename to ios/COVIDSafePaths/main.m diff --git a/ios/PrivateKitTests/PrivateKitTests.m b/ios/COVIDSafePathsTests/COVIDSafePathsTests.m similarity index 95% rename from ios/PrivateKitTests/PrivateKitTests.m rename to ios/COVIDSafePathsTests/COVIDSafePathsTests.m index da623cac95..0704e7ffd6 100644 --- a/ios/PrivateKitTests/PrivateKitTests.m +++ b/ios/COVIDSafePathsTests/COVIDSafePathsTests.m @@ -14,11 +14,11 @@ #define TIMEOUT_SECONDS 600 #define TEXT_TO_LOOK_FOR @"Welcome to React" -@interface PrivateKitTests : XCTestCase +@interface COVIDSafePathsTests : XCTestCase @end -@implementation PrivateKitTests +@implementation COVIDSafePathsTests - (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test { diff --git a/ios/PrivateKitTests/Info.plist b/ios/COVIDSafePathsTests/Info.plist similarity index 100% rename from ios/PrivateKitTests/Info.plist rename to ios/COVIDSafePathsTests/Info.plist diff --git a/ios/Podfile b/ios/Podfile index dd3ce31700..d42aaf4ef2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,8 +1,8 @@ platform :ios, '9.0' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -target 'PrivateKit' do - # Pods for PrivateKit +target 'COVIDSafePaths' do + # Pods for COVIDSafePaths pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec" pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired" @@ -53,7 +53,7 @@ target 'PrivateKit' do pod 'RNReanimated', :path => '../node_modules/react-native-reanimated' - target 'PrivateKitTests' do + target 'COVIDSafePathsTests' do inherit! :search_paths # Pods for testing end diff --git a/package.json b/package.json index 547440f9f8..6fce443eed 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "privatekit", + "name": "covidsafepaths", "version": "0.9.1", "private": true, "scripts": {