diff --git a/BestList.tsx b/BestList.tsx index 1b59ced..dfed1f5 100644 --- a/BestList.tsx +++ b/BestList.tsx @@ -9,6 +9,7 @@ import {List, Searchbar} from 'react-native-paper'; import {DatabaseContext} from './App'; import Best from './best'; import {BestPageParams} from './BestPage'; +import DrawerMenu from './DrawerMenu'; export default function BestList() { const [bests, setBests] = useState([]); @@ -47,7 +48,10 @@ export default function BestList() { useFocusEffect( useCallback(() => { refresh(); - }, [refresh]), + navigation.getParent()?.setOptions({ + headerRight: () => null, + }); + }, [refresh, navigation]), ); useEffect(() => { diff --git a/EditPlan.tsx b/EditPlan.tsx index 155db7f..ff77105 100644 --- a/EditPlan.tsx +++ b/EditPlan.tsx @@ -1,14 +1,12 @@ import { - DarkTheme, - DefaultTheme, RouteProp, useFocusEffect, useNavigation, useRoute, } from '@react-navigation/native'; import React, {useCallback, useContext, useEffect, useState} from 'react'; -import {ScrollView, StyleSheet, Text, useColorScheme, View} from 'react-native'; -import {Button, IconButton, Switch} from 'react-native-paper'; +import {ScrollView, StyleSheet, Text, View} from 'react-native'; +import {Button, IconButton} from 'react-native-paper'; import {DatabaseContext} from './App'; import MassiveSwitch from './MassiveSwitch'; import {PlanPageParams} from './PlanPage'; @@ -23,7 +21,6 @@ export default function EditPlan() { const [names, setNames] = useState([]); const db = useContext(DatabaseContext); const navigation = useNavigation(); - const dark = useColorScheme() === 'dark'; useFocusEffect( useCallback(() => { @@ -31,6 +28,7 @@ export default function EditPlan() { headerLeft: () => ( navigation.goBack()} /> ), + headerRight: () => null, title: 'Plan', }); }, [navigation]), diff --git a/PlanList.tsx b/PlanList.tsx index ce95fb9..05b603f 100644 --- a/PlanList.tsx +++ b/PlanList.tsx @@ -7,6 +7,7 @@ import React, {useCallback, useContext, useEffect, useState} from 'react'; import {FlatList, StyleSheet, View} from 'react-native'; import {List, Searchbar} from 'react-native-paper'; import {DatabaseContext} from './App'; +import DrawerMenu from './DrawerMenu'; import MassiveFab from './MassiveFab'; import {Plan} from './plan'; import PlanItem from './PlanItem'; @@ -33,7 +34,10 @@ export default function PlanList() { useFocusEffect( useCallback(() => { refresh(); - }, [refresh]), + navigation.getParent()?.setOptions({ + headerRight: () => , + }); + }, [refresh, navigation]), ); useEffect(() => { diff --git a/Routes.tsx b/Routes.tsx index 25ed13c..7519e01 100644 --- a/Routes.tsx +++ b/Routes.tsx @@ -41,7 +41,6 @@ export default function Routes({db}: {db: SQLiteDatabase | null}) { name={route.name} component={route.component} options={{ - headerRight: () => , drawerIcon: ({focused}) => (