update to dev

src/screens/private/HomePage.js

@@ -9,9 +9,11 @@ const LeftComponent = () => <Icon name="menu" style={{ color: 'white', fontSize:
 const RightComponent = () => <Icon name="notifications" style={{ color: 'white', fontSize: 24 }} />;
 const RightComponent = () => <Icon name="notifications" style={{ color: 'white', fontSize: 24 }} />;
 
 
 const BottomTabs = [
 const BottomTabs = [
-	{ icon: 'home', label: 'Hello1', content: <PageOne /> },
-	{ icon: 'navigate', label: 'Hello2', content: <PageTwo /> },
-	{ icon: 'navigate', label: 'Hello3' },
+	{ icon: { name: 'home' }, label: 'Smart Meter', content: <PageOne /> },
+	{ icon: { name: 'md-time' }, label: 'Time', content: <PageTwo /> },
+	{ icon: { type: 'SimpleLineIcons', name: 'chart' }, label: 'History' },
+	{ icon: { name: 'ios-share-alt' }, label: 'Share' },
+	{ icon: { type: 'SimpleLineIcons', name: 'settings' }, label: 'Setting' },
 ];
 ];
 
 
 class HomePage extends Component {
 class HomePage extends Component {
@@ -22,13 +24,13 @@ class HomePage extends Component {
 	renderButtonTabs = () => {
 	renderButtonTabs = () => {
 		return (
 		return (
 			<Tabs
 			<Tabs
-				tabContainerStyle={{ backgroundColor: '#fbfbfb' }}
+				tabContainerStyle={{ backgroundColor: '#fbfbfb', paddingHorizontal: 20 }}
 				tabBarPosition="overlayBottom"
 				tabBarPosition="overlayBottom"
 				tabBarUnderlineStyle={{
 				tabBarUnderlineStyle={{
-					backgroundColor: 'red',
+					backgroundColor: '#f44c4c',
 					top: 0,
 					top: 0,
-					width: width / 6,
-					marginLeft: width / 12,
+					width: width / 10,
+					marginLeft: width / 20 + 20,
 				}}
 				}}
 				onChangeTab={({ i }) => {
 				onChangeTab={({ i }) => {
 					this.setState({ activeIndex: i });
 					this.setState({ activeIndex: i });
@@ -50,9 +52,10 @@ class HomePage extends Component {
 								<Icon
 								<Icon
 									style={{
 									style={{
 										fontSize: 20,
 										fontSize: 20,
-										color: this.state.activeIndex === index ? 'red' : '#b9babc',
+										color: this.state.activeIndex === index ? '#f44c4c' : '#b9babc',
 									}}
 									}}
-									name={tab.icon}
+									type={tab.icon.type || 'Ionicons'}
+									name={tab.icon.name}
 								/>
 								/>
 								<Text
 								<Text
 									style={{
 									style={{
@@ -72,8 +75,6 @@ class HomePage extends Component {
 		);
 		);
 	};
 	};
 	render() {
 	render() {
-		// console.log(this.props);
-
 		return (
 		return (
 			<Container>
 			<Container>
 				<Header
 				<Header

src/screens/public/sendEmail.js

@@ -14,6 +14,7 @@ const styles = StyleSheet.create({
 		color: '#4a4a4a',
 		color: '#4a4a4a',
 	},
 	},
 });
 });
+
 export default class sendEmail extends Component {
 export default class sendEmail extends Component {
 	render() {
 	render() {
 		return (
 		return (