Merge branch 'master' into defense-timer

app/api/data.ts

@@ -1,4 +1,4 @@
-import { AlgaeLevel, CLIMB_TYPE, DRIVER_STATION, GamePhase, MatchData, ReefLevel, START_POSITION } from "./data_types";
+import { AlgaeLevel, CLIMB_TYPE, DRIVER_STATION, GamePhase, MatchData, ReefLevel, START_POSITION, Tag } from "./data_types";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 
 export function getMatchData(): Promise<MatchData> {
@@ -99,4 +99,19 @@ export function updateNotes(notes: string): Promise<void> {
         data["notes"] = notes;
         return data;
     });
+}
+
+export function updateTags(tag: Tag, removeTag?: boolean): Promise<void> {
+    return modifyMatchData((data) => {
+        const tags = new Set(data["tags"]);
+
+        if (removeTag) {
+            tags.delete(tag);
+        } else {
+            tags.add(tag);
+        }
+
+        data["tags"] = [...tags];
+        return data;
+    });
 }

app/api/data_types.ts

@@ -57,4 +57,4 @@ export class MatchData {
 export type GamePhase = "teleop" | "autonomous";
 export type Tag = "tag1" | "tag2";
 export type ReefLevel = "L4" | "L3" | "L2" | "L1";
-export type AlgaeLevel = "net" | "processor";
+export type AlgaeLevel = "net" | "processor";

app/auto.tsx

@@ -1,5 +1,5 @@
 import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, View } from 'react-native';
+import { Keyboard, ScrollView, StyleSheet, View } from 'react-native';
 import PageHeader from './components/Header';
 import NavButton from './components/NavButton';
 import ReefAlgaeView from './views/ReefAlgaeView';
@@ -13,16 +13,15 @@ export default function App() {
 
             <PageHeader title='Auto' pageNumber='2/4' previous='' />
 
-
+            <ScrollView>
             <AutoStartPositionView/>
 
             <ReefAlgaeView phase="autonomous" />
             <AlgaeView phase="autonomous" />
 
             <NavButton text="Next" pageName="teleop" />
             <StatusBar style="auto" />
-
-
+            </ScrollView>
         </View>
     );
 }

app/components/Checkbox.tsx

@@ -0,0 +1,38 @@
+import { useState, useEffect} from 'react';
+import { Checkbox as PaperCheckbox } from 'react-native-paper';
+import { View, Text } from 'react-native';
+import { BACKGROUND_COLOR } from '../consts';
+import { Tag } from '../api/data_types';
+import { getMatchData, updateTags } from '../api/data';
+
+interface CheckboxProps {
+  tag: Tag;
+}
+
+function Checkbox({ tag }: CheckboxProps) {
+  const [checked, setChecked] = useState(false);
+
+  useEffect(() => {
+    getMatchData().then((data) => {
+      setChecked(!(data["tags"].includes(tag)));
+    });
+  }, []);
+
+  return (
+    <View style={[{ flexDirection: "row", alignItems: "center" }]}>
+
+    <PaperCheckbox.Android
+      color={BACKGROUND_COLOR}
+      status={checked ? 'checked' : 'unchecked'}
+      onPress={() => {
+        setChecked(!checked);
+        updateTags(tag, !checked);
+      }}
+    />
+    <Text>{tag}</Text>
+
+    </View>
+  )
+}
+
+export default Checkbox;

app/components/NavButton.tsx

@@ -16,11 +16,7 @@ function NavButton({ text, pageName, disabled }: NavButtonProps) {
     const insets = useSafeAreaInsets();
 
     return (
-        <View style={[{
-            position: "absolute",
-            bottom: 20 + insets.bottom,
-            right: 20 + insets.right
-        }]}>
+        <View style={[{ flexDirection: 'row-reverse' }]}>
             <Link href={"/" + pageName} asChild>
                 <Button textColor={TEXT_COLOR} buttonColor={BACKGROUND_COLOR} mode="contained"
                     contentStyle={{ height: 80, width: 80 }} disabled={disabled}>{text}</Button>

app/components/RadioButton.tsx

@@ -1,4 +1,4 @@
-import { View, Text } from 'react-native'
+import { View, Text, Keyboard } from 'react-native'
 import { useEffect, useState } from 'react';
 import { RadioButton as PaperRadioButton } from 'react-native-paper';
 import { BACKGROUND_COLOR } from '../consts';
@@ -39,4 +39,4 @@ function RadioButton({ data, onSelect, oldSelected }: RadioButton) {
     );
 } 
 
-export default RadioButton;
+export default RadioButton;

app/index.tsx

@@ -1,5 +1,5 @@
 import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, View } from 'react-native';
+import { Keyboard, ScrollView, StyleSheet, View } from 'react-native';
 import NavButton from './components/NavButton';
 import PageHeader from './components/Header';
 import LabeledTextInput from './components/LabeledTextInput';
