Skip to content

Commit

Permalink
Styles fix (#59)
Browse files Browse the repository at this point in the history
* removed second table from summary page

* test commit

* testing spacing in summary page

* fixed blue color

---------

Co-authored-by: James4356 <jameswatsonbrown@icloud.com>
  • Loading branch information
PramitaUp and James4356 authored Feb 22, 2025
1 parent 09e3858 commit dfe6aea
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
3 changes: 2 additions & 1 deletion app/auto.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export default function App() {
<View style={styles.container}>

<PageHeader title='Auto' pageNumber='2/4' previous='' />

<ScrollView>

<AutoStartPositionView/>

<ReefAlgaeView phase="autonomous" />
Expand All @@ -35,4 +35,5 @@ const styles = StyleSheet.create({
// alignItems: 'center',
// justifyContent: 'center',
},

});
2 changes: 1 addition & 1 deletion app/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function PageHeader({ title, pageNumber, previous, showTeam }: PageHeaderProps)
if (data["driverStation"].includes("Red")) {
setChipColor("#f54242");
} else {
setChipColor("#5252aa");
setChipColor("#2149a6");
}
});
}, []);
Expand Down
5 changes: 2 additions & 3 deletions app/summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ export default function App() {
return (
<View style={styles.container} onTouchStart={Keyboard.dismiss}>
<PageHeader title="Summary" pageNumber="4/4" previous='teleop' />

<ScrollView>
<SummaryTableView />
<ScrollView style={{flex: 1}}>

<LabeledTextInput label="Notes" editable={true} multiline={true}
submit={(e) => {
Expand All @@ -39,6 +37,7 @@ const styles = StyleSheet.create({
flex: 1,
backgroundColor: '#fff',
rowGap: 15

// alignItems: 'center',
// justifyContent: 'center',
},
Expand Down
9 changes: 7 additions & 2 deletions app/views/ReefAlgaeView.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { getMatchData, updateReefScores } from '../api/data';
import MathBlock from '../components/MathBlock';
import { View } from 'react-native';
import { View, StyleSheet } from 'react-native';
import SectionTitle from '../components/SectionTitle';
import { GamePhase, ReefLevel } from '../api/data_types';
import React from 'react';
import AlgaeView from './AlgaeView';

interface ReefAlgaeViewProps {
phase: GamePhase;
Expand All @@ -16,6 +18,7 @@ function ReefAlgaeView({ phase }: ReefAlgaeViewProps) {

return (
<View>

<SectionTitle>Reef</SectionTitle>
<MathBlock label="L4" min={0} max={10} onPress={(count: number) => {
updateReefScores(phase, "L4", count);
Expand All @@ -32,10 +35,12 @@ function ReefAlgaeView({ phase }: ReefAlgaeViewProps) {
<MathBlock label="L1" min={0} max={10} onPress={(count: number) => {
updateReefScores(phase, "L1", count);
}} oldCount={getLevelData("L1")} />

</View>

)

}
}


export default ReefAlgaeView;
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dfe6aea

Please sign in to comment.