From 5689e31d7b27b0b28f3a932416c2e42d455b089f Mon Sep 17 00:00:00 2001 From: haveyaseen Date: Tue, 14 Apr 2020 00:39:37 +0200 Subject: [PATCH 1/4] disable old demo Home screen --- App/App.tsx | 6 +++--- App/screens/HomeBluetooth.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/App/App.tsx b/App/App.tsx index ce5b1dd..81dec76 100644 --- a/App/App.tsx +++ b/App/App.tsx @@ -14,7 +14,7 @@ import {createStackNavigator} from '@react-navigation/stack'; import {Loading} from './screens/Loading'; import {Onboarding} from './screens/Onboarding'; import {OnboardingHow} from './screens/OnboardingHow'; -import {Home} from './screens/Home'; +// import {Home} from './screens/Home'; import {HomeBluetooth} from './screens/HomeBluetooth'; import {HomeTour} from './screens/HomeTour'; import {Endangerment} from './screens/Endangerment'; @@ -31,7 +31,7 @@ export type RootStackParamList = { Onboarding: undefined; OnboardingHow: undefined; HomeTour: undefined; - Home: undefined; + // Home: undefined; HomeBluetooth: undefined; Endangerment: undefined; BluetoothNotification: undefined; @@ -53,7 +53,7 @@ const App = () => { - + {/* */} navigation.navigate('Home')}> + ito From ce16023171bf0b7ae57c778afb08d043da58a5b7 Mon Sep 17 00:00:00 2001 From: haveyaseen Date: Tue, 14 Apr 2020 00:41:07 +0200 Subject: [PATCH 2/4] adopt mint styling for infected? screen --- App/screens/Endangerment.tsx | 53 +++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/App/screens/Endangerment.tsx b/App/screens/Endangerment.tsx index 1c768de..e995f3d 100644 --- a/App/screens/Endangerment.tsx +++ b/App/screens/Endangerment.tsx @@ -3,46 +3,61 @@ import {View, StyleSheet, Text, TouchableWithoutFeedback} from 'react-native'; import Icon from 'react-native-vector-icons/Feather'; import {StackNavigationProp} from '@react-navigation/stack'; import {RootStackParamList} from 'App/App'; +import AlphaNotice from '../components/AlphaNotice'; const styles = StyleSheet.create({ container: { flex: 1, padding: 16, - backgroundColor: 'hsl(224, 71%, 58%)', + backgroundColor: '#ffffff', + }, + logoWrapper: { + marginLeft: 'auto', + marginRight: 'auto', + position: 'relative', + }, + alphaNoticeRoot: { + position: 'absolute', + top: 12, + left: 48, + padding: 0, + }, + alphaNoticeText: { + fontSize: 14, + lineHeight: 14, }, logo: { - color: 'white', + color: '#7dc6b6', fontSize: 32, textAlign: 'center', fontFamily: 'Righteous-Regular', marginBottom: 16, }, header: { - fontSize: 15, + fontSize: 18, padding: 5, paddingTop: 64, paddingBottom: 50, - color: 'white', + color: '#595959', fontFamily: 'Ubuntu-R', lineHeight: 26, - letterSpacing: 1, }, arrowRightIcon: { right: 16, top: 16, fontSize: 20, - color: 'hsl(224, 71%, 58%)', + color: '#2c2c2c', position: 'absolute', }, buttonSymptoms: { borderRadius: 8, - backgroundColor: 'white', - padding: 16, + backgroundColor: '#91e6d3', + padding: 20, marginBottom: 32, fontFamily: 'Ubuntu-R', }, buttonSymptomsTitle: { - color: '#4770e0', + color: '#2c2c2c', letterSpacing: 1, textTransform: 'uppercase', fontSize: 14, @@ -52,12 +67,12 @@ const styles = StyleSheet.create({ }, buttonTested: { borderRadius: 8, - backgroundColor: 'white', - padding: 16, + backgroundColor: '#91e6d3', + padding: 20, fontFamily: 'Ubuntu-R', }, buttonTestedTitle: { - color: '#4770e0', + color: '#2c2c2c', letterSpacing: 1, textTransform: 'uppercase', fontSize: 14, @@ -78,10 +93,16 @@ export function Endangerment({ }) { return ( - ito + + ito + + - Tell us if you have symptoms or you{'\n'} - already have a positive test result + Tell us if you have symptoms or if you{'\n'} + have a positive test result navigation.navigate('SymptomInfo')}> @@ -103,7 +124,7 @@ export function Endangerment({ If you got a positive result from your doctor or authorities please - let us know to help everybody else stay healthy + let us know to help everybody else stay healthy. From 9be79996b62140de9676857262de878df8ad232d Mon Sep 17 00:00:00 2001 From: haveyaseen Date: Tue, 14 Apr 2020 00:51:19 +0200 Subject: [PATCH 3/4] add cancel button --- App/screens/Endangerment.tsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/App/screens/Endangerment.tsx b/App/screens/Endangerment.tsx index e995f3d..8ea3dc0 100644 --- a/App/screens/Endangerment.tsx +++ b/App/screens/Endangerment.tsx @@ -11,6 +11,12 @@ const styles = StyleSheet.create({ padding: 16, backgroundColor: '#ffffff', }, + cancel: { + position: 'absolute', + left: 12, + top: 12, + }, + chevronLeftIcon: {}, logoWrapper: { marginLeft: 'auto', marginRight: 'auto', @@ -58,7 +64,7 @@ const styles = StyleSheet.create({ }, buttonSymptomsTitle: { color: '#2c2c2c', - letterSpacing: 1, + letterSpacing: 1.5, textTransform: 'uppercase', fontSize: 14, marginBottom: 8, @@ -73,7 +79,7 @@ const styles = StyleSheet.create({ }, buttonTestedTitle: { color: '#2c2c2c', - letterSpacing: 1, + letterSpacing: 1.5, textTransform: 'uppercase', fontSize: 14, marginBottom: 8, @@ -93,6 +99,12 @@ export function Endangerment({ }) { return ( + + navigation.navigate('HomeBluetooth')}> + {' '} + cancel + + ito Date: Tue, 14 Apr 2020 01:10:16 +0200 Subject: [PATCH 4/4] implement symptom info screen --- App/screens/SymptomInfo.tsx | 135 ++++++++++++++++++++++++++++++++---- 1 file changed, 122 insertions(+), 13 deletions(-) diff --git a/App/screens/SymptomInfo.tsx b/App/screens/SymptomInfo.tsx index fc51604..cd20aab 100644 --- a/App/screens/SymptomInfo.tsx +++ b/App/screens/SymptomInfo.tsx @@ -1,25 +1,134 @@ import React from 'react'; -import {Button, Text} from 'react-native'; +import {Text, View, StyleSheet} from 'react-native'; import {StackNavigationProp} from '@react-navigation/stack'; +import {Button} from 'react-native-elements'; +import Icon from 'react-native-vector-icons/Feather'; import {RootStackParamList} from 'App/App'; +import AlphaNotice from '../components/AlphaNotice'; + +const styles = StyleSheet.create({ + container: { + flex: 1, + padding: 16, + backgroundColor: '#ffffff', + }, + cancel: { + position: 'absolute', + left: 12, + top: 12, + }, + chevronLeftIcon: {}, + logoWrapper: { + marginLeft: 'auto', + marginRight: 'auto', + position: 'relative', + }, + alphaNoticeRoot: { + position: 'absolute', + top: 12, + left: 48, + padding: 0, + }, + alphaNoticeText: { + fontSize: 14, + lineHeight: 14, + }, + logo: { + color: '#7dc6b6', + fontSize: 32, + textAlign: 'center', + fontFamily: 'Righteous-Regular', + marginBottom: 16, + }, + explanation: { + fontSize: 18, + padding: 5, + paddingTop: 64, + paddingBottom: 50, + color: '#595959', + fontFamily: 'Ubuntu-R', + lineHeight: 26, + }, + buttonOpenApp: { + backgroundColor: '#91e6d3', + borderRadius: 6, + marginBottom: 48, + padding: 12, + }, + buttonOpenAppTitle: { + color: '#2c2c2c', + letterSpacing: 1, + textTransform: 'uppercase', + fontSize: 14, + fontFamily: 'Ubuntu-M', + }, + buttonOther: { + backgroundColor: '#ffffff', + borderColor: '#7dc6b6', + borderWidth: 2, + borderRadius: 6, + marginBottom: 8, + padding: 12, + }, + buttonOtherTitle: { + color: '#595959', + letterSpacing: 1, + textTransform: 'uppercase', + fontSize: 14, + fontFamily: 'Ubuntu-M', + }, +}); type SymptomInfoScreenNavigationProp = StackNavigationProp< RootStackParamList, 'SymptomInfo' >; -export class SymptomInfo extends React.Component<{ +export function SymptomInfo({ + navigation, +}: { navigation: SymptomInfoScreenNavigationProp; -}> { - render() { - return ( - <> - Some info what to do if symptoms exist -