Path-Check · kenpugsley · Apr 9, 2020 · Apr 9, 2020 · Apr 9, 2020 · Apr 9, 2020
diff --git a/app/assets/LICENSE.json b/app/assets/LICENSE.json
@@ -1,8 +1,5 @@
 {
     "terms_and_licenses": [{
-        "name": "Terms of Use",
-        "text": "blah blah blah"
-    }, {
         "name": "COVID Safe Paths",
         "text": "MIT License\n\nCopyright (c) 2020 TripleBlind, Inc\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."
     }]

diff --git a/app/assets/images/foreArrow.png b/app/assets/images/foreArrow.png
diff --git a/app/assets/images/kebabIcon.png b/app/assets/images/kebabIcon.png
diff --git a/app/assets/images/privatekit.png b/app/assets/images/privatekit.png
diff --git a/app/assets/svgs/stateAtRisk.js b/app/assets/svgs/stateAtRisk.js
diff --git a/app/locales/en/english.json b/app/locales/en/english.json
@@ -4,8 +4,6 @@
     "team": "Team",
     "team_para": "Our team is composed of a consortium of epidemiologists, engineers, data scientists, digital privacy evangelists, professors and researchers from reputable institutions, including: MIT, Harvard, The Mayo Clinic, TripleBlind, EyeNetra, Ernst & Young and Link Ventures.",
 
-
-
     "authorities_title": "Trusted Sources",
     "authorities_desc": "Choose trusted healthcare authorities in your area to obtain exposure data. Either select a name from the global registry, or enter the web address provided by an authority which has implemented Safe Paths.",
     "authorities_removal_alert_title": "Remove authority",
@@ -17,8 +15,6 @@
     "authorities_add_url": "Add authority via URL",
     "authorities_input_placeholder": "Paste your URL here",
 
-
-
     "export_para_1": "If you test positive for COVID-19, please do your part by sharing your location history with local authorities.",
     "export_para_2": "Location is shared as a simple list of times and places, no additional information.",
     "share": "SHARE",
@@ -30,14 +26,10 @@
     "less_than_one_minute": "less than 1 minute",
     "share_location_data": "Share location data",
 
-
-
     "import_title": "Import Locations",
     "import_step_1": "1. Login to your Google Account and Download your Location History",
     "import_step_2": "2. After downloaded, open this screen again. The data will import automatically.",
 
-
-
     "private_kit": "COVID\nSafe Paths",
     "next": "NEXT",
     "back": "BACK",
@@ -51,8 +43,6 @@
     "intro_subheader_2": "Check if you crossed paths with a COVID-19 patient",
     "intro_get_started": "I want to help!",
 
-
-
     "launch_screen1_header": "The way back to normal starts here.",
     "launch_get_started": "Get Started",
     "launch_next": "Next",
@@ -82,15 +72,9 @@
     "launch_done_header": "All finished",
     "launch_done_subheader": "You’re ready to roll. Remember, you can always update your preferences later.",
 
-
-
     "licenses": "Licenses",
     "license_placeholder": "This app is built under the MIT license.",
 
-
-
-    "yes": "Yes",
-    "no": "No",
     "location_enabled_title": "COVID Safe Paths Enabled",
     "location_enabled_message": "COVID Safe Paths is securely storing your GPS coordinates once every five minutes on this device.",
     "location_disabled_title": "Location Tracking Was Disabled",
@@ -100,17 +84,9 @@
     "require_location_services_title": "COVID Safe Paths requires location services to be enabled",
     "require_location_services_message": "Would you like to open location settings?",
 
-
-
-    "import": "Import",
-    "export": "Export",
-    "news": "News",
     "latest_news": "Latest News",
-    "url_info": "For more info visit ",
-    "home_footer": "privatekit.mit.edu",
-    "app_info_url": "https://covidsafepaths.org/in-app-news",
-
-
+    "default_news_site_name": "SafePaths News",
+    "default_news_site_url": "https://covidsafepaths.org/in-app-news",
 
     "home_start_tracking": "Start tracking",
     "home_start_tracking_description": "You'll need to allow location permissions",
@@ -124,18 +100,19 @@
     "home_no_contact_header": "No known contact",
     "home_no_contact_subtext": "Based on available data you haven’t been near anyone reported positive for COVID-19.",
 
-    "home_at_risk_header": "You might be at risk",
-    "home_at_risk_subtext": "Based on available data you have crossed paths with someone who tested positive for COVID-19.",
-
+    "home_at_risk_header": "You May Be Exposed",
+    "home_at_risk_subtext": "Based on your GPS history, it is possible you were in contact with or close to someone diagnosed with COVID19.",
+    "home_at_risk_subsubtext": "This does not mean you are infected.",
+    "home_mayo_link_heading": "More COVID-19 information",
+    "home_mayo_link_label": "from the Mayo Clinic",
+    "home_mayo_link_URL": "https://www.mayoclinic.org/coronavirus-covid-19",
 
     "home_unknown_header": "Unknown",
     "home_unknown_subtext": "We can’t tell if you’re at risk unless you enable the app to access your location.",
 
     "home_enable_location": "Enable Location Data",
     "home_MASSIVE_HACK": "<MAP HACK>",
-    "home_next_steps": "Show your exposure history",
-
-
+    "home_next_steps": "Find out more",
 
     "notification_main_text": "Recent notifications:",
     "notification_title": "2-Week Exposure Profile",
@@ -149,8 +126,6 @@
     "notification_today": "today",
     "notification_2_weeks_ago": "2 weeks ago",
 
-
-
     "overlap_title": "Check Overlap",
     "overlap_para_1": "The green trail represents your location history\n\nThe light purple circles represent the public dataset",
     "show_overlap": "Click to view the public dataset",
@@ -160,13 +135,9 @@
     "nCoV2019_url_info": "For more information on the dataset for this map",
     "nCoV2019_url": "github.com/beoutbreakprepared/nCoV2019",
 
-
-
     "push_at_risk_title": "You may be at risk",
     "push_at_risk_message": "You have crossed paths with a COVID-19 patient",
 
-
-
     "settings_title": "Dashboard",
     "maps_import_title": "Google Maps",
     "maps_import_text": "To see if you encountered someone with COVID-19 prior to downloading this app, you can import your personal location history.",
@@ -185,6 +156,8 @@
     "tested_positive_subtitle": "Your private data can be transferred to health authorities, backed up, or otherwise shared.",
 
     "choose_provider_title": "Choose health authority",
-    "choose_provider_subtitle": "To be informed of exposures you will need to subscribe to a health authority."
+    "choose_provider_subtitle": "To be informed of exposures you will need to subscribe to a health authority.",
 
+    "terms_of_use": "Terms of use",
+    "terms_of_use_url": "https://docs.google.com/document/d/1mtdal_pywsKZVMXLHjjj5eKznipPLP8sM1HwFTIhjo0/edit#"
 }
