Update master to v1.0.1 #716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The custom styles were taken from https://snazzymaps.com/style/127403/no-label-bright-colors which was linked to in the issue #243 Closes #243
… newUI * 'develop' of https://github.com/letstrace/letstrace: Add custom map styles to the Overlap map (#246) Italian missing licenses file- Andy's translation added (#241) Add jest snapshot testing to the main views (#187) Typo fix from Enrico Santus on latest (#239) Update macos_build.yml (#236) Andynuzzo/it (#223) Dutch translation (#225) Brazilian Portuguese language support (#229)
…237) * Add News, Import, Export buttons * add new colors * add positive and sensitive buttons * change button color in the main menu * notification UI * remove callback for button
* 1. Added RN permissions to dependencies. 2. Added location permissions in AndroidManifest.xml * 1. Permissions now handled by react-native-permissions 2. If platform is iOS 12.x.x or earlier. Directly acquire 'Always Allow' permission 3. If platform is iOS 13.0 or later, redirect to app settings. Apps cannot directly ask for 'Always Allow' post iOS 13. * Added comments * Added yarn.lock and Podfile.lock to gitignore * No changes * Added lock files * Removed Podfile.lock Co-authored-by: Rich Paret <[email protected]> Co-authored-by: Abhishek Singh <[email protected]>
Co-authored-by: Harsh Vitra <[email protected]>
Co-authored-by: Harsh Vitra <[email protected]>
There were some react warnings being thrown due to the key prop not being set on some components. This sets the key prop on the components that are added in a loop
* Fixed Text on Notifications page * Fixed Font size of Export Co-authored-by: Harsh Vitra <[email protected]>
… newUI * 'develop' of https://github.com/letstrace/letstrace: Fixed text in the Notifications page (#256) Cleanup react warning on the Overlap screen (#249) Fix design and remove url (#255) Change the ui of Notifications (#254) Fixed 'Always Allow' for iOS (#97) Notification UI to show histogram and day wise list of intersections (#237) Spanish language support based on Miquel Vila Porté's translation (#245) Haitian Creole with Translation Inputs from Gerald McElroy (#238) # Conflicts: # app/views/LocationTracking.js # ios/Podfile.lock # yarn.lock
New UI polish
* Update Export screen to show more accurate log data This is a pretty update to how the Export screen works and how the log data is modified. The Export screen component was rewritten as a functional component in order to take advantage of hooks. The use for the hooks is to update the log data details when the Export component comes in to focus. The old version would only update the data once since the component would mount and never unmount leading to stale data. The new Export component will update the log details each time the view comes in to focus. The log details have now been broken up in to 3 sections: Total time the log covers, Number of points logged, and Time since last updated. The LocationService has been updated with a new class called LocationData. This take the old saveLocation method and makes it an instance method on the LocationData class. This also allows access to the location data that is in memory in order for the Export screen to show more accurate details. The LocationService has been updated to use this new class when saving the location data. * Revert change to the location time interval * Remove old references to some variable names * Fix export tests due to changes * Add LocationData tests * Remove old test file
…as well (#250) * Add News, Import, Export buttons * add new colors * add positive and sensitive buttons * change button color in the main menu * change marker icon and description * remove maps-clustering package
Signed-off-by: Patrick Erichsen <[email protected]>
* enable haitian creole tests * get the tests running with onboarding 5 changes * revert accidental commit for config * remove check for notification as it's not supported * upload screenshots on failure * let's save some failed screenshots * try disabling builds if the only code pushed is for e2e * disable the check for content on the home screen as it's not always returning the same thing * comment out the paths filter because of our requirements for PR merge * remove the paths filter because of our requirements for PR merge
Signed-off-by: Patrick Erichsen <[email protected]>
Co-authored-by: Ken Pugsley <>
Signed-off-by: Patrick Erichsen <[email protected]>
Signed-off-by: Patrick Erichsen <[email protected]>
# Conflicts: # .eslintrc.js # .github/workflows/i18n.yml # .github/workflows/test.yml # README.md # __mocks__/react-native-i18n.js # __mocks__/react-native-push-notification.js # android/app/build.gradle # android/app/src/main/AndroidManifest.xml # android/app/src/main/res/values/strings.xml # app/Entry.js # app/assets/svgs/backArrow.js # app/components/ButtonWrapper.js # app/components/NativePicker.js # app/components/NavigationBarWrapper.js # app/components/Typography.js # app/components/__tests__/__snapshots__/Typography.spec.js.snap # app/constants/__tests__/__snapshots__/Theme.spec.js.snap # app/constants/colors.js # app/constants/storage.js # app/helpers/Intersect.js # app/helpers/__tests__/Intersect.spec.js # app/helpers/tests/__mocks__/General.js # app/locales/ar.json # app/locales/en.json # app/locales/es.json # app/locales/eula/en_html.js # app/locales/eula/ht_html.js # app/locales/fr.json # app/locales/ht.json # app/locales/id.json # app/locales/it.json # app/locales/languages.js # app/locales/ml.json # app/locales/nl.json # app/locales/pl.json # app/locales/ro.json # app/locales/ru.json # app/locales/sk.json # app/locales/vi.json # app/services/BackgroundTaskService.js # app/services/BroadcastingService.js # app/services/LocationService.js # app/services/__tests__/LocationService.spec.js # app/views/About.js # app/views/ChooseProvider.js # app/views/Export.js # app/views/Import.js # app/views/Licenses.js # app/views/LocationTracking.js # app/views/News.js # app/views/Settings.js # app/views/Settings/GoogleMapsImport.js # app/views/__tests__/Licenses.spec.js # app/views/__tests__/LocationTracking.spec.js # app/views/__tests__/__snapshots__/Export.spec.js.snap # app/views/__tests__/__snapshots__/Import.spec.js.snap # app/views/__tests__/__snapshots__/Licenses.spec.js.snap # app/views/__tests__/__snapshots__/News.spec.js.snap # app/views/__tests__/__snapshots__/Settings.spec.js.snap # app/views/onboarding/Onboarding5.js # e2e/helpers/onboarding.js # e2e/pages/EnableLocation.po.js # e2e/pages/FinishSetup.po.js # e2e/pages/Onboarding1.po.js # e2e/pages/Onboarding2.po.js # e2e/pages/Onboarding3.po.js # e2e/pages/Onboarding4.po.js # e2e/pages/SignEula.po.js # i18next-parser.config.js # ios/COVIDSafePaths.xcodeproj/project.pbxproj # ios/COVIDSafePaths/Info.plist # ios/COVIDSafePathsTests/Info.plist # ios/Podfile.lock # ios/en.lproj/InfoPlist.strings # ios/en.lproj/Localizable.strings # ios/es.lproj/InfoPlist.strings # package.json # versions.yaml # yarn.lock
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Update master to v1.0.1. This PR catches master up to develop for the v1.0.1 release.