diff --git a/AppDrawer.tsx b/AppDrawer.tsx index 6e4c50b..8dc3522 100644 --- a/AppDrawer.tsx +++ b/AppDrawer.tsx @@ -10,7 +10,6 @@ import SetList from "./SetList"; import SettingsPage from "./SettingsPage"; import TimerPage from "./TimerPage"; import WeightList from "./WeightList"; -import { StyleSheet, Text, View } from "react-native"; const Drawer = createDrawerNavigator(); @@ -24,86 +23,60 @@ export default function AppDrawer({ const { dark } = useTheme(); return ( - <> - {__DEV__ && ( - - DEBUG - - )} - + }} + /> + }} + /> + }} + /> + , }} - initialRouteName={ - (route.params.startup as keyof DrawerParams) || "History" - } - > - }} - /> - }} - /> - }} - /> - , - }} - /> - }} - /> - }} - /> - , - }} - /> - }} - /> - - + /> + }} + /> + }} + /> + , + }} + /> + }} + /> + ); -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - }, - debugBanner: { - position: 'absolute', - top: 0, - right: 0, - transform: [{ rotate: '45deg' }], - backgroundColor: 'red', - zIndex: 1000, - }, - debugText: { - color: 'white', - padding: 5, - fontSize: 10, - }, -}); +} \ No newline at end of file diff --git a/AppStack.tsx b/AppStack.tsx index 176ecad..5f38323 100644 --- a/AppStack.tsx +++ b/AppStack.tsx @@ -13,6 +13,7 @@ import ViewGraph from "./ViewGraph"; import ViewSetList from "./ViewSetList"; import ViewWeightGraph from "./ViewWeightGraph"; import Weight from "./weight"; +import { View, Text, StyleSheet } from "react-native"; export type StackParams = { Drawer: {}; @@ -51,24 +52,50 @@ const Stack = createStackNavigator(); export default function AppStack({ startup }: { startup: string }) { return ( - - - - - - - - - - - - - + <> + {__DEV__ && ( + + DEBUG + + )} + + + + + + + + + + + + + + ); } + +const styles = StyleSheet.create({ + container: { + flex: 1, + }, + debugBanner: { + position: 'absolute', + top: 20, + right: 50, + backgroundColor: 'red', + zIndex: 1000, + borderRadius: 5, + }, + debugText: { + color: 'white', + padding: 5, + fontSize: 10, + }, +});