diff --git a/App.tsx b/App.tsx index e1bac1b..7e441a7 100644 --- a/App.tsx +++ b/App.tsx @@ -1,4 +1,3 @@ -import {createDrawerNavigator} from '@react-navigation/drawer'; import { DarkTheme as NavigationDarkTheme, DefaultTheme as NavigationDefaultTheme, @@ -12,12 +11,9 @@ import { Provider, } from 'react-native-paper'; import Ionicon from 'react-native-vector-icons/Ionicons'; -import {DrawerParamList} from './drawer-param-list'; import MassiveSnack from './MassiveSnack'; import Routes from './Routes'; -export const Drawer = createDrawerNavigator(); - export const CombinedDefaultTheme = { ...NavigationDefaultTheme, ...PaperDefaultTheme, diff --git a/EditPlan.tsx b/EditPlan.tsx index dad9734..6356f3d 100644 --- a/EditPlan.tsx +++ b/EditPlan.tsx @@ -14,7 +14,7 @@ import MassiveSwitch from './MassiveSwitch'; import {PlanPageParams} from './plan-page-params'; import {addPlan, updatePlan} from './plan.service'; import {getNames} from './set.service'; -import {DAYS} from './time'; +import {days} from './time'; export default function EditPlan() { const {params} = useRoute>(); @@ -90,7 +90,7 @@ export default function EditPlan() { Days - {DAYS.map(day => ( + {days.map(day => ( (); + export default function Routes() { const [migrated, setMigrated] = useState(false); const dark = useColorScheme() === 'dark'; @@ -19,8 +23,8 @@ export default function Routes() { useEffect(() => { runMigrations() .then(getSettings) - .then(() => setMigrated(true)) .then(() => { + setMigrated(true); if (settings.color) setColor(settings.color); }); }, [setColor]); diff --git a/WorkoutsPage.tsx b/WorkoutsPage.tsx index aa745d5..17912df 100644 --- a/WorkoutsPage.tsx +++ b/WorkoutsPage.tsx @@ -14,6 +14,7 @@ export type WorkoutsPageParams = { value: Set; }; }; + const Stack = createStackNavigator(); export default function WorkoutsPage() { diff --git a/plan.service.ts b/plan.service.ts index 0062fc7..568d2be 100644 --- a/plan.service.ts +++ b/plan.service.ts @@ -1,6 +1,6 @@ import {db} from './db'; import {Plan} from './plan'; -import {DAYS} from './time'; +import {days} from './time'; export const getPlans = async (search: string): Promise => { const select = ` @@ -12,7 +12,7 @@ export const getPlans = async (search: string): Promise => { }; export const getTodaysPlan = async (): Promise => { - const today = DAYS[new Date().getDay()]; + const today = days[new Date().getDay()]; const [result] = await db.executeSql( `SELECT * FROM plans WHERE days LIKE ? LIMIT 1`, [`%${today}%`], diff --git a/time.ts b/time.ts index e0ecd78..8b633af 100644 --- a/time.ts +++ b/time.ts @@ -1,4 +1,4 @@ -export const DAYS = [ +export const days = [ 'Sunday', 'Monday', 'Tuesday',