Fix colors on header bar for light theme

This commit is contained in:
Brandon Presley 2022-10-30 15:42:43 +13:00
parent 9752aa9dd1
commit 8ad6189dfc
4 changed files with 30 additions and 8 deletions

View File

@ -3,13 +3,19 @@ import {useNavigation} from '@react-navigation/native';
import {Appbar, IconButton} from 'react-native-paper'; import {Appbar, IconButton} from 'react-native-paper';
import {DrawerParamList} from './drawer-param-list'; import {DrawerParamList} from './drawer-param-list';
import DrawerMenu from './DrawerMenu'; import DrawerMenu from './DrawerMenu';
import useDark from './use-dark';
export default function DrawerHeader({name}: {name: keyof DrawerParamList}) { export default function DrawerHeader({name}: {name: keyof DrawerParamList}) {
const navigation = useNavigation<DrawerNavigationProp<DrawerParamList>>(); const navigation = useNavigation<DrawerNavigationProp<DrawerParamList>>();
const dark = useDark();
return ( return (
<Appbar.Header> <Appbar.Header>
<IconButton icon="menu" onPress={navigation.openDrawer} /> <IconButton
color={dark ? 'white' : 'white'}
icon="menu"
onPress={navigation.openDrawer}
/>
<Appbar.Content title={name} /> <Appbar.Content title={name} />
<DrawerMenu name={name} /> <DrawerMenu name={name} />
</Appbar.Header> </Appbar.Header>

View File

@ -10,6 +10,7 @@ import {Plan} from './plan';
import {addPlans, deletePlans, getAllPlans} from './plan.service'; import {addPlans, deletePlans, getAllPlans} from './plan.service';
import Set from './set'; import Set from './set';
import {addSets, deleteSets, getAllSets} from './set.service'; import {addSets, deleteSets, getAllSets} from './set.service';
import useDark from './use-dark';
import {write} from './write'; import {write} from './write';
const setFields = const setFields =
@ -21,6 +22,7 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
const [showRemove, setShowRemove] = useState(false); const [showRemove, setShowRemove] = useState(false);
const {toast} = useSnackbar(); const {toast} = useSnackbar();
const {reset} = useNavigation<NavigationProp<DrawerParamList>>(); const {reset} = useNavigation<NavigationProp<DrawerParamList>>();
const dark = useDark();
const exportSets = useCallback(async () => { const exportSets = useCallback(async () => {
const sets = await getAllSets(); const sets = await getAllSets();
@ -135,7 +137,11 @@ export default function DrawerMenu({name}: {name: keyof DrawerParamList}) {
visible={showMenu} visible={showMenu}
onDismiss={() => setShowMenu(false)} onDismiss={() => setShowMenu(false)}
anchor={ 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-downward" onPress={download} title="Download" />
<Menu.Item icon="arrow-upward" onPress={upload} title="Upload" /> <Menu.Item icon="arrow-upward" onPress={upload} title="Upload" />

View File

@ -3,15 +3,22 @@ import Share from 'react-native-share';
import {FileSystem} from 'react-native-file-access'; import {FileSystem} from 'react-native-file-access';
import {Appbar, IconButton} from 'react-native-paper'; import {Appbar, IconButton} from 'react-native-paper';
import {captureScreen} from 'react-native-view-shot'; import {captureScreen} from 'react-native-view-shot';
import useDark from './use-dark';
export default function StackHeader({title}: {title: string}) { export default function StackHeader({title}: {title: string}) {
const navigation = useNavigation(); const navigation = useNavigation();
const dark = useDark();
return ( return (
<Appbar.Header> <Appbar.Header>
<IconButton icon="arrow-back" onPress={navigation.goBack} /> <IconButton
color={dark ? 'white' : 'white'}
icon="arrow-back"
onPress={navigation.goBack}
/>
<Appbar.Content title={title} /> <Appbar.Content title={title} />
<IconButton <IconButton
color={dark ? 'white' : 'white'}
onPress={() => onPress={() =>
captureScreen().then(async uri => { captureScreen().then(async uri => {
const base64 = await FileSystem.readFile(uri, 'base64'); const base64 = await FileSystem.readFile(uri, 'base64');

View File

@ -2,11 +2,14 @@
set -ex set -ex
tsp yarn tsc yarn tsc &
tsp yarn lint tsc=$!
tsp yarn test yarn lint
tsp -w lint=$!
tsp git push origin HEAD yarn test
units=$1
wait $tsc $lint $units
git push origin HEAD &
cd android || exit 1 cd android || exit 1
build=app/build.gradle build=app/build.gradle