Skip to content

Commit

Permalink
Updates: Velocity App (react-ui-kit#57)
Browse files Browse the repository at this point in the history
* Plant App - Updated to Expo SDK 36

* Camping App: Updated to Expo SDK 36

* iBlood: Updated to Expo SDK 36

* Parking App: Updated to Expo SDK 36

* Travel App: Updated to Expo SDK 36

* VPN App: Updated to Expo SDK 36

* Smart Home App: Updated to Expo SDK 36

* Driving App: Updated to Expo SDK 36

* Velocity App: Updated to Expo SDK 36
  • Loading branch information
hetmann authored Jan 17, 2020
1 parent a20303e commit 46deac3
Show file tree
Hide file tree
Showing 8 changed files with 2,964 additions and 2,773 deletions.
44 changes: 22 additions & 22 deletions velocity/App.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import React from 'react';
import { Platform, StatusBar, StyleSheet, View } from 'react-native';
import { AppLoading, Asset, Font, Icon } from 'expo';
import AppNavigator from './navigation/AppNavigator';
import React from "react";
import { Platform, StatusBar, StyleSheet, View } from "react-native";
import { AppLoading, Icon } from "expo";
import { Asset } from "expo-asset";
import * as Font from "expo-font";
import AppNavigator from "./navigation/AppNavigator";

export default class App extends React.Component {
state = {
isLoadingComplete: false,
isLoadingComplete: false
};

render() {
Expand All @@ -20,7 +22,7 @@ export default class App extends React.Component {
} else {
return (
<View style={styles.container}>
{Platform.OS === 'ios' && <StatusBar barStyle="default" />}
{Platform.OS === "ios" && <StatusBar barStyle="default" />}
<AppNavigator />
</View>
);
Expand All @@ -29,23 +31,21 @@ export default class App extends React.Component {

_loadResourcesAsync = async () => {
return Promise.all([
Asset.loadAsync([
require('./assets/images/Base/Logo.png'),
]),
Asset.loadAsync([require("./assets/images/Base/Logo.png")]),
Font.loadAsync({
// This is the font that we are using for our tab bar
// ...Icon.Ionicons.font,
'Rubik-Black': require('./assets/fonts/Rubik-Black.ttf'),
'Rubik-BlackItalic': require('./assets/fonts/Rubik-BlackItalic.ttf'),
'Rubik-Bold': require('./assets/fonts/Rubik-Bold.ttf'),
'Rubik-BoldItalic': require('./assets/fonts/Rubik-BoldItalic.ttf'),
'Rubik-Italic': require('./assets/fonts/Rubik-Italic.ttf'),
'Rubik-Light': require('./assets/fonts/Rubik-Light.ttf'),
'Rubik-LightItalic': require('./assets/fonts/Rubik-LightItalic.ttf'),
'Rubik-Medium': require('./assets/fonts/Rubik-Medium.ttf'),
'Rubik-MediumItalic': require('./assets/fonts/Rubik-MediumItalic.ttf'),
'Rubik-Regular': require('./assets/fonts/Rubik-Regular.ttf'),
}),
"Rubik-Black": require("./assets/fonts/Rubik-Black.ttf"),
"Rubik-BlackItalic": require("./assets/fonts/Rubik-BlackItalic.ttf"),
"Rubik-Bold": require("./assets/fonts/Rubik-Bold.ttf"),
"Rubik-BoldItalic": require("./assets/fonts/Rubik-BoldItalic.ttf"),
"Rubik-Italic": require("./assets/fonts/Rubik-Italic.ttf"),
"Rubik-Light": require("./assets/fonts/Rubik-Light.ttf"),
"Rubik-LightItalic": require("./assets/fonts/Rubik-LightItalic.ttf"),
"Rubik-Medium": require("./assets/fonts/Rubik-Medium.ttf"),
"Rubik-MediumItalic": require("./assets/fonts/Rubik-MediumItalic.ttf"),
"Rubik-Regular": require("./assets/fonts/Rubik-Regular.ttf")
})
]);
};

Expand All @@ -63,6 +63,6 @@ export default class App extends React.Component {
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
},
backgroundColor: "#fff"
}
});
4 changes: 2 additions & 2 deletions velocity/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "velocity",
"slug": "velocity",
"privacy": "public",
"sdkVersion": "32.0.0",
"sdkVersion": "36.0.0",
"platforms": [
"ios",
"android"
Expand All @@ -26,4 +26,4 @@
"supportsTablet": true
}
}
}
}
29 changes: 16 additions & 13 deletions velocity/navigation/Auth.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import React from 'react';
import { createStackNavigator } from 'react-navigation';
import React from "react";
import { createStackNavigator } from "react-navigation-stack";

import Login from '../screens/Login';
import Register from '../screens/Register';
import Forgot from '../screens/Forgot';
import Login from "../screens/Login";
import Register from "../screens/Register";
import Forgot from "../screens/Forgot";

