Merge branch 'develop'

App.js

@@ -1,33 +1,80 @@
-import { StatusBar } from "expo-status-bar";
-import React from "react";
+import React, { useState, useEffect } from "react";
 import {
   NavigationContainer,
   DarkTheme,
   DefaultTheme,
 } from "@react-navigation/native";
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
-import Home from "./screens/home";
-import Login from "./screens/login";
+import AsyncStorage from "@react-native-async-storage/async-storage";
 import { AppearanceProvider } from "react-native-appearance";
-import { ThemeProvider, useTheme } from "./globals/theme";
+import { ThemeProvider } from "./globals/theme";
 import { useColorScheme } from "react-native";
+import {
+  useFonts,
+  Poppins_400Regular,
+  Poppins_500Medium,
+  Poppins_500Medium_Italic,
+  Poppins_600SemiBold,
+  Poppins_700Bold,
+} from "@expo-google-fonts/poppins";
+
+import Home from "./screens/home";
+import Login from "./screens/login";
 
 export default function App() {
+  const [loggedIn, setLoggedIn] = useState(null);
   const Stack = createNativeStackNavigator();
   const scheme = useColorScheme();
-  return (
-    <AppearanceProvider>
-      <ThemeProvider>
-        <NavigationContainer
-          theme={scheme === "dark" ? DarkTheme : DefaultTheme}
-        >
-          <Stack.Navigator screenOptions={{ headerShown: false }}>
-            <Stack.Screen name="Login" component={Login} />
-            <Stack.Screen name="Home" component={Home} />
-          </Stack.Navigator>
-          <StatusBar style="auto" />
-        </NavigationContainer>
-      </ThemeProvider>
-    </AppearanceProvider>
-  );
+
+  let [fontsLoaded] = useFonts({
+    Poppins_400Regular,
+    Poppins_500Medium,
+    Poppins_500Medium_Italic,
+    Poppins_600SemiBold,
+    Poppins_700Bold,
+  });
+
+  const isLoggedIn = async () => {
+    try {
+      const number = await AsyncStorage.getItem("number");
+      const pass = await AsyncStorage.getItem("password");
+      if (number !== null && pass !== null) {
+        setLoggedIn(true);
+      } else {
+        setLoggedIn(false);
+      }
+    } catch {}
+  };
+
+  useEffect(() => {
+    isLoggedIn();
+  }, []);
+
+  if (!fontsLoaded || loggedIn === null) {
+    return null;
+  } else {
+    return (
+      <AppearanceProvider>
+        <ThemeProvider>
+          <NavigationContainer
+            theme={scheme === "dark" ? DarkTheme : DefaultTheme}
+          >
+            <Stack.Navigator screenOptions={{ headerShown: false }}>
+              {loggedIn ? (
+                <>
+                  <Stack.Screen name="Home" component={Home} />
+                  <Stack.Screen name="Login" component={Login} />
+                </>
+              ) : (
+                <>
+                  <Stack.Screen name="Login" component={Login} />
+                  <Stack.Screen name="Home" component={Home} />
+                </>
+              )}
+            </Stack.Navigator>
+          </NavigationContainer>
+        </ThemeProvider>
+      </AppearanceProvider>
+    );
+  }
 }

app.json

@@ -27,7 +27,7 @@
       },
       "package": "io.github.teachassistapp",
       "permissions": [],
-      "versionCode": 5
+      "versionCode": 7
     },
     "web": {
       "favicon": "./assets/favicon.png"