Merge pull request #3 from steelhawks/dev

Update Form Layout

Author: FarhanJ2

screens/Scouting/Auton.jsx

@@ -24,19 +24,18 @@ const Auton = ({backConfirm}) => {
                 />
             }
         />,
-    ];
-
-    const auton_queries = [
         <Query
-            title="Coral Intaken"
+            title="Did the robot leave?"
             item={
-                <CounterBox
-                    onChange={value =>
-                        setDict('autonCoralIntaken', value)
-                    }
+                <RadioGroup
+                    buttons={['Yes', 'No']}
+                    onChange={value => setDict('robotLeft', value)}
                 />
             }
         />,
+    ];
+
+    const auton_queries = [
         <Query
             title="Coral from Human Player"
             item={
@@ -48,7 +47,7 @@ const Auton = ({backConfirm}) => {
             }
         />,
         <Query
-            title="Coral From Ground"
+            title="Coral from Ground"
             item={
                 <CounterBox
                     onChange={value =>

screens/Scouting/Auton2.jsx

@@ -13,15 +13,7 @@ const Auton2 = ({backConfirm}) => {
     const setDict = useDictStore(state => state.setDict);
 
     const auton_queries = [
-        <Query
-            title="Did the robot leave?"
-            item={
-                <RadioGroup
-                    buttons={['Yes', 'No']}
-                    onChange={value => setDict('robotLeft', value)}
-                />
-            }
-        />,
+        
         <Query
             title="Coral Scored L4"
             item={
@@ -94,60 +86,13 @@ const Auton2 = ({backConfirm}) => {
         />,
     ];
 
-    const handleAutonIssuesQueries = (isSelected, id) => {
-        const updatedIssues = isSelected
-            ? [...dict.autonIssues, id] // add to array if selected
-            : dict.autonIssues.filter(issueId => issueId !== id); // remove from array if deselected
-
-        setDict('autonIssues', updatedIssues);
-    };
-
-    const auton_issues_queries = [
-        // NOT_MOVING, STOPPED, OUT_OF_CONTROL, Default: EMPTY
-        <Query
-            title="Not Moving"
-            item={
-                <Checkbox
-                    onPress={selected =>
-                        handleAutonIssuesQueries(selected, 'NOT_MOVING')
-                    }
-                />
-            }
-        />,
-        <Query
-            title="Stopped"
-            item={
-                <Checkbox
-                    onPress={selected =>
-                        handleAutonIssuesQueries(selected, 'STOPPED')
-                    }
-                />
-            }
-        />,
-        <Query
-            title="Out of Control"
-            item={
-                <Checkbox
-                    onPress={selected =>
-                        handleAutonIssuesQueries(selected, 'OUT_OF_CONTROL')
-                    }
-                />
-            }
-        />,
-    ];
-
     return (
         <ScrollView>
             <Section
                 title={'Auton'}
                 queries={auton_queries}
                 style={[styles.patternSectionStyle]}
             />
-            <Section
-                title={'Auton Issues'}
-                queries={auton_issues_queries}
-                style={[styles.sectionStyle]}
-            />
         </ScrollView>
     );
 };

screens/ScoutingPage.tsx

@@ -382,14 +382,15 @@ const ScoutingPage: React.FC<ScoutingPageProps> = ({
                             backgroundColor: 'black',
                         },
                     }}>
-                    <Tab.Screen name="Auton">{AutonNavigate}</Tab.Screen>
-                    <Tab.Screen name="Auton Received">{AutonNavigate2}</Tab.Screen>
-                    <Tab.Screen name="Teleop Scoring">
-                        {TeleopNavigate}
-                    </Tab.Screen>
+                    <Tab.Screen name="Auton Received">{AutonNavigate}</Tab.Screen>
+                    <Tab.Screen name="Auton Scoring">{AutonNavigate2}</Tab.Screen>
                     <Tab.Screen name="Teleop Received">
                         {TeleopReceivedNavigate}
                     </Tab.Screen>
+                    <Tab.Screen name="Teleop Scoring">
+                        {TeleopNavigate}
+                    </Tab.Screen>
+                    
                     <Tab.Screen name="Endgame">{EndgameNavigate}</Tab.Screen>
                 </Tab.Navigator>
             </View>