Merge branch 'home' into dev

android/app/build.gradle

@@ -140,6 +140,7 @@ dependencies {
     compile fileTree(dir: "libs", include: ["*.jar"])
     compile "com.android.support:appcompat-v7:23.0.1"
     compile "com.facebook.react:react-native:+"  // From node_modules
+    compile 'com.facebook.fresco:animated-gif:1.0.1' // for gif support
 }
 
 // Run this once to be able to run the application with BUCK

android/app/src/main/AndroidManifest.xml

@@ -3,7 +3,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"

app/App.js

@@ -1,9 +1,6 @@
-/**
+/*
- * Sample React Native App
+ * Main file that overlooks entire app routing
- * https://github.com/facebook/react-native
- * @flow
  */
-
 import React, { Component } from 'react';
 import {
   Platform,
@@ -17,47 +14,21 @@ import {
   Stack
 } from 'react-native-router-flux';
 
-const instructions = Platform.select({
+// Imported screens to route through
-  ios: 'Press Cmd+R to reload,\n' +
+import Home from './screens/home.js';
-    'Cmd+D or shake for dev menu',
+import Loading from './screens/loading.js';
-  android: 'Double tap R on your keyboard to reload,\n' +
+import Main from './screens/main.js'
-    'Shake or press menu button for dev menu',
-});
-
 type Props = {};
 export default class App extends Component<Props> {
   render() {
     return (
-      <View style={styles.container}>
+      <Router>
-        <Text style={styles.welcome}>
+        <Stack key='root' style={{paddingTop: 54}}>
-          Welcome to React !
+          <Scene key='home' component={Home} title="Home" hideNavBar={true} />
-        </Text>
+          <Scene key='loading' component={Loading} title='Loading' />
-        <Text style={styles.instructions}>
+          <Scene key='main' component={Main} title='Main' hideNavBar={true} />
-          To get started, edit App.js
+        </Stack>
-        </Text>
+      </Router>
-        <Text style={styles.instructions}>
-          {instructions}
-        </Text>
-      </View>
     );
   }
 }
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
-});

app/assets/reference.txt

@@ -0,0 +1,2 @@
+Main Theme
+  Nexto color: #0e8f9e

app/screens/main/adspace.js

@@ -0,0 +1,33 @@
+/*
+ * AdSpace component within Main
+ */
+import React, { Component } from 'react';
+import {
+  Dimensions,
+  View,
+  Text,
+} from 'react-native';
+import {
+  Actions
+} from 'react-native-router-flux';
+
+const windowWidth = Dimensions.get('window').width;
+const windowHeight = Dimensions.get('window').height;
+
+type Props = {};
+export default class AdSpace extends Component<Props> {
+  render() {
+    return (
+      <View style={styles.container}>
+        <Text>adspace</Text>
+      </View>
+    );
+  }
+}
+
+const styles = {
+  container: {
+    flex: 1,
+    backgroundColor: 'black'
+  }
+}

app/screens/main/chat.js

@@ -0,0 +1,79 @@
+/*
+ * Chat component within Main
+ */
+import React, { Component } from 'react';
+import {
+  Dimensions,
+  View,
+  Text,
+  TextInput,
+  Image
+} from 'react-native';
+import {
+  Actions
+} from 'react-native-router-flux';
+
+const windowWidth = Dimensions.get('window').width;
+const windowHeight = Dimensions.get('window').height;
+
+type Props = {};
+export default class Chat extends Component<Props> {
+  render() {
+    return (
+      <View style={styles.container}>
+        <View style={styles.chatField}>
+
+        </View>
+        <View style={styles.inputMsgField}>
+          <View style={styles.iconCont}>
+            <Text>cra</Text>
+          </View>
+          <View style={styles.inputCont}>
+            <TextInput
+              placeholder="Type message..."
+            />
+          </View>
+          <View style={styles.iconCont}>
+            <Image
+              style={styles.sendIcon}
+              source={require('../../assets/images/sendIcon.png')}
+            />
+          </View>
+        </View>
+      </View>
+    );
+  }
+}
+
+const styles = {
+  container: {
+    flex: 1,
+    flexDirection: 'column',
+    justifyContent: 'flex-end',
+    backgroundColor: '#e8ebef'
+  },
+  chatField: {
+    flex: 8
+  },
+  inputMsgField: {
+    flex: 1,
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    height: 50,
+    backgroundColor: 'white'
+  },
+  iconCont: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  inputCont: {
+    flex: 6,
+    alignSelf: 'flex-end'
+  },
+  sendIcon: {
+    height: 30,
+    width: 30
+  }
+}

app/screens/main/navbar.js

@@ -0,0 +1,77 @@
+/*
+ * Navbar component within Main
+ */
+import React, { Component } from 'react';
+import {
+  Dimensions,
+  View,
+  Text,
+  Image
+} from 'react-native';
+import {
+  Actions
+} from 'react-native-router-flux';
+
+const windowWidth = Dimensions.get('window').width;
+const windowHeight = Dimensions.get('window').height;
+
+type Props = {};
+export default class Navbar extends Component<Props> {
+  render() {
+    return (
+      <View style={styles.container}>
+        <View style={styles.iconCont}>
+          <Image
+          style={styles.menuIcon}
+          source={require('../../assets/images/menuIcon.png')}
+          />
+        </View>
+        <View style={styles.headerTxt}>
+          <Text style={styles.head}>Main Chat</Text>
+          <Text style={styles.status}>online</Text>
+        </View>
+        <View style={styles.iconCont}>
+          <Image
+          style={styles.inboxIcon}
+          source={require('../../assets/images/inboxIcon.jpg')}
+          />
+        </View>
+      </View>
+    );
+  }
+}
+
+const styles = {
+  container: {
+    flex: 1,
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    backgroundColor: '#0e8f9e'
+  },
+  iconCont: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center'
+  },
+  menuIcon: {
+    height: 50,
+    width: 50
+  },
+  headerTxt: {
+    flex: 7,
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  head: {
+    fontSize: 20,
+    color: 'white'
+  },
+  status: {
+    fontSize: 13,
+    color: 'white'
+  },
+  inboxIcon: {
+    height: 40,
+    width: 40
+  }
+}

package.json

@@ -8,7 +8,8 @@
   },
   "dependencies": {
     "react": "16.3.1",
-    "react-native": "0.55.3"
+    "react-native": "^0.55.3",
+    "react-native-router-flux": "^4.0.0-beta.28"
   },
   "devDependencies": {
     "babel-jest": "22.4.3",