Merge branch 'develop' into ts-reusable-picker

* develop:
  Bug/fix spurious linking errors yarn install (#596)
  Tweaks to better support small screens (#577)

android/app/build.gradle

@@ -198,13 +198,10 @@ android {
 
 dependencies {
     implementation project(':react-native-reanimated')
-    implementation project(':react-native-gesture-handler')
-    implementation project(':react-native-webview')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation "androidx.annotation:annotation:1.1.0"
 
-    compile project(':react-native-fs')
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";

android/app/src/main/java/org/pathcheck/covidsafepaths/MainApplication.java

@@ -5,8 +5,6 @@
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.swmansion.reanimated.ReanimatedPackage;
-import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
-import com.reactnativecommunity.webview.RNCWebViewPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;

android/settings.gradle

@@ -1,14 +1,10 @@
 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'
-project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
 include ':react-native-fs'
 project(':react-native-fs').projectDir = new File(settingsDir, '../node_modules/react-native-fs/android')
 include ':react-native-zip-archive'
 project(':react-native-zip-archive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-zip-archive/android')
-include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 include ':react-native-push-notification'
 project(':react-native-push-notification').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-push-notification/android')
 include ':@mauron85_react-native-background-geolocation'

app/components/NavigationBarWrapper.js

@@ -2,7 +2,7 @@ import styled from '@emotion/native';
 import { useTheme } from 'emotion-theming';
 import PropTypes from 'prop-types';
 import * as React from 'react';
-import { StatusBar } from 'react-native';
+import { Dimensions, StatusBar } from 'react-native';
 import { SvgXml } from 'react-native-svg';
 
 import backArrow from './../assets/svgs/backArrow';
@@ -17,6 +17,8 @@ import Colors from '../constants/colors';
  *   onBackPress: () => void,
  * }} param0
  */
+const widthScale = Math.min(Dimensions.get('window').width / 400, 1.0);
+
 const NavigationBarWrapper = ({ children, title, onBackPress }) => {
   const theme = useTheme();
 
@@ -73,8 +75,9 @@ const Title = styled.Text`
   align-self: center;
   color: ${Colors.WHITE};
   font-family: IBMPlexSans-Medium;
-  font-size: 26px;
+  font-size: ${26 * widthScale + 'px'};
   position: absolute;
+  padding-horizontal: 20;
   text-align: center;
   width: 100%;
 `;

app/locales/en.json

@@ -93,6 +93,18 @@
     "terms_of_use": "Terms of use",
     "terms_of_use_url": "https://docs.google.com/document/d/1mtdal_pywsKZVMXLHjjj5eKznipPLP8sM1HwFTIhjo0/edit#",
     "tested_positive_subtitle": "Your private data can be transferred to health authorities, backed up, or otherwise shared.",
-    "tested_positive_title": "Share location history"
+    "tested_positive_title": "Share location history",
+    "logging_active": "Location Active",
+    "logging_inactive": "Location Inactive"
+  },
+  "history": {
+    "no_exposure": "No known",
+    "possible_exposure_para": "It is possible you were in contact with or close to someone who tested positive for COVID-19",
+    "possible_exposure": "Possible",
+    "timeline": "Timeline",
+    "what_does_this_mean_para": "Based on your GPS history, it is possible that you may have been in contact with or close to somebody who was diagnosed with COVID-19. This does not mean you are infected but that you might be.\n\nFor further information on what you should do you can refer to the Mayo Clinic’s website.",
+    "what_does_this_mean": "What does this mean?",
+    "what_if_no_symptoms_para": "If you have no symptoms but still would like to be tested you can go to your nearest testing site.\n\nIndividuals who don't exhibit symptoms can sometimes still carry the infection and infect others. Being careful about social distancing and coming in contact with large groups or at risk individuals (the elderly, those with significant other medical issues) is important to manage both your risk and the risk to others.",
+    "what_if_no_symptoms": "What if I’m not showing symptoms?"
   }
-}
+}

app/views/ChooseProvider.js

@@ -389,7 +389,7 @@ const styles = StyleSheet.create({
     alignSelf: 'center',
   },
   listContainer: {
-    flex: 3,
+    flex: 1,
     flexDirection: 'column',
     textAlignVertical: 'top',
     justifyContent: 'flex-start',
@@ -452,8 +452,8 @@ const styles = StyleSheet.create({
     width: 18.48,
   },
   sectionDescription: {
-    fontSize: 18,
-    lineHeight: 24,
+    fontSize: 16,
+    lineHeight: 22,
     marginTop: 12,
     overflow: 'scroll',
     color: Colors.VIOLET_TEXT,

app/views/ExposureHistory/__tests__/__snapshots__/SingleExposureDetails.spec.js.snap

@@ -113,7 +113,7 @@ exports[`matches snapshot 1`] = `
           }
         }
       >
-        Possible exposure
+        Possible
       </Text>
       <View
         style={

app/views/News.js

@@ -172,7 +172,9 @@ const styles = StyleSheet.create({
     marginBottom: 0,
   },
   singleNewsHeadText: {
-    fontSize: 18,
+    fontSize: 16,
+    textAlign: 'center',
+    paddingHorizontal: 5,
     fontFamily: fontFamily.primarySemiBold,
   },
 });

app/views/__tests__/__snapshots__/Import.spec.js.snap

@@ -83,6 +83,7 @@ Array [
             "color": "#FFF",
             "fontFamily": "IBMPlexSans-Medium",
             "fontSize": 26,
+            "paddingHorizontal": 20,
             "position": "absolute",
             "textAlign": "center",
             "width": "100%",

app/views/__tests__/__snapshots__/Licenses.spec.js.snap

@@ -84,6 +84,7 @@ exports[`renders correctly 1`] = `
             "color": "#FFF",
             "fontFamily": "IBMPlexSans-Medium",
             "fontSize": 26,
+            "paddingHorizontal": 20,
             "position": "absolute",
             "textAlign": "center",
             "width": "100%",

app/views/__tests__/__snapshots__/News.spec.js.snap

@@ -111,6 +111,7 @@ exports[`renders correctly 1`] = `
               "color": "#FFF",
               "fontFamily": "IBMPlexSans-Medium",
               "fontSize": 26,
+              "paddingHorizontal": 20,
               "position": "absolute",
               "textAlign": "center",
               "width": "100%",
@@ -285,7 +286,9 @@ exports[`renders correctly 1`] = `
                         style={
                           Object {
                             "fontFamily": "IBMPlexSans-SemiBold",
-                            "fontSize": 18,
+                            "fontSize": 16,
+                            "paddingHorizontal": 5,
+                            "textAlign": "center",
                           }
                         }
                       >

app/views/__tests__/__snapshots__/Settings.spec.js.snap

@@ -84,6 +84,7 @@ exports[`renders correctly 1`] = `
             "color": "#FFF",
             "fontFamily": "IBMPlexSans-Medium",
             "fontSize": 26,
+            "paddingHorizontal": 20,
             "position": "absolute",
             "textAlign": "center",
             "width": "100%",

ios/Podfile

@@ -42,8 +42,6 @@ target 'COVIDSafePaths' do
   pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
   pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
-  pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
-
   pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
 
   target 'COVIDSafePathsTests' do

ios/Podfile.lock

@@ -206,8 +206,6 @@ PODS:
     - React
   - react-native-viewpager (3.3.0):
     - React
-  - react-native-webview (8.2.1):
-    - React
   - React-RCTActionSheet (0.61.5):
     - React-Core/RCTActionSheetHeaders (= 0.61.5)
   - React-RCTAnimation (0.61.5):
@@ -308,7 +306,6 @@ DEPENDENCIES:
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
   - react-native-uuid-generator (from `../node_modules/react-native-uuid-generator`)
   - "react-native-viewpager (from `../node_modules/@react-native-community/viewpager`)"
-  - react-native-webview (from `../node_modules/react-native-webview`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@@ -394,8 +391,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-uuid-generator"
   react-native-viewpager:
     :path: "../node_modules/@react-native-community/viewpager"
-  react-native-webview:
-    :path: "../node_modules/react-native-webview"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -475,7 +470,6 @@ SPEC CHECKSUMS:
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
   react-native-uuid-generator: 82ffa2a1cac94242ebed52c4dedc5044d3412717
   react-native-viewpager: a7b438ca32c57b2614ece2a123e7fe116f743131
-  react-native-webview: 160ac8d6bb974e2933f2de6bb7464a8e934ff31d
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -503,6 +497,6 @@ SPEC CHECKSUMS:
   SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
-PODFILE CHECKSUM: 8210ab026428e53d909db91142f627bb251c5dc8
+PODFILE CHECKSUM: 87c7ffe808bd84ff30ccdc4349cddb30eea2b0ec
 
 COCOAPODS: 1.9.1

react-native.config.js

@@ -4,4 +4,14 @@ module.exports = {
     android: {},
   },
   assets: ['./app/assets/fonts'],
+  // add dependencies to this list when they require manual linking,
+  // so that the CLI does not return an error
+  dependencies: {
+    'react-native-reanimated': {
+      platforms: {
+        android: undefined,
+        ios: null,
+      },
+    },
+  },
 };