From 8ad6189dfcbdd775550fee3beb74a0ce7da3632f Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Sun, 30 Oct 2022 15:42:43 +1300
Subject: [PATCH] Fix colors on header bar for light theme

---
 DrawerHeader.tsx |  8 +++++++-
 DrawerMenu.tsx   |  8 +++++++-
 StackHeader.tsx  |  9 ++++++++-
 deploy.sh        | 13 ++++++++-----
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/DrawerHeader.tsx b/DrawerHeader.tsx
index d7f6351..c9eea2f 100644
--- a/DrawerHeader.tsx
+++ b/DrawerHeader.tsx
@@ -3,13 +3,19 @@ import {useNavigation} from '@react-navigation/native';
 import {Appbar, IconButton} from 'react-native-paper';
 import {DrawerParamList} from './drawer-param-list';
 import DrawerMenu from './DrawerMenu';
+import useDark from './use-dark';
 
 export default function DrawerHeader({name}: {name: keyof DrawerParamList}) {
   const navigation = useNavigation<DrawerNavigationProp<DrawerParamList>>();
+  const dark = useDark();
 
   return (
     <Appbar.Header>
-      <IconButton icon="menu" onPress={navigation.openDrawer} />
+      <IconButton
+        color={dark ? 'white' : 'white'}
+        icon="menu"
+        onPress={navigation.openDrawer}
+      />
       <Appbar.Content title={name} />
       <DrawerMenu name={name} />
     </Appbar.Header>
diff --git a/DrawerMenu.tsx b/DrawerMenu.tsx
index d615de5..b73da37 100644
--- a/DrawerMenu.tsx
+++ b/DrawerMenu.tsx
@@ -10,6 +10,7 @@ import {Plan} from './plan';
 import {addPlans, deletePlans, getAllPlans} from './plan.service';
 import Set from './set';
 import {addSets, deleteSets, getAllSets} from './set.service';
+import useDark from './use-dark';
 import {write} from './write';
 
 const setFields =
@@ -21,6 +22,7 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
   const [showRemove, setShowRemove] = useState(false);
   const {toast} = useSnackbar();
   const {reset} = useNavigation<NavigationProp<DrawerParamList>>();
+  const dark = useDark();
 
   const exportSets = useCallback(async () => {
     const sets = await getAllSets();
@@ -135,7 +137,11 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
         visible={showMenu}
         onDismiss={() => setShowMenu(false)}
         anchor={
-          <IconButton onPress={() => setShowMenu(true)} icon="more-vert" />
+          <IconButton
+            color={dark ? 'white' : 'white'}
+            onPress={() => setShowMenu(true)}
+            icon="more-vert"
+          />
         }>
         <Menu.Item icon="arrow-downward" onPress={download} title="Download" />
         <Menu.Item icon="arrow-upward" onPress={upload} title="Upload" />
diff --git a/StackHeader.tsx b/StackHeader.tsx
index b02ad6f..581a682 100644
--- a/StackHeader.tsx
+++ b/StackHeader.tsx
@@ -3,15 +3,22 @@ import Share from 'react-native-share';
 import {FileSystem} from 'react-native-file-access';
 import {Appbar, IconButton} from 'react-native-paper';
 import {captureScreen} from 'react-native-view-shot';
+import useDark from './use-dark';
 
 export default function StackHeader({title}: {title: string}) {
   const navigation = useNavigation();
+  const dark = useDark();
 
   return (
     <Appbar.Header>
-      <IconButton icon="arrow-back" onPress={navigation.goBack} />
+      <IconButton
+        color={dark ? 'white' : 'white'}
+        icon="arrow-back"
+        onPress={navigation.goBack}
+      />
       <Appbar.Content title={title} />
       <IconButton
+        color={dark ? 'white' : 'white'}
         onPress={() =>
           captureScreen().then(async uri => {
             const base64 = await FileSystem.readFile(uri, 'base64');
diff --git a/deploy.sh b/deploy.sh
index 97dd119..e5d16f5 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,11 +2,14 @@
 
 set -ex
 
-tsp yarn tsc
-tsp yarn lint
-tsp yarn test
-tsp -w
-tsp git push origin HEAD
+yarn tsc &
+tsc=$!
+yarn lint
+lint=$!
+yarn test
+units=$1
+wait $tsc $lint $units
+git push origin HEAD &
 
 cd android || exit 1
 build=app/build.gradle