Merge pull request #20 from Clean-Software/develop

Merge develop into EventPage

App.tsx

@@ -2,6 +2,7 @@ import { useState } from "react";
 import Routes from "./navigation";
 import { LoadingPage } from "./views";
 import { useEffect } from "react";
+import { StatusBar } from "expo-status-bar";
 
 const fetchLoading = async  () => {
   await new Promise((resolve) => setTimeout(resolve, 3000));
@@ -22,10 +23,13 @@ export default function App() {
   }, []);
 
   if (!appLoaded) {
-    return (
-      <LoadingPage />
-    );
+    return <LoadingPage />;
   }
 
-  return <Routes />;
+  return (
+    <>
+      <StatusBar style="light" />
+      <Routes />
+    </>
+  );
 }

components/button/index.tsx

@@ -1,18 +1,25 @@
-import { TouchableOpacity } from "react-native";
+import { StyleProp, TouchableOpacity, ViewStyle } from "react-native";
 import { SvgUri } from "react-native-svg";
 import styles from "./styles";
 
-interface ButtonProps { 
-    image: string;
-    onPress?: () => void;
-    backgroundColor?: string;
-    size?: number;
+interface ButtonProps {
+  image: string;
+  onPress?: () => void;
+  backgroundColor?: string;
+  size?: number;
+  style?: StyleProp<ViewStyle>;
 }
 
-const Button = ({ onPress, image, backgroundColor, size = 40 }: ButtonProps) => {
+const Button = ({
+  onPress,
+  image,
+  backgroundColor,
+  size = 40,
+  style,
+}: ButtonProps) => {
   return (
     <TouchableOpacity
-      style={styles(size, backgroundColor).button}
+      style={[styles(size, backgroundColor).button, style]}
       onPress={onPress}
     >
       <SvgUri width={size} height={size} uri={image} />

components/button/styles.ts

@@ -5,8 +5,7 @@ const styles = (size: number, backgroundColor?: string) =>
     button: {
       backgroundColor,
       borderRadius: 16,
-      padding: 6,
-      marginTop: 40,
+      padding: 6
     }
   });
 

views/home/index.tsx

@@ -20,7 +20,7 @@ export default function Home() {
         <SvgUri style={styles.person} uri={personSvg} />
       </View>
       <Navbar />
-      <Button image={arrowWhiteSvg} backgroundColor="#FF5100" />
+      <Button image={arrowWhiteSvg} backgroundColor="#FF5100" style={{ marginTop: 40 }} />
     </SafeAreaView>
   );
 }