Merge pull request #11 from rekon-team/Teammates

Unfinished code, but Teammates and Assign Teammates added
rekon-team · Jan 6, 2025 · 64a05a6 · 64a05a6
2 parents 59c2d7f + bf4cb21
commit 64a05a6
Show file tree

Hide file tree

Showing 11 changed files with 2,789 additions and 5,230 deletions.
diff --git a/App.js b/App.js
@@ -22,10 +22,13 @@ import QRScan from './pages/QRScan';
 import AdminHomeMatch from './pages/AdminHomeMatch';
 import AdminHomePit from './pages/AdminHomePit';
 import AllMatchAssignments from './pages/AllMatchAssignments';
+import Teammates from './pages/Teammates';
+import AssignTeammates from './pages/AssignTeammates';
 
 import StyledDrawer from './components/Drawer';
 import { MaterialIcons } from '@expo/vector-icons';
 
+
 // Prevent the splash screen from auto-hiding, so we can hide it ourselves
 // when all the fonts and assets are loaded.
 SplashScreen.preventAutoHideAsync();
@@ -40,8 +43,10 @@ function AdminDrawers() {
   //Yippee!!
   return (
     <Drawer.Navigator drawerContent={(props) => <StyledDrawer {...props} />}>
-      <Drawer.Screen name="Overview" component={AdminHomeMatch} options={{ headerShown: false, drawerIcon: () => (<MaterialIcons name="pie-chart" size={22} color={Colors.text} />) }} />
+      <Drawer.Screen name="Overview" component={AdminHomeMatch} options={{ headerShown: false }} />
       <Drawer.Screen name="AdminHomePit" component={AdminHomePit} options={{ headerShown: false, drawerItemStyle: { display: 'none' } }} />
+      <Drawer.Screen name="Teammates" component={Teammates} options={{ headerShown: false }} />
+      <Drawer.Screen name="AssignTeammates" component={AssignTeammates} options={{ headerShown: false, drawerItemStyle: { display: 'none' } }} />
     </Drawer.Navigator>
   )
 }

diff --git a/app.json b/app.json
@@ -28,7 +28,15 @@
       "favicon": "./assets/favicon.png"
     },
     "plugins": [
-      "expo-font"
+      "expo-font",
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "newArchEnabled": true
+          }
+        }
+      ]
     ]
   }
 }
diff --git a/components/BackgroundGradient.js b/components/BackgroundGradient.js
@@ -12,7 +12,7 @@ export default function BackgroundGradient(props) {
             height: '100%',
             left: 0,
             top: 0,
-            zIndex: -5,
+            zIndex: 0,
             opacity: 0.4
         },
     });   

diff --git a/components/Drawer.js b/components/Drawer.js
@@ -58,7 +58,7 @@ export default function StyledDrawer(props) {
 
                 <DrawerItem {...props} label={Lang.hamburger_menu.overview} focused={props.state.index == props.state.routes.findIndex(i => i.name == "Overview")} labelStyle={styles.drawerItemText} style={styles.drawerItem} activeBackgroundColor={Colors.divider} inactiveBackgroundColor={Colors.tabSelected} onPress={() => props.navigation.navigate('Overview')} icon={() => (<MaterialIcons name="pie-chart" size={Dimensions.get('window').height * 0.03} color={Colors.text} />)} />
                 <DrawerItem {...props} label={Lang.hamburger_menu.team_profile} focused={props.state.index == props.state.routes.findIndex(i => i.name == "TeamProfile")} labelStyle={styles.drawerItemText} style={styles.drawerItem} activeBackgroundColor={Colors.divider} inactiveBackgroundColor={Colors.tabSelected} /* PLACEHOLDER onPress={() => props.navigation.navigate('TeamProfile')} */ icon={() => (<MaterialIcons name="person" size={Dimensions.get('window').height * 0.03} color={Colors.text} />)} />
-                <DrawerItem {...props} label={Lang.hamburger_menu.teammates} focused={props.state.index == props.state.routes.findIndex(i => i.name == "Teammates")} labelStyle={styles.drawerItemText} style={styles.drawerItem} activeBackgroundColor={Colors.divider} inactiveBackgroundColor={Colors.tabSelected} /* PLACEHOLDER onPress={() => props.navigation.navigate('Teammates')} */ icon={() => (<MaterialIcons name="group" size={Dimensions.get('window').height * 0.03} color={Colors.text} />)} />
+                <DrawerItem {...props} label={Lang.hamburger_menu.teammates} focused={props.state.index == props.state.routes.findIndex(i => i.name == "Teammates")} labelStyle={styles.drawerItemText} style={styles.drawerItem} activeBackgroundColor={Colors.divider} inactiveBackgroundColor={Colors.tabSelected} onPress={() => props.navigation.navigate('Teammates')} icon={() => (<MaterialIcons name="group" size={Dimensions.get('window').height * 0.03} color={Colors.text} />)} />
                 <DrawerItem {...props} label={Lang.hamburger_menu.forms} focused={props.state.index == props.state.routes.findIndex(i => i.name == "Forms")} labelStyle={styles.drawerItemText} style={styles.drawerItem} activeBackgroundColor={Colors.divider} inactiveBackgroundColor={Colors.tabSelected} /* PLACEHOLDER onPress={() => props.navigation.navigate('Forms')} */ icon={() => (<MaterialIcons name="add-circle" size={Dimensions.get('window').height * 0.03} color={Colors.text} />)} />
 
                 <View style={styles.divider} />

diff --git a/components/Header.js b/components/Header.js
@@ -25,7 +25,7 @@ export default function Header(props) {
     const styles = StyleSheet.create({
         header: {
             position: 'absolute',
-            top: getStatusBarHeight(),
+            top: getStatusBarHeight() + fontSize / 2,
             width: '100%',
             height: '15%',
             alignItems: 'center',

diff --git a/lang/en_us.json b/lang/en_us.json
@@ -82,5 +82,21 @@
         "events": "Events",
         "sync_data": "Sync Data",
         "settings": "Settings"
+    },
+    "teammates": {
+        "title": "Teammates",
+        "scouts": "Scouts",
+        "admins": "Admins"
+    },
+    "assign_teammates": {
+        "title": "Assign",
+        "form_uploads": "Form Uploads",
+        "settings": "Settings",
+        "subjective_scouts": "Subjective Scouts:",
+        "manual_assign": "Manual Assign",
+        "equally_distribute": "Equally Distribute",
+        "match": "Match",
+        "pit": "Pit",
+        "subjective": "Subjective"
     }
 }