export default createStackNavigator({
Login,
Register,
Forgot,
}, {
defaultNavigationOptions: {
header: null
export default createStackNavigator(
{
Login,
Register,
Forgot
},
{
defaultNavigationOptions: {
header: null
}
}
});
);
45 changes: 23 additions & 22 deletions velocity/navigation/MainTabNavigator.js
Original file line number Diff line number Diff line change
@@ -1,60 +1,61 @@
import React from 'react';
import { Platform } from 'react-native';
import { createStackNavigator, createBottomTabNavigator } from 'react-navigation';
import React from "react";
import { Platform } from "react-native";
import { createBottomTabNavigator } from "react-navigation";
import { createStackNavigator } from "react-navigation-stack";

import TabBarIcon from '../components/TabBarIcon';
import HomeScreen from '../screens/HomeScreen';
import LinksScreen from '../screens/LinksScreen';
import SettingsScreen from '../screens/SettingsScreen';
import TabBarIcon from "../components/TabBarIcon";
import HomeScreen from "../screens/HomeScreen";
import LinksScreen from "../screens/LinksScreen";
import SettingsScreen from "../screens/SettingsScreen";

const HomeStack = createStackNavigator({
Home: HomeScreen,
Home: HomeScreen
});

HomeStack.navigationOptions = {
tabBarLabel: 'Home',
tabBarLabel: "Home",
tabBarIcon: ({ focused }) => (
<TabBarIcon
focused={focused}
name={
Platform.OS === 'ios'
? `ios-information-circle${focused ? '' : '-outline'}`
: 'md-information-circle'
Platform.OS === "ios"
? `ios-information-circle${focused ? "" : "-outline"}`
: "md-information-circle"
}
/>
),
)
};

const LinksStack = createStackNavigator({
Links: LinksScreen,
Links: LinksScreen
});

LinksStack.navigationOptions = {
tabBarLabel: 'Links',
tabBarLabel: "Links",
tabBarIcon: ({ focused }) => (
<TabBarIcon
focused={focused}
name={Platform.OS === 'ios' ? 'ios-link' : 'md-link'}
name={Platform.OS === "ios" ? "ios-link" : "md-link"}
/>
),
)
};

const SettingsStack = createStackNavigator({
Settings: SettingsScreen,
Settings: SettingsScreen
});

SettingsStack.navigationOptions = {
tabBarLabel: 'Settings',
tabBarLabel: "Settings",
tabBarIcon: ({ focused }) => (
<TabBarIcon
focused={focused}
name={Platform.OS === 'ios' ? 'ios-options' : 'md-options'}
name={Platform.OS === "ios" ? "ios-options" : "md-options"}
/>
),
)
};

export default createBottomTabNavigator({
HomeStack,
LinksStack,
SettingsStack,
SettingsStack
});
10 changes: 5 additions & 5 deletions velocity/navigation/Overview.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';
import { createStackNavigator } from 'react-navigation';
import React from "react";
import { createStackNavigator } from "react-navigation-stack";

import Overview from '../screens/Overview';
import Overview from "../screens/Overview";

export default createStackNavigator({
Overview,
})
Overview
});
20 changes: 10 additions & 10 deletions velocity/navigation/Screens.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import { createDrawerNavigator } from 'react-navigation';
import React from "react";
import { createDrawerNavigator } from "react-navigation-drawer";

import OverviewStack from './Overview';
import Analytics from '../screens/Analytics';
import Chat from '../screens/Chat';
import Service from '../screens/Service';
import Settings from '../screens/Settings';
import Map from '../screens/Map';
import Vehicles from '../screens/Vehicles';
import OverviewStack from "./Overview";
import Analytics from "../screens/Analytics";
import Chat from "../screens/Chat";
import Service from "../screens/Service";
import Settings from "../screens/Settings";
import Map from "../screens/Map";
import Vehicles from "../screens/Vehicles";

export default createDrawerNavigator({
OverviewStack,
Expand All @@ -16,5 +16,5 @@ export default createDrawerNavigator({
Service,
Settings,
Map,
Vehicles,
Vehicles
});
20 changes: 13 additions & 7 deletions velocity/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,21 @@
},
"dependencies": {
"@expo/samples": "2.1.1",
"expo": "^32.0.0",
"react": "16.5.0",
"react-native": "https://github.com/expo/react-native/archive/sdk-32.0.0.tar.gz",
"react-native-keyboard-aware-scroll-view": "^0.8.0",
"react-navigation": "^3.0.9"
"expo": "^36.0.0",
"expo-asset": "~8.0.0",
"expo-font": "~8.0.0",
"react": "16.9.0",
"react-native": "https://github.com/expo/react-native/archive/sdk-36.0.1.tar.gz",
"react-native-gesture-handler": "^1.5.3",
"react-native-keyboard-aware-scroll-view": "^0.9.1",
"react-native-reanimated": "^1.7.0",
"react-navigation": "^4.0.10",
"react-navigation-drawer": "^2.3.3",
"react-navigation-stack": "1.9.3"
},
"devDependencies": {
"babel-preset-expo": "^5.0.0",
"jest-expo": "^32.0.0"
"babel-preset-expo": "^8.0.0",
"jest-expo": "^36.0.0"
},
"private": true
}
Loading

0 comments on commit 46deac3

Please sign in to comment.