Merge pull request #12 from chowzzzz/aer-branch

fix errors on expo mobile
chowzzzz · Jul 12, 2021 · e444f88 · e444f88
2 parents 555b557 + a546bed
commit e444f88
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -0,0 +1 @@
+declare module 'lodash';
diff --git a/navigation/index.tsx b/navigation/index.tsx
@@ -48,15 +48,12 @@ function RootNavigator() {
 					.get()
 					.then((snapshot) => {
 						const data = snapshot.val();
-						setLoading(false);
 						setUser(data);
 					})
 					.catch((error) => {
-						setLoading(false);
 					});
-			} else {
-				setLoading(false);
-			}
+			} 
+			setLoading(false);
 		});
 	}, []);
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/screens/BabyGame.tsx b/screens/BabyGame.tsx
@@ -139,7 +139,7 @@ const styles = StyleSheet.create({
 		padding: 4,
 		borderRadius: 6,
 		textAlign: "center",
-		borderColor: "c4c3f7",
+		borderColor: "#c4c3f7",
 		borderWidth: 2,
 		height: 175,
 		width: '100%',

diff --git a/screens/FinalResult.tsx b/screens/FinalResult.tsx
@@ -119,7 +119,7 @@ const styles = StyleSheet.create({
 		padding:8,
 		borderRadius: 6,
 		textAlign: "center",
-		borderColor: "c4c3f7",
+		borderColor: "#c4c3f7",
 		borderWidth: 2,
 		height: 95,
 		width: '90%',

diff --git a/screens/TabOneScreen.tsx b/screens/TabOneScreen.tsx
@@ -13,6 +13,7 @@ import {
 } from "react-native";
 import { Card, ListItem, Button, Icon } from "react-native-elements";
 import RNPoll, { IChoice } from "react-native-poll";
+import _ from 'lodash';
 import Search from "../components/Search";
 import PersonalityModalScreen from "./PersonalityModalScreen";
 import AngelScreen from "./AngelScreen";
@@ -159,7 +160,7 @@ const Post = ({ title, imageUrl, username, caption, likes, url }) => (
 		<TouchableOpacity
 			style={{ textDecorationLine: "underline", marginVertical: 5 }}
 		>
-			{url}
+			<Text>{url}</Text>
 		</TouchableOpacity>
 	</Card>
 );
@@ -277,7 +278,6 @@ export default class TabOneScreen extends React.Component {
 						<Text
 							style={{
 								fontSize: 15,
-								fontFamily: "sans-serif",
 								marginBottom: 5
 							}}
 						>
@@ -286,7 +286,6 @@ export default class TabOneScreen extends React.Component {
 						<Text
 							style={{
 								fontSize: 25,
-								fontFamily: "sans-serif",
 								fontWeight: "bold"
 							}}
 						>

diff --git a/screens/TabThreeScreen.tsx b/screens/TabThreeScreen.tsx
@@ -168,7 +168,9 @@ const styles = StyleSheet.create({
 		width: "85%",
 		justifyContent: "center",
 		alignItems: "center",
-		border: "solid lightgrey 0.5px",
+		borderColor: "lightgrey",
+		borderStyle: "solid",
+		borderWidth: 1,
 		backgroundColor: "#FFF",
 		marginVertical: 10,
 		shadowColor: "#6c69eb",