forked from Path-Check/safeplaces-dct-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from tripleblindmarket/develop
Merge
- Loading branch information
Showing
73 changed files
with
9,771 additions
and
6,322 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,3 +19,4 @@ | |
|
|
||
| android.useAndroidX=true | ||
| android.enableJetifier=true | ||
| # googlePlayServicesVersion=12.0.1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,92 +1,103 @@ | ||
| import React, {Component } from 'react'; | ||
| import React, { Component } from 'react'; | ||
|
|
||
| import {NavigationContainer} from '@react-navigation/native'; | ||
| import {createStackNavigator} from '@react-navigation/stack'; | ||
| import {SafeAreaView} from 'react-native'; | ||
| import { NavigationContainer } from '@react-navigation/native'; | ||
| import { createStackNavigator } from '@react-navigation/stack'; | ||
| import { SafeAreaView } from 'react-native'; | ||
| import LocationTracking from './views/LocationTracking'; | ||
| import Welcome from './views/Welcome'; | ||
| import NewsScreen from './views/News'; | ||
| import ExportScreen from './views/Export'; | ||
| import ImportScreen from './views/Import'; | ||
| import OverlapScreen from './views/Overlap'; | ||
| import LicencesScreen from './views/Licenses'; | ||
| import Slider from './views/welcomeScreens/Slider'; | ||
| import {GetStoreData, SetStoreData} from './helpers/General'; | ||
| import { GetStoreData, SetStoreData } from './helpers/General'; | ||
|
|
||
| const Stack = createStackNavigator(); | ||
|
|
||
| class Entry extends Component { | ||
| constructor(props) { | ||
| super(props); | ||
| this.state={ | ||
| initialRouteName:'' | ||
| } | ||
| } | ||
|
|
||
| componentDidMount(){ | ||
| GetStoreData('PARTICIPATE') | ||
| constructor(props) { | ||
| super(props); | ||
| this.state = { | ||
| initialRouteName: '', | ||
| }; | ||
| } | ||
|
|
||
| componentDidMount() { | ||
| GetStoreData('PARTICIPATE') | ||
| .then(isParticipating => { | ||
| console.log(isParticipating); | ||
| this.setState({ | ||
| initialRouteName:isParticipating | ||
| }) | ||
| console.log(isParticipating); | ||
| this.setState({ | ||
| initialRouteName: isParticipating, | ||
| }); | ||
| }) | ||
| .catch(error => console.log(error)) | ||
| } | ||
| .catch(error => console.log(error)); | ||
| } | ||
|
|
||
| render() { | ||
| return ( | ||
| <NavigationContainer> | ||
| <SafeAreaView style={{flex:1}}> | ||
| <Stack.Navigator initialRouteName='InitialScreen'> | ||
| render() { | ||
| return ( | ||
| <NavigationContainer> | ||
| <SafeAreaView style={{ flex: 1 }}> | ||
| <Stack.Navigator initialRouteName="InitialScreen"> | ||
| {this.state.initialRouteName === 'true' ? ( | ||
| <Stack.Screen | ||
| name="InitialScreen" | ||
| component={LocationTracking} | ||
| options={{headerShown:false}} | ||
| /> | ||
| ):( | ||
| name="InitialScreen" | ||
| component={LocationTracking} | ||
| options={{ headerShown: false }} | ||
| /> | ||
| ) : ( | ||
| <Stack.Screen | ||
| name="InitialScreen" | ||
| component={Slider} | ||
| options={{headerShown:false}} | ||
| /> | ||
| name="InitialScreen" | ||
| component={Slider} | ||
| options={{ headerShown: false }} | ||
| /> | ||
| )} | ||
| <Stack.Screen | ||
| <Stack.Screen | ||
| name="Slider" | ||
| component={Slider} | ||
| options={{headerShown:false}} | ||
| /> | ||
|
|
||
|
|
||
| options={{ headerShown: false }} | ||
| /> | ||
| <Stack.Screen | ||
| name="WelcomeScreen" | ||
| component={Welcome} | ||
| options={{headerShown:false}} | ||
| /> | ||
| options={{ headerShown: false }} | ||
| /> | ||
| <Stack.Screen | ||
| name="LocationTrackingScreen" | ||
| component={LocationTracking} | ||
| options={{headerShown:false}} | ||
| options={{ headerShown: false }} | ||
| /> | ||
| <Stack.Screen | ||
| name="NewsScreen" | ||
| component={NewsScreen} | ||
| options={{headerShown:false}} | ||
| options={{ headerShown: false }} | ||
| /> | ||
| <Stack.Screen | ||
| name="ExportScreen" | ||
| component={ExportScreen} | ||
| options={{headerShown:false}} | ||
| options={{ headerShown: false }} | ||
| /> | ||
| <Stack.Screen | ||
| name="ImportScreen" | ||
| component={ImportScreen} | ||
| options={{ headerShown: false }} | ||
| /> | ||
| <Stack.Screen | ||
| name="LicensesScreen" | ||
| component={LicencesScreen} | ||
| options={{ headerShown: false }} | ||
| /> | ||
| <Stack.Screen | ||
| name="OverlapScreen" | ||
| component={OverlapScreen} | ||
| options={{headerShown:false}} | ||
| /> | ||
| </Stack.Navigator> | ||
| </SafeAreaView> | ||
| </NavigationContainer> | ||
| ) | ||
| } | ||
| </SafeAreaView> | ||
| </NavigationContainer> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default Entry; |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| const colors = { | ||
| BLACK: "#000", | ||
| WHITE: "#FFF", | ||
| DODGER_BLUE: "#428AF8", | ||
| SILVER: "#BEBEBE", | ||
| TORCH_RED: "#F8262F", | ||
| MISCHKA: "#E5E4E6", | ||
| BLACK: '#000', | ||
| WHITE: '#FFF', | ||
| DODGER_BLUE: '#428AF8', | ||
| SILVER: '#BEBEBE', | ||
| TORCH_RED: '#F8262F', | ||
| MISCHKA: '#E5E4E6', | ||
| APP_BACKGROUND: '#FFF8ED', | ||
| PRIMARY_TEXT: "#000", | ||
| GREEN: "#32A852", | ||
| VIOLET: "#6C3794", | ||
| PRIMARY_TEXT: '#000', | ||
| GREEN: '#32A852', | ||
| VIOLET: '#6C3794', | ||
|
|
||
| REG_BUTTON: "#428AF8", | ||
| POS_BUTTON: "#32A852", | ||
| NEG_BUTTON: "#F8262F", | ||
| SENS_BUTTON: "#6C3794" | ||
| REG_BUTTON: '#428AF8', | ||
| POS_BUTTON: '#32A852', | ||
| NEG_BUTTON: '#F8262F', | ||
| SENS_BUTTON: '#6C3794', | ||
| }; | ||
|
|
||
| export default colors; |
Oops, something went wrong.