Merge branch 'master' into 'assignment3_1'

Master

See merge request !1

navigation/MainTabNavigator.js

@@ -8,9 +8,15 @@ import ReposScreen from '../screens/ReposScreen';
 import ProfileScreen from '../screens/ProfileScreen';
 import followingScreen from '../screens/FollowingScreen.js';
 import followerScreen from '../screens/FollowerScreen.js';
+import InteractScreen from '../screens/Interact.js'
+import ExternalProfileScreen from '../screens/ExternalProfileScreen.js'
 
 const ProfileStack = createStackNavigator({
   Profile: ProfileScreen,
+  ExternalProfile : ExternalProfileScreen,
+  Following : followingScreen,
+  Followers : followerScreen,
+  Repos : ReposScreen
 });
 
 ProfileStack.navigationOptions = {
@@ -23,6 +29,23 @@ ProfileStack.navigationOptions = {
   ),
 };
 
+const ExternalProfileStack = createStackNavigator({
+  ExternalProfile: ExternalProfileScreen,
+  Following : followingScreen,
+  Followers : followerScreen,
+  Repos : ReposScreen
+});
+
+ExternalProfileStack.navigationOptions = {
+  tabBarLabel: 'ExternalProfile',
+  tabBarIcon: ({ focused }) => (
+    <TabBarIcon
+      focused={focused}
+      name={Platform.OS === 'ios' ? `ios-options${focused ? '' : '-outline'}` : 'md-options'}
+    />
+  ),
+};
+
 const ReposStack = createStackNavigator({
   Repos: ReposScreen,
 });
@@ -66,11 +89,24 @@ FollowingStack.navigationOptions = {
 };
 
 
+const InteractStack = createStackNavigator({
+  Interact: InteractScreen,
+});
+
+InteractStack.navigationOptions = {
+  tabBarLabel: 'Interactions',
+  tabBarIcon: ({ focused }) => (
+    <TabBarIcon
+      focused={focused}
+      name={Platform.OS === 'ios' ? `ios-link${focused ? '' : '-outline'}` : 'md-link'}
+    />
+  ),
+};
+
 export default createBottomTabNavigator({
   ProfileStack,
   ReposStack,
-  FollowersStack,
-  FollowingStack,
+  InteractStack,