@@ -26,9 +26,10 @@ export default function App() {
     })
 
     return (
-        <View style={styles.container}>
+        <View style={styles.container} onTouchStart={Keyboard.dismiss}>
             <PageHeader title='Main' pageNumber='1/4' showTeam={false} />
-
+            <ScrollView>
+
             <LabeledTextInput label="Name" editable={true} submit={(e) => {
                 updateName(e.nativeEvent.text);
                 setNameFilled(e.nativeEvent.text !== "");
@@ -61,6 +62,7 @@ export default function App() {
                 disabled={ !(nameFilled && teamNumberFilled && matchFilled) } />
 
             <StatusBar style="auto" />
+            </ScrollView>
         </View>
     );
 }

app/summary.tsx

@@ -1,23 +1,32 @@
 import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, View } from 'react-native';
-import Dropdown from './components/Dropdown';
+import { Keyboard, ScrollView, StyleSheet, View } from 'react-native';
 import LabeledTextInput from './components/LabeledTextInput';
 import { getMatchData, updateNotes } from './api/data';
 import PageHeader from './components/Header';
 import SummaryTableView from './views/SummaryTableView';
+import Checkbox from './components/Checkbox';
 
 export default function App() {
     return (
-        <View style={styles.container}>
+        <View style={styles.container} onTouchStart={Keyboard.dismiss}>
             <PageHeader title="Summary" pageNumber="4/4" previous='teleop' />
+
+            <ScrollView> 
             <SummaryTableView />
 
             <LabeledTextInput label="Notes" editable={true} multiline={true} 
                 submit={(e) => {
                     updateNotes(e.nativeEvent.text);
-                }} oldValue={getMatchData().then((data) => data["notes"])} required />
-            <Dropdown label="Tags" items={["tag 1", "tag 2"]} placeholder="tag"></Dropdown>
+                }} oldValue={getMatchData().then((data) => data["notes"])} />
+
+            <SummaryTableView />
+            <Checkbox tag='Caught on fire'/>
+            <Checkbox tag='Stuck on gamepiece'/>
+            <Checkbox tag='Broke'/>
+            <Checkbox tag='Tipped over'/>
+            <Checkbox tag='Gamepiece stuck'/>
             <StatusBar style="auto" />
+            </ScrollView>
         </View>
     );
 }
@@ -31,4 +40,4 @@ const styles = StyleSheet.create({
             // alignItems: 'center',
             // justifyContent: 'center',
         },
-    });
+    });

app/teleop.tsx

@@ -1,5 +1,5 @@
 import { StatusBar } from 'expo-status-bar';
-import { StyleSheet, View } from 'react-native';
+import { Keyboard, ScrollView, StyleSheet, View } from 'react-native';
 import NavButton from './components/NavButton';
 import ReefAlgaeView from './views/ReefAlgaeView';
 import EndgameView from './views/EndgameView';
@@ -10,8 +10,9 @@ import { Divider } from 'react-native-paper';
 
 export default function App() {
     return (
-        <View style={styles.container}>
+        <View style={styles.container} onTouchStart={Keyboard.dismiss}>
             <PageHeader title='Teleop' pageNumber='3/4' previous="auto" />
+            <ScrollView>
 
             <Stopwatch/>
             <Divider />
@@ -22,9 +23,9 @@ export default function App() {
 
 
 
-            <NavButton pageName='summary' text='Next' />
             <StatusBar style="auto" />
-
+            <NavButton pageName='summary' text='Next' />
+            </ScrollView>
         </View>
     );
 }
@@ -38,4 +39,4 @@ const styles = StyleSheet.create({
         // alignItems: 'center',
         // justifyContent: 'center',
     },
-});
+});

app/views/SummaryTableView.tsx

@@ -10,9 +10,7 @@ function SummaryTableView() {
              <DataTable>
                 <TableHeader titles={[ "Match Summary" ]} />
                 <TableRow label="Scouter" data={ getMatchData().then((data) => data["scouterName"]) } />
-                <TableRow label="Team Number" data={getMatchData().then((data) => data["teamNumber"].toString())} />
                 <TableRow label="Match Number" data={getMatchData().then((data) => data["matchNumber"].toString())} />
-                <TableRow label="Driver Station" data={getMatchData().then((data) => data["driverStation"])} />
                 <TableRow label="Start Position" data={getMatchData().then((data) => data["autonomous"]["startPosition"])} />
                 <TableRow label="Left Start" data={getMatchData().then((data) => data["autonomous"]["leftStart"].toString())} />
                 <TableRow label="Climb Type" data={getMatchData().then((data) => data["teleop"]["climb"].toString())} />
@@ -21,4 +19,4 @@ function SummaryTableView() {
     )
 }
 
-export default SummaryTableView;
+export default SummaryTableView;

package.json

@@ -38,4 +38,4 @@
     "typescript": "^5.3.3"
   },
   "private": true
-}
+}