Skip to content

Commit e595025

Browse files
committed
tweaks
1 parent cf0e348 commit e595025

138 files changed

Lines changed: 1990 additions & 443 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.babelrc‎

100644100755
File mode changed.

‎.flowconfig‎

100644100755
File mode changed.

‎.gitignore‎

100644100755
File mode changed.

‎.watchmanconfig‎

100644100755
File mode changed.

‎App.js‎

100644100755
Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import React from 'react';
22
import { AppLoading, Asset, Font } from 'expo';
3-
import Home from './screens/home/home'
4-
import Join from './screens/join/join'
5-
import Gallery from './screens/gallery/gallery'
6-
import Contact from './screens/contact/contact'
7-
import About from './screens/about/about'
3+
import Home from './screens/fitexpress/home/home'
4+
import Join from './screens/fitexpress/join/join'
5+
import Gallery from './screens/fitexpress/gallery/gallery'
6+
import Contact from './screens/fitexpress/contact/contact'
7+
import About from './screens/fitexpress/about/about'
8+
import Bodytec from './screens/bodytec/home/home'
9+
import BodytecGallery from './screens/bodytec/gallery/gallery'
810

911
import { StyleSheet, Text, View, Image, StatusBar, ImageBackground, TouchableHighlight, Dimensions, Platform, PixelRatio } from 'react-native';
1012
import { DrawerNavigator, StackNavigator } from 'react-navigation';
@@ -25,7 +27,13 @@ const Stack = {
2527
},
2628
About: {
2729
screen: About
28-
},
30+
},
31+
Bodytec: {
32+
screen: Bodytec
33+
},
34+
BodytecGallery: {
35+
screen: BodytecGallery
36+
},
2937
};
3038

3139
const DrawerRoutes = {
@@ -46,15 +54,17 @@ const DrawerRoutes = {
4654
},
4755
};
4856

57+
58+
4959
const RootNavigator = StackNavigator({
5060
Drawer: {
5161
name: 'Drawer',
5262
screen: DrawerNavigator(DrawerRoutes,{
53-
contentComponent: CustomDrawer,
54-
drawerPosition: 'right'
55-
}
63+
contentComponent: CustomDrawer,
64+
drawerPosition: 'right'
65+
}
5666
),
57-
},
67+
},
5868
...Stack
5969
},
6070
{
@@ -80,6 +90,7 @@ function cacheFonts(fonts) {
8090
export default class App extends React.Component {
8191
state = {
8292
isReady: false,
93+
current: "fit"
8394
};
8495

8596
async _loadAssetsAsync() {
@@ -114,7 +125,12 @@ export default class App extends React.Component {
114125
);
115126
}
116127
return (
117-
<RootNavigator ref={nav => { this.navigator = nav; }} />
128+
<RootNavigator
129+
onNavigationStateChange={(prevState, currentState) => {
130+
const currentScreen = getCurrentRouteName(currentState);
131+
const prevScreen = getCurrentRouteName(prevState);
132+
}}
133+
ref={nav => { this.navigator = nav; }} />
118134
);
119135
}
120136
}

‎CustomDrawer.js‎

100644100755
File mode changed.

‎CustomDrawer2.js‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { DrawerItems, SafeAreaView } from 'react-navigation';
2+
import React from 'react';
3+
import { StyleSheet, ScrollView, Image, Text, View } from 'react-native';
4+
import { style } from 'expo/src/Font';
5+
6+
export default CustomDrawer = (props) => (
7+
<ScrollView style={styles.scrollView}>
8+
<SafeAreaView style={styles.container} forceInset={{ top: 'always', horizontal: 'never' }}>
9+
<DrawerItems {...props}
10+
labelStyle = {styles.label}
11+
itemStyle = {{justifyContent: 'flex-end'}}
12+
activeTintColor='#ffffff'
13+
inactiveTintColor='#525252'
14+
activeBackgroundColor='#0584f7' />
15+
</SafeAreaView>
16+
</ScrollView>
17+
);
18+
19+
const styles = StyleSheet.create({
20+
scrollView: {
21+
marginTop: 40
22+
},
23+
logoWrapper: {
24+
borderBottomWidth: 0.5,
25+
borderBottomColor: '#d6d7da',
26+
padding: 40
27+
},
28+
logo: {
29+
alignSelf: "center",
30+
width: 250,
31+
height: 43,
32+
},
33+
container: {
34+
flex: 1,
35+
},
36+
label: {
37+
fontFamily: 'NeoSansArabic',
38+
fontWeight: 'normal',
39+
}
40+
});

‎README.md‎

100644100755
File mode changed.

‎app.json‎

100644100755
File mode changed.

‎assets/113228Contactus2.jpg‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)