From ef315a96c5bb17ed27a75f80e711087c05939bea Mon Sep 17 00:00:00 2001
From: Ren Juan <juan@acm.org>
Date: Sat, 28 Aug 2021 03:34:05 +0000
Subject: [PATCH] 2.0.4

*
---
 Ejectable/app.json                   |  2 +-
 Ejectable/components/ScreenInfo.tsx  | 19 +++++++++++++------
 Ejectable/screens/SettingsScreen.tsx | 25 ++++++++++++++++---------
 Ejectable/screens/TripScreen.tsx     |  2 +-
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/Ejectable/app.json b/Ejectable/app.json
index cf62ea94..aa47faf3 100644
--- a/Ejectable/app.json
+++ b/Ejectable/app.json
@@ -2,7 +2,7 @@
   "expo": {
     "name": "GT2 Green Travel Carbon App",
     "slug": "GT2standalone",
-    "version": "2.0.0",
+    "version": "2.0.4",
     "orientation": "default",
     "description": "Travel Carbon Footprint (simplified version)",
     "icon": "./assets/images/icon.png",
diff --git a/Ejectable/components/ScreenInfo.tsx b/Ejectable/components/ScreenInfo.tsx
index 6dde4932..b32b0a5d 100644
--- a/Ejectable/components/ScreenInfo.tsx
+++ b/Ejectable/components/ScreenInfo.tsx
@@ -18,13 +18,13 @@ export default function ScreenInfo() {
 }
 export function ScreenInfo2() {
   return (
-    <View style={styles.settingsContainer}>
+    <View>
         <Text
-          style={styles.settingsText}
+          style={styles.tripControlText}
           lightColor="rgba(0,0,0,0.8)"
           darkColor="rgba(255,255,255,0.8)">
-          Pause trip if fuel burning interrupted.                
-        </Text>  
+          {'Pause trip if fuel burning interrupted.\n'}
+         </Text>  
     </View>
   );
 }
@@ -35,7 +35,7 @@ export function ScreenInfo4() {
           style={styles.sensitive}
           lightColor="rgba(0,0,0,0.8)"
           darkColor="rgba(255,255,255,0.8)">
-          {'higher sensitivity may cause spurious motion at rest'}                
+          {'set CO2 rate above or \nselect fuel type below\nhigher sensitivity may cause\n spurious motion at rest'}                
         </Text>  
     </View>
   );
@@ -91,7 +91,8 @@ const styles = StyleSheet.create({
   },
   sensitive: {
     fontWeight: 'bold',
-    fontSize: 10,
+    fontSize: 14,
+    textAlign: 'center',
   },
   titleText: {
     color: 'white',
@@ -109,6 +110,12 @@ const styles = StyleSheet.create({
     lineHeight: 24,
     textAlign: 'center',
   },
+  tripControlText: {
+    fontSize: 14,
+    fontWeight: 'bold',
+    lineHeight: 24,
+    textAlign: 'center',
+  },
   versionText: {
     color: 'yellow',
     fontSize: 10,
diff --git a/Ejectable/screens/SettingsScreen.tsx b/Ejectable/screens/SettingsScreen.tsx
index 0592c3ad..6579c28f 100644
--- a/Ejectable/screens/SettingsScreen.tsx
+++ b/Ejectable/screens/SettingsScreen.tsx
@@ -18,7 +18,11 @@ export default function SettingsScreen( { navigation }: RootTabScreenProps<'Sett
     <View style={styles.container}>
       <Text style={styles.title}>Model Settings</Text>
       <View style={styles.separator} lightColor="#eee" darkColor="rgba(255,255,255,0.1)" />
-       <Text style={styles.caption}>{'\nset custom CO2 rate or use buttons below'}</Text> 
+       <View style={styles.captions}>
+        <Text style={styles.caption}>CO2 / km</Text> 
+        <Text>{'                  '}</Text>
+        <Text style={styles.caption}>sensitivity</Text>
+       </View>
        <View style={styles.inputs}>
        <TextInput   
         style={styles.input}
@@ -27,10 +31,7 @@ export default function SettingsScreen( { navigation }: RootTabScreenProps<'Sett
         value={rate}
         placeholder={Trips.co2Rate.toString()}
         keyboardType="numeric"
-       />    
-       </View>
-       <Text style={styles.caption}>{'\nsensitivity'}</Text>  
-       <View style={styles.inputs}>
+       />     
        <TextInput   
         style={styles.input}
         returnKeyType={'done'}
@@ -41,7 +42,7 @@ export default function SettingsScreen( { navigation }: RootTabScreenProps<'Sett
         value={sens}
         placeholder={Trips.sensitivity.toString()}
         keyboardType="numeric"
-       />      
+       />        
        </View>  
        <ScreenInfo4/>
        <View style={styles.controls} >
@@ -90,7 +91,7 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
   },
   switch: {
-    marginVertical: 20,
+    marginVertical: 2,
   },
   container: {
     flex: 1,
@@ -103,8 +104,14 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: "space-between",
   },
+  captions: {
+    marginVertical: 15,
+    width: "90%",
+    flexDirection: 'row',
+    justifyContent: "center"
+  },
   inputs: {
-    marginVertical: 5,
+    marginVertical: -20,
     width: "80%",
     flexDirection: 'row',
     justifyContent: "center",
@@ -120,7 +127,7 @@ const styles = StyleSheet.create({
   },
   input: {
     height: 40,
-    margin: 30,
+    margin: 10,
     borderWidth: 1,
     padding: 10,
   },
diff --git a/Ejectable/screens/TripScreen.tsx b/Ejectable/screens/TripScreen.tsx
index 4727882c..0dd72322 100644
--- a/Ejectable/screens/TripScreen.tsx
+++ b/Ejectable/screens/TripScreen.tsx
@@ -71,7 +71,7 @@ export default function TripScreen( { navigation }: RootTabScreenProps<'Trip'>)
         title={sButtonText}
         onPress={() => {
           if (!getAdvised()) {
-            Alert.alert("2.0.n runs in foreground only.");
+            Alert.alert("GT2 2.0.n doesn't runs in background.");
             setAdvised();
           }
           if (!Trips.inProgress) {startTrip();