polished and finalised onboarding flow

app/(tabs)/_layout.tsx

@@ -1,3 +1,4 @@
+import { getSetupStatus } from "@/lib/setupStatus";
 import { supabase } from "@/lib/supabase";
 import { Session } from "@supabase/supabase-js";
 import * as Notifications from 'expo-notifications';
@@ -32,6 +33,8 @@ function UseNotificationObserver() {
 export default function TabLayout() {
   const [session, SetSession] = useState<Session | null>(null)
   const [loading, SetLoading] = useState(true);
+  const [setupChecked, setSetupChecked] = useState(false);
+  const [needsSetup, setNeedsSetup] = useState(false);
 
     UseNotificationObserver();
 
@@ -51,7 +54,29 @@ export default function TabLayout() {
     return () => sub.subscription.unsubscribe();
   }, []);
 
-  if (loading) {
+  useEffect(() => {
+    const checkSetupStatus = async () => {
+      if (!session?.user.id) {
+        setNeedsSetup(false);
+        setSetupChecked(true);
+        return;
+      }
+
+      try {
+        const setupStatus = await getSetupStatus(session.user.id);
+        setNeedsSetup(!setupStatus.isSetupComplete);
+      } catch {
+        setNeedsSetup(true);
+      } finally {
+        setSetupChecked(true);
+      }
+    };
+
+    setSetupChecked(false);
+    void checkSetupStatus();
+  }, [session?.user.id]);
+
+  if (loading || !setupChecked) {
     return null;
   }
 
@@ -59,6 +84,10 @@ export default function TabLayout() {
     return <Redirect href="/login" />;
   }
 
+  if (needsSetup) {
+    return <Redirect href="/setup" />;
+  }
+
   return (
     <Tabs
     screenOptions={{
@@ -68,4 +97,4 @@ export default function TabLayout() {
       <Tabs.Screen name="subjects" options={{title: "Subjects"}} />
     </Tabs>
   );
-}
+}

app/(tabs)/index.tsx

@@ -7,11 +7,12 @@ import { formatDate, formatDateTime } from '@/lib/date';
 import { RegisterForLocalNotificationsAsync } from '@/lib/notifications';
 import { CheckAssignmentCompletion } from '@/lib/progress';
 import { DEFAULT_FOCUS_DURATION_MINUTES } from '@/lib/sessionDefaults';
+import { getSetupStatus } from '@/lib/setupStatus';
 import { finalizeStoredSession } from '@/lib/sessionLifecycle';
 import { supabase } from "@/lib/supabase";
 import MaterialIcons from '@expo/vector-icons/MaterialIcons';
 import { Session } from '@supabase/supabase-js';
-import { router, Stack, useFocusEffect } from "expo-router";
+import { Redirect, router, Stack, useFocusEffect } from "expo-router";
 import { useCallback, useEffect, useState } from 'react';
 import {
   Alert,
@@ -164,6 +165,7 @@ export default function HomeScreen() {
   const [isFlowInfoVisible, setIsFlowInfoVisible] = useState(false);
   const [completingTaskId, setCompletingTaskId] = useState<string | null>(null);
   const [subjectCount, setSubjectCount] = useState(0);
+  const [needsSetup, setNeedsSetup] = useState<boolean | null>(null);
 
   const loadActiveSprint = useCallback(async () => {
     const storedSprint = await GetActiveSession();
@@ -479,6 +481,25 @@ export default function HomeScreen() {
     }
   }, [session]);
 
+  useEffect(() => {
+    const loadSetupGate = async () => {
+      if (!session?.user.id) {
+        setNeedsSetup(false);
+        return;
+      }
+
+      try {
+        const setupStatus = await getSetupStatus(session.user.id);
+        setNeedsSetup(!setupStatus.isSetupComplete);
+      } catch {
+        setNeedsSetup(true);
+      }
+    };
+
+    setNeedsSetup(null);
+    void loadSetupGate();
+  }, [session?.user.id]);
+
   useFocusEffect(
     useCallback(() => {
       void loadActiveSprint();
@@ -611,6 +632,14 @@ export default function HomeScreen() {
     );
   }, []);
 
+  if (session && needsSetup === null) {
+    return null;
+  }
+
+  if (needsSetup) {
+    return <Redirect href="/setup" />;
+  }
+
   return (
     <View className="flex-1 bg-app-bg">
       <Stack.Screen

app/(tabs)/subjects.tsx

@@ -1,9 +1,10 @@
 import { SUBJECT_COLORS } from '@/lib/subjectColors';
+import { getSetupStatus } from '@/lib/setupStatus';
 import { supabase } from '@/lib/supabase';
 import { Subject } from '@/lib/types';
 import MaterialIcons from '@expo/vector-icons/MaterialIcons';
 import { Session } from '@supabase/supabase-js';
-import { router, Stack, useFocusEffect } from 'expo-router';
+import { Redirect, router, Stack, useFocusEffect } from 'expo-router';
 import { useCallback, useEffect, useState } from 'react';
 import { Alert, Modal, Pressable, ScrollView, Text, View } from 'react-native';
 
@@ -36,6 +37,7 @@ export default function Subjects() {
   const [subjects, SetSubjects] = useState<Subject[]>([]);
   const [session, SetSession] = useState<Session | null>(null);
   const [isFlowInfoVisible, setIsFlowInfoVisible] = useState(false);
+  const [needsSetup, setNeedsSetup] = useState<boolean | null>(null);
 
   useEffect(() => {
     supabase.auth.getSession().then(({ data }) => {
@@ -51,6 +53,25 @@ export default function Subjects() {
     return () => sub.subscription.unsubscribe();
   }, []);
 
+  useEffect(() => {
+    const loadSetupGate = async () => {
+      if (!session?.user.id) {
+        setNeedsSetup(false);
+        return;
+      }
+
+      try {
+        const setupStatus = await getSetupStatus(session.user.id);
+        setNeedsSetup(!setupStatus.isSetupComplete);
+      } catch {
+        setNeedsSetup(true);
+      }
+    };
+
+    setNeedsSetup(null);
+    void loadSetupGate();
+  }, [session?.user.id]);
+
   const GetSubjects = useCallback(async () => {
     if (!session?.user.id) return;
 
@@ -76,6 +97,14 @@ export default function Subjects() {
     }, [GetSubjects, session])
   );
 
+  if (session && needsSetup === null) {
+    return null;
+  }
+
+  if (needsSetup) {
+    return <Redirect href="/setup" />;
+  }
+
   return (
     <View className="flex-1 bg-app-bg">
       <Stack.Screen