merged and fixed responsive set size change

Author: Flipfloppm

app/(tabs)/settings.tsx

@@ -14,7 +14,7 @@ import {
 
 type SettingsProps = {
   numCards: number;
-  setNumCards: Dispatch<SetStateAction<number>>;
+  setNumCards: (num: number) => void;
   soundEnabled: boolean;
   setSoundEnabled: Dispatch<SetStateAction<boolean>>;
 };

app/spondee.tsx

@@ -50,16 +50,19 @@ export default function TestScreen() {
   /**
    * Randomizes cards shown, updates state, and returns that list (not limited by set size)
    */
-  function randomizeSelectedCards() {
-    const initialSelectedCards = shuffleArray(SpondeeCards).slice(0, numCards);
+  function randomizeSelectedCards(numberOfCards: number) {
+    numberOfCards = numberOfCards ? numberOfCards : 4;
+    const initialSelectedCards = shuffleArray(SpondeeCards).slice(
+      0,
+      numberOfCards
+    );
     setSelectedCards(initialSelectedCards);
     return initialSelectedCards;
   }
 
   // Initialize selected cards and first correct card
   useEffect(() => {
-    console.log("should only be called once");
-    const initialSelectedCards = randomizeSelectedCards();
+    const initialSelectedCards = randomizeSelectedCards(numCards);
 
     const initialCorrectCard =
       initialSelectedCards[Math.floor(Math.random() * numCards)].word;
@@ -101,7 +104,7 @@ export default function TestScreen() {
 
   useEffect(() => {
     console.log("hello i'm in heree");
-    const list = randomizeSelectedCards();
+    const list = randomizeSelectedCards(numCards);
     generateNewCard(list);
   }, [numCards]);
 
@@ -115,7 +118,7 @@ export default function TestScreen() {
           // Callback when rain finishes
           console.log("Rain completed");
           // Generate new list
-          let list = randomizeSelectedCards();
+          let list = randomizeSelectedCards(numCards);
           generateNewCard(list);
           setRainTrigger(false);
         }}

components/authentication/authScreen.tsx

@@ -7,7 +7,7 @@ import {
   TextInput,
   View,
 } from "react-native";
-import { supabase } from "../../lib/supabase";
+import { supabase } from "@/lib/supabase";
 import { THIText } from "../THIText";
 
 export default function AuthScreen() {
@@ -18,6 +18,11 @@ export default function AuthScreen() {
   const [isLoggedIn, setIsLoggedIn] = React.useState(false);
   const [isSigningUp, setIsSigningUp] = React.useState(false);
 
+  const validateEmail = (email: string): boolean => {
+    const emailRegex = /^[a-zA-Z0-9._%+-]+@texashearing\.org$/;
+    return emailRegex.test(email);
+  };
+
   const handleLoginPress = async () => {
     if (!email || !password) {
       Alert.alert(
@@ -27,6 +32,11 @@ export default function AuthScreen() {
       return;
     }
 
+    if (!validateEmail(email)) {
+      Alert.alert("Invalid email", "Please use an email ending in '@texashearing.org' to log in.")
+      return;
+    }
+
     const { data, error } = await supabase.auth.signInWithPassword({
       email: email,
       password: password,
@@ -49,6 +59,11 @@ export default function AuthScreen() {
       return;
     }
 
+    if (!validateEmail(email)) {
+      Alert.alert("Invalid email", "Please use an email ending in '@texashearing.org' to log in.")
+      return;
+    }
+
     const { data, error } = await supabase.auth.signUp({
       email: email,
       password: password,

components/spondee/SessionControls.tsx

@@ -1,7 +1,7 @@
 import Settings from "@/app/(tabs)/settings";
 import { Trial } from "@/app/spondee";
 import { router } from "expo-router";
-import { Dispatch, SetStateAction, useState } from "react";
+import { useState } from "react";
 import { StyleSheet, TouchableOpacity, View } from "react-native";
 import { THIText } from "../THIText";
 
@@ -10,7 +10,7 @@ type SessionControlProps = {
   numCorrect: number;
   attempts: Trial[];
   numCards: number;
-  setNumCards: Dispatch<SetStateAction<number>>;
+  setNumCards: (num: number) => void;
 };
 
 export interface SessionData {

package.json

@@ -32,11 +32,11 @@
     "expo-web-browser": "~14.0.2",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-native": "0.76.6",
+    "react-native": "0.76.7",
     "react-native-emoji-rain": "^0.0.1",
     "react-native-gesture-handler": "~2.20.2",
     "react-native-progress": "^5.0.1",
-    "react-native-reanimated": "^3.16.1",
+    "react-native-reanimated": "3.16.1",
     "react-native-safe-area-context": "4.12.0",
     "react-native-screens": "~4.4.0",
     "react-native-url-polyfill": "^2.0.0",

tsconfig.json

@@ -4,15 +4,9 @@
     "jsx": "react-jsx",
     "strict": true,
     "paths": {
-      "@/*": [
-        "./*"
-      ]
-    }
+      "@/*": ["./*"]
+    },
+    "allowImportingTsExtensions": true
   },
-  "include": [
-    "**/*.ts",
-    "**/*.tsx",
-    ".expo/types/**/*.ts",
-    "expo-env.d.ts"
-  ]
+  "include": ["**/*.ts", "**/*.tsx", ".expo/types/**/*.ts", "expo-env.d.ts"]
 }