diff --git a/assets/Temp.png b/assets/Temp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0774c39206127aa5a69cc5571f2be0d02f8c38e1
Binary files /dev/null and b/assets/Temp.png differ
diff --git a/assets/adaptive-icon.png b/assets/adaptive-icon.png
index af56a3faf132624caca5158aef959d33706aba39..0774c39206127aa5a69cc5571f2be0d02f8c38e1 100644
Binary files a/assets/adaptive-icon.png and b/assets/adaptive-icon.png differ
diff --git a/assets/backImage.png b/assets/backImage.png
index af56a3faf132624caca5158aef959d33706aba39..a1bfdfef1de9a562cc054ac9d363ccacdcf830ed 100644
Binary files a/assets/backImage.png and b/assets/backImage.png differ
diff --git a/assets/backImage1.png b/assets/backImage1.png
new file mode 100644
index 0000000000000000000000000000000000000000..befe893efa489524e87a99fa1093e039ccd8fb58
Binary files /dev/null and b/assets/backImage1.png differ
diff --git a/assets/favicon.png b/assets/favicon.png
deleted file mode 100644
index af56a3faf132624caca5158aef959d33706aba39..0000000000000000000000000000000000000000
Binary files a/assets/favicon.png and /dev/null differ
diff --git a/assets/icon.png b/assets/icon.png
index af56a3faf132624caca5158aef959d33706aba39..0774c39206127aa5a69cc5571f2be0d02f8c38e1 100644
Binary files a/assets/icon.png and b/assets/icon.png differ
diff --git a/assets/images/01.jpg b/assets/images/01.jpg
deleted file mode 100644
index 776bbba16fbc410a8a10d50c13669831dc32f3b8..0000000000000000000000000000000000000000
Binary files a/assets/images/01.jpg and /dev/null differ
diff --git a/assets/images/02.jpg b/assets/images/02.jpg
deleted file mode 100644
index 05360ed4a8228c106ecd31c03b572a2102a4cae8..0000000000000000000000000000000000000000
Binary files a/assets/images/02.jpg and /dev/null differ
diff --git a/assets/images/03.jpg b/assets/images/03.jpg
deleted file mode 100644
index 8d6c1548ec9ce0baa84f7bae057f76a8c473858a..0000000000000000000000000000000000000000
Binary files a/assets/images/03.jpg and /dev/null differ
diff --git a/assets/images/04.jpg b/assets/images/04.jpg
deleted file mode 100644
index a6d555cdd3f83ff9400bc163b9bc38c58f4c1890..0000000000000000000000000000000000000000
Binary files a/assets/images/04.jpg and /dev/null differ
diff --git a/assets/images/05.jpg b/assets/images/05.jpg
deleted file mode 100644
index 4c0966757968e58d29fca375e693a90a0019002b..0000000000000000000000000000000000000000
Binary files a/assets/images/05.jpg and /dev/null differ
diff --git a/assets/images/06.jpg b/assets/images/06.jpg
deleted file mode 100644
index b9851769a2df40cc3df33c155dd9913227083496..0000000000000000000000000000000000000000
Binary files a/assets/images/06.jpg and /dev/null differ
diff --git a/assets/images/07.jpg b/assets/images/07.jpg
deleted file mode 100644
index 56880c685526090fb59e07c2b6dabb13b0a6de2e..0000000000000000000000000000000000000000
Binary files a/assets/images/07.jpg and /dev/null differ
diff --git a/assets/images/08.jpg b/assets/images/08.jpg
deleted file mode 100644
index 9a5707d51495466139cc8daede3550176b185873..0000000000000000000000000000000000000000
Binary files a/assets/images/08.jpg and /dev/null differ
diff --git a/assets/images/09.jpg b/assets/images/09.jpg
deleted file mode 100644
index 139e4d67c62a31c615a1ea01b101d62e07807c61..0000000000000000000000000000000000000000
Binary files a/assets/images/09.jpg and /dev/null differ
diff --git a/assets/images/backImage.png b/assets/images/backImage.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca6e2a628a463c2af1696f0e450cfd22038ce45
Binary files /dev/null and b/assets/images/backImage.png differ
diff --git a/assets/images/folk.jpg b/assets/images/folk.jpg
deleted file mode 100644
index 54adf88b6601ecb94e3800264a3c09a698413758..0000000000000000000000000000000000000000
Binary files a/assets/images/folk.jpg and /dev/null differ
diff --git a/assets/images/loading-icon-animated-gif-19-1.gif b/assets/images/loading-icon-animated-gif-19-1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e7d2a4266fdd5f3b1b45356626739b134e30de3e
Binary files /dev/null and b/assets/images/loading-icon-animated-gif-19-1.gif differ
diff --git a/assets/splash.png b/assets/splash.png
index af56a3faf132624caca5158aef959d33706aba39..0774c39206127aa5a69cc5571f2be0d02f8c38e1 100644
Binary files a/assets/splash.png and b/assets/splash.png differ
diff --git a/assets/styles/index.ts b/assets/styles/index.ts
index ff13eccbd579d0c11c616cf51597b317c53e89f7..8f2280846c1b316d65b604c646d617165df2cdc7 100644
--- a/assets/styles/index.ts
+++ b/assets/styles/index.ts
@@ -389,7 +389,7 @@ export default StyleSheet.create({
textAlign: "center"
},
flatListItem: {
- backgroundColor: "orange",
+ backgroundColor: "#7444C0",
padding: 20,
marginVertical: 8,
marginHorizontal: 16,
diff --git a/colors.js b/colors.js
index 6071af473c672171f14e9f91a49138fb503b1440..385777d081bc12b6a61957ed916cd07f69f050da 100644
--- a/colors.js
+++ b/colors.js
@@ -1,5 +1,5 @@
export default {
- primary: "#f57c00",
+ primary: "#7444C0",
gray: "#C5C5C7",
mediumGray: "#F6F7FB",
lightGray: "#FAFAFA"
diff --git a/screens/ScreenNavigator.js b/screens/ScreenNavigator.js
index 0d74a81ec37a1fc50319721304059807ce7d4467..1f0e037c5bee7e309e22d000c75f08ed608852dc 100644
--- a/screens/ScreenNavigator.js
+++ b/screens/ScreenNavigator.js
@@ -10,10 +10,13 @@ import Catsitter from "./tabs/Catsitter";
import CatsitterHome from "./cat-sitter/CatsitterHome";
import CatsitterSetting from "./cat-sitter/CatsitterSetting";
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
-import { View, Text } from "react-native";
+import { View, Text, Image, ImageBackground, Icon } from "react-native";
+import { Ionicons } from '@expo/vector-icons';
const Stack = createStackNavigator();
const Tab = createBottomTabNavigator();
+const loadingImage =
+ "https://technometrics.net/wp-content/uploads/2020/11/loading-icon-animated-gif-19-1.gif";
const ScreenNavigator = () => {
//Get current profile
@@ -55,16 +58,28 @@ const ScreenNavigator = () => {
if (userProfile.role == "cat-sitter") return (<Tab.Navigator>
{/* Cat sitter stack */}
<Tab.Screen name="CatsitterHome" component={CatsitterHome} options={{
- tabBarLabel: "Home",
+ tabBarLabel: "Home", tabBarIcon: ({ color, size }) => (
+ <Ionicons name="home-outline" color={color} size={size} />
+ ),
}} />
<Tab.Screen name="CatsitterSetting" component={CatsitterSetting} options={{
- tabBarLabel: "Setting",
+ tabBarLabel: "Setting", tabBarIcon: ({ color, size }) => (
+ <Ionicons name="options-outline" color={color} size={size} />
+ ),
}} />
</Tab.Navigator>
)
return (
<View>
- <Text>Loading screen</Text>
+ <ImageBackground
+ source={{ uri: loadingImage }}
+ style={{
+ justifyContent: 'center',
+ alignItems: 'center',
+ width: 300,
+ height: 400,
+ }}
+ />
</View>
)
diff --git a/screens/auth/Login.js b/screens/auth/Login.js
index 8663cd31de3c6daa0a4cfa83d37b599938345261..95081a6d1267aaa6e4801530d2b4fd0b195468c5 100644
--- a/screens/auth/Login.js
+++ b/screens/auth/Login.js
@@ -3,6 +3,7 @@ import { StyleSheet, Text, View, Button, TextInput, Image, SafeAreaView, Touchab
import { signInWithEmailAndPassword } from "firebase/auth";
import { auth } from "../../config/firebase";
+
const backImage = require("../../assets/backImage.png");
export default function Login({ navigation }) {
@@ -49,7 +50,7 @@ export default function Login({ navigation }) {
<View style={{ marginTop: 20, flexDirection: "row", alignItems: "center", alignSelf: "center" }}>
<Text style={{ color: "gray", fontWeight: "600", fontSize: 14 }}>Don't have an account? </Text>
<TouchableOpacity onPress={() => navigation.navigate("Signup")}>
- <Text style={{ color: "#f57c00", fontWeight: "600", fontSize: 14 }}> Sign Up</Text>
+ <Text style={{ color: "#7444C0", fontWeight: "600", fontSize: 14 }}> Sign Up</Text>
</TouchableOpacity>
</View>
</SafeAreaView>
@@ -65,7 +66,7 @@ const styles = StyleSheet.create({
title: {
fontSize: 36,
fontWeight: "bold",
- color: "orange",
+ color: "#7444C0",
alignSelf: "center",
paddingBottom: 24
},
@@ -98,7 +99,7 @@ const styles = StyleSheet.create({
marginHorizontal: 30
},
button: {
- backgroundColor: "#f57c00",
+ backgroundColor: "#7444C0",
height: 58,
borderRadius: 10,
justifyContent: "center",
diff --git a/screens/auth/Signup.js b/screens/auth/Signup.js
index a5c71c2f43454a5cfdbcde88001211e64f2d5c3d..009bc23f62654829069a29e9a4f2039272b4eed7 100644
--- a/screens/auth/Signup.js
+++ b/screens/auth/Signup.js
@@ -100,7 +100,7 @@ export default function Signup({ navigation }) {
<View style={{ marginTop: 20, flexDirection: "row", alignItems: "center", alignSelf: "center" }}>
<Text style={{ color: "gray", fontWeight: "600", fontSize: 14 }}>Don't have an account? </Text>
<TouchableOpacity onPress={() => navigation.navigate("Login")}>
- <Text style={{ color: "#f57c00", fontWeight: "600", fontSize: 14 }}> Log In</Text>
+ <Text style={{ color: "#7444C0", fontWeight: "600", fontSize: 14 }}> Log In</Text>
</TouchableOpacity>
</View>
</SafeAreaView>
@@ -116,7 +116,7 @@ const styles = StyleSheet.create({
title: {
fontSize: 36,
fontWeight: "bold",
- color: "orange",
+ color: "#7444C0",
alignSelf: "center",
paddingBottom: 24
},
@@ -149,7 +149,7 @@ const styles = StyleSheet.create({
marginHorizontal: 30
},
button: {
- backgroundColor: "#f57c00",
+ backgroundColor: "#7444C0",
height: 58,
borderRadius: 10,
justifyContent: "center",
diff --git a/screens/cat-sitter/CatsitterHome.js b/screens/cat-sitter/CatsitterHome.js
index c98617fa01cdcf5ea2bf48e86b7dea99b97c3135..68a141b52dad2d126e06e098c4107764c16bbe39 100644
--- a/screens/cat-sitter/CatsitterHome.js
+++ b/screens/cat-sitter/CatsitterHome.js
@@ -81,7 +81,7 @@ const CatsitterHome = () => {
)}
/>
) : (<View>
- <Text style={{ textAlign: "right" }}>Currently no chat available. Configure your profile to gain more attention</Text>
+ <Text style={styles.heading1}>Currently no chat available. Configure your profile to gain more attention</Text>
</View>)}
</View>
</View>