diff --git a/App.js b/App.js
index 57a7d52..c04b82a 100644
--- a/App.js
+++ b/App.js
@@ -1,4 +1,5 @@
import React, { useState, useEffect } from "react";
+import { View } from "react-native";
import { Ionicons } from "@expo/vector-icons";
import { AppLoading } from "expo";
import { Asset } from "expo-asset";
diff --git a/components/Loader.js b/components/Loader.js
new file mode 100644
index 0000000..8c3cb05
--- /dev/null
+++ b/components/Loader.js
@@ -0,0 +1,16 @@
+import React from "react";
+import { ActivityIndicator } from "react-native";
+import styled from "styled-components";
+import styles from "../styles";
+
+const Container = styled.View`
+ flex: 1;
+ justify-content: center;
+ align-items: center;
+`;
+
+export default () => (
+
+
+
+);
diff --git a/components/NavController.js b/components/NavController.js
index 6afd934..202413a 100644
--- a/components/NavController.js
+++ b/components/NavController.js
@@ -1,14 +1,9 @@
import React from "react";
-import { View } from "react-native";
import { useIsLoggedIn } from "../AuthContext";
import AuthNavigation from "../navigation/AuthNavigation";
import MainNavigation from "../navigation/MainNavigation";
export default () => {
const isLoggedIn = useIsLoggedIn();
- return (
-
- {isLoggedIn ? : }
-
- );
+ return isLoggedIn ? : ;
};
diff --git a/navigation/MainNavigation.js b/navigation/MainNavigation.js
index 5166667..cc2061a 100644
--- a/navigation/MainNavigation.js
+++ b/navigation/MainNavigation.js
@@ -2,6 +2,7 @@ import { createStackNavigator, createAppContainer } from "react-navigation";
import TabNavigation from "./TabNavigation";
import PhotoNavigation from "./PhotoNavigation";
import MessageNavigation from "./MessageNavigation";
+import { stackStyles } from "./config";
const MainNavigation = createStackNavigator(
{
@@ -10,6 +11,11 @@ const MainNavigation = createStackNavigator(
MessageNavigation
},
{
+ defaultNavigationOptions: {
+ headerStyle: {
+ ...stackStyles
+ }
+ },
headerMode: "none",
mode: "modal"
}
diff --git a/navigation/MessageNavigation.js b/navigation/MessageNavigation.js
index 445b44f..0e02ee6 100644
--- a/navigation/MessageNavigation.js
+++ b/navigation/MessageNavigation.js
@@ -1,8 +1,18 @@
import { createStackNavigator } from "react-navigation";
import Messages from "../screens/Messages/Messages";
import Message from "../screens/Messages/Message";
+import { stackStyles } from "./config";
-export default createStackNavigator({
- Messages,
- Message
-});
+export default createStackNavigator(
+ {
+ Messages,
+ Message
+ },
+ {
+ defaultNavigationOptions: {
+ headerStyle: {
+ ...stackStyles
+ }
+ }
+ }
+);
diff --git a/navigation/PhotoNavigation.js b/navigation/PhotoNavigation.js
index 6d88f3a..b9d5be5 100644
--- a/navigation/PhotoNavigation.js
+++ b/navigation/PhotoNavigation.js
@@ -5,6 +5,7 @@ import {
import SelectPhoto from "../screens/Photo/SelectPhoto";
import TakePhoto from "../screens/Photo/TakePhoto";
import UploadPhoto from "../screens/Photo/UploadPhoto";
+import { stackStyles } from "./config";
const PhotoTabs = createMaterialTopTabNavigator(
{
@@ -16,7 +17,16 @@ const PhotoTabs = createMaterialTopTabNavigator(
}
);
-export default createStackNavigator({
- PhotoTabs,
- UploadPhoto
-});
+export default createStackNavigator(
+ {
+ PhotoTabs,
+ UploadPhoto
+ },
+ {
+ defaultNavigationOptions: {
+ headerStyle: {
+ ...stackStyles
+ }
+ }
+ }
+);
diff --git a/navigation/TabNavigation.js b/navigation/TabNavigation.js
index 8764e6e..62fb319 100644
--- a/navigation/TabNavigation.js
+++ b/navigation/TabNavigation.js
@@ -11,6 +11,7 @@ import Profile from "../screens/Tabs/Profile";
import MessagesLink from "../components/MessagesLink";
import { View } from "react-native";
import NavIcon from "../components/NavIcon";
+import { stackStyles } from "./config";
const stackFactory = (initialRoute, customConfig) =>
createStackNavigator({
@@ -18,7 +19,7 @@ const stackFactory = (initialRoute, customConfig) =>
screen: initialRoute,
navigationOptions: {
...customConfig,
- headerStyle: { backgroundColor: "#EFEEEF" }
+ headerStyle: { ...stackStyles }
}
}
});
@@ -104,8 +105,8 @@ export default createBottomTabNavigator(
{
tabBarOptions: {
showLabel: false,
- tabStyle: {
- backgroundColor: "#EFEEEF"
+ style: {
+ backgroundColor: "#FAFAFA"
}
}
}
diff --git a/navigation/config.js b/navigation/config.js
new file mode 100644
index 0000000..ef20203
--- /dev/null
+++ b/navigation/config.js
@@ -0,0 +1,3 @@
+export const stackStyles = {
+ backgroundColor: "#FAFAFA"
+};
diff --git a/screens/Tabs/Home.js b/screens/Tabs/Home.js
index df1b1ea..d9ab974 100644
--- a/screens/Tabs/Home.js
+++ b/screens/Tabs/Home.js
@@ -1,5 +1,6 @@
import React from "react";
import styled from "styled-components";
+import Loader from "../../components/Loader";
const View = styled.View`
justify-content: center;
@@ -7,10 +8,8 @@ const View = styled.View`
flex: 1;
`;
-const Text = styled.Text``;
-
export default () => (
- Home
+
);