diff --git a/app/views/Licenses.js b/app/views/Licenses.js
@@ -3,7 +3,10 @@ import {
   StyleSheet,
   View,
   Text,
+  TouchableOpacity,
   Platform,
+  Image,
+  Linking,
   Dimensions,
   BackHandler,
   ScrollView,
@@ -16,6 +19,7 @@ import fontFamily from '../constants/fonts';
 import languages from './../locales/languages';
 import licenses from './../assets/LICENSE.json';
 import NavigationBarWrapper from '../components/NavigationBarWrapper';
+import foreArrow from './../assets/images/foreArrow.png';
 
 class LicensesScreen extends Component {
   constructor(props) {
@@ -31,6 +35,10 @@ class LicensesScreen extends Component {
     return true;
   };
 
+  handleTermsOfUsePressed() {
+    Linking.openURL(languages.t('label.terms_of_use_url'));
+  }
+
   componentDidMount() {
     BackHandler.addEventListener('hardwareBackPress', this.handleBackPress);
   }
@@ -48,7 +56,7 @@ class LicensesScreen extends Component {
     for (var i = 0; i < licenses.terms_and_licenses.length; i++) {
       var element = licenses.terms_and_licenses[i];
 
-      result += '<B>' + element.name + '</B><P>';
+      result += '<H2>' + element.name + '</H2><P>';
       result += element.text.replace(/\n/g, '<br/>');
       result += '<hr/>';
     }
@@ -96,6 +104,22 @@ class LicensesScreen extends Component {
             />
           </View>
         </ScrollView>
+        <TouchableOpacity
+          onPress={this.handleTermsOfUsePressed.bind(this)}
+          style={styles.termsInfoRow}>
+          <View style={styles.termsInfoContainer}>
+            <Text
+              style={styles.mainTermsHeader}
+              onPress={() =>
+                Linking.openURL(languages.t('label.terms_of_use_url'))
+              }>
+              {languages.t('label.terms_of_use')}
+            </Text>
+          </View>
+          <View style={styles.arrowContainer}>
+            <Image source={foreArrow} style={this.arrow} />
+          </View>
+        </TouchableOpacity>
       </NavigationBarWrapper>
     );
   }
@@ -133,6 +157,27 @@ const styles = StyleSheet.create({
     fontFamily: fontFamily.primaryMedium,
     marginTop: 9,
   },
+  termsInfoRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    backgroundColor: Colors.SILVER,
+  },
+  termsInfoContainer: {
+    flexDirection: 'column',
+    justifyContent: 'space-between',
+    alignContent: 'flex-end',
+    padding: 15,
+  },
+  mainTermsHeader: {
+    textAlign: 'left',
+    color: Colors.MISCHKA,
+    fontSize: 20,
+    fontFamily: fontFamily.primaryBold,
+  },
+  arrowContainer: {
+    alignSelf: 'center',
+    paddingRight: 20,
+  },
 });
 
 export default LicensesScreen;