RenJuan
/
GT2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*

This commit is contained in:
Ren Juan 2021-08-28 17:30:12 +00:00
parent 81ff54af6b
commit 01739a2ad7
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Ejectable/GT2.tsx
View File

@ -15,7 +15,7 @@ export var locEnabled:boolean = false;
const displayBeat:number = 3; const displayBeat:number = 3;
const geoLibAccuracy:number = 0.1; const geoLibAccuracy:number = 0.1;
const minExpoAccuracy:number = 10; const minExpoAccuracy:number = .01;
export function getEndIsLast() : boolean { return endIsNigh; } export function getEndIsLast() : boolean { return endIsNigh; }
export function setEndIsLast(value:boolean) { endIsNigh = value; } export function setEndIsLast(value:boolean) { endIsNigh = value; }

2
Ejectable/app.json
View File

@ -2,7 +2,7 @@
"expo": { "expo": {
"name": "GT2 Green Travel Carbon App", "name": "GT2 Green Travel Carbon App",
"slug": "GT2standalone", "slug": "GT2standalone",
"version": "2.0.5", "version": "2.0.6",
"orientation": "default", "orientation": "default",
"description": "Travel Carbon Footprint (simplified version)", "description": "Travel Carbon Footprint (simplified version)",
"icon": "./assets/images/icon.png", "icon": "./assets/images/icon.png",

2
Ejectable/components/ScreenInfo.tsx
View File

@ -61,7 +61,7 @@ export function ScreenInfo3() {
style={styles.titleText} style={styles.titleText}
lightColor="rgba(0,0,0,0.8)" lightColor="rgba(0,0,0,0.8)"
darkColor="rgba(255,255,255,0.8)"> darkColor="rgba(255,255,255,0.8)">
Green Travel Calculator v. 2.0.5 Green Travel Calculator v. 2.0.6
</Text> </Text>
<Text <Text
style={styles.versionText} style={styles.versionText}

10
Ejectable/screens/TripScreen.tsx
View File

@ -3,7 +3,7 @@ import { useState } from 'react';
import { Alert, BackHandler, Button, StyleSheet } from 'react-native'; import { Alert, BackHandler, Button, StyleSheet } from 'react-native';
import { Text, View } from '../components/Themed'; import { Text, View } from '../components/Themed';
import { ScreenInfo2 } from '../components/ScreenInfo'; import { ScreenInfo2 } from '../components/ScreenInfo';
import { locEnabled, TripDisplay, LastTrip, Trips } from '../GT2'; import { locEnabled, TripDisplay, LastTrip, Trips, setEndIsLast } from '../GT2';
import { RootTabScreenProps } from '../types'; import { RootTabScreenProps } from '../types';
import { getAdvised, setAdvised } from './ModalScreen'; import { getAdvised, setAdvised } from './ModalScreen';
@ -72,12 +72,12 @@ export default function TripScreen( { navigation }: RootTabScreenProps<'Trip'>)
title={sButtonText} title={sButtonText}
onPress={() => { onPress={() => {
if (!getAdvised()) { if (!getAdvised()) {
Alert.alert("Note:GT2 2.0.n doesn't run in background."); Alert.alert("Note: GT2 2.0.n doesn't while run in background.");
setAdvised(); setAdvised();
} }
if (!Trips.inProgress) {startTrip(); if (!Trips.inProgress) {startTrip();
if (Trips.inProgress) { setSButtonText("End"); setPButtonText('Pause');}} if (Trips.inProgress) { setSButtonText("End"); setPButtonText('Pause');}}
else {setSButtonText('Start'); endTrip(); navigation.push('Modal'); }} else {setSButtonText('Start'); LastTrip.from(Trips); endTrip(); navigation.push('Modal'); }}
} }
/> />
<Button <Button
@ -102,7 +102,7 @@ export default function TripScreen( { navigation }: RootTabScreenProps<'Trip'>)
title={sButtonText} title={sButtonText}
onPress={() => { onPress={() => {
if (!getAdvised()) { if (!getAdvised()) {
Alert.alert("Note:GT2 2.0.n doesn't run in background."); Alert.alert("Note: GT2 2.0.n doesn't run while in background.");
setAdvised(); setAdvised();
} }
if (!Trips.inProgress) {startTrip(); if (!Trips.inProgress) {startTrip();
@ -120,7 +120,7 @@ export default function TripScreen( { navigation }: RootTabScreenProps<'Trip'>)
</View> </View>
<TripDisplay></TripDisplay> <TripDisplay></TripDisplay>
<View> <View>
<Button title={'Show Last Trip'} onPress={() => { navigation.push('Modal'); } } /> <Button title={'Show Last Trip'} onPress={() => { setEndIsLast(true); navigation.push('Modal'); } } />
</View> </View>
</View> </View>
); );