Minor refactors and renaming
This commit is contained in:
parent
d38d2a59b4
commit
acfd0e698d
4
App.tsx
4
App.tsx
|
@ -1,4 +1,3 @@
|
||||||
import {createDrawerNavigator} from '@react-navigation/drawer';
|
|
||||||
import {
|
import {
|
||||||
DarkTheme as NavigationDarkTheme,
|
DarkTheme as NavigationDarkTheme,
|
||||||
DefaultTheme as NavigationDefaultTheme,
|
DefaultTheme as NavigationDefaultTheme,
|
||||||
|
@ -12,12 +11,9 @@ import {
|
||||||
Provider,
|
Provider,
|
||||||
} from 'react-native-paper';
|
} from 'react-native-paper';
|
||||||
import Ionicon from 'react-native-vector-icons/Ionicons';
|
import Ionicon from 'react-native-vector-icons/Ionicons';
|
||||||
import {DrawerParamList} from './drawer-param-list';
|
|
||||||
import MassiveSnack from './MassiveSnack';
|
import MassiveSnack from './MassiveSnack';
|
||||||
import Routes from './Routes';
|
import Routes from './Routes';
|
||||||
|
|
||||||
export const Drawer = createDrawerNavigator<DrawerParamList>();
|
|
||||||
|
|
||||||
export const CombinedDefaultTheme = {
|
export const CombinedDefaultTheme = {
|
||||||
...NavigationDefaultTheme,
|
...NavigationDefaultTheme,
|
||||||
...PaperDefaultTheme,
|
...PaperDefaultTheme,
|
||||||
|
|
|
@ -14,7 +14,7 @@ import MassiveSwitch from './MassiveSwitch';
|
||||||
import {PlanPageParams} from './plan-page-params';
|
import {PlanPageParams} from './plan-page-params';
|
||||||
import {addPlan, updatePlan} from './plan.service';
|
import {addPlan, updatePlan} from './plan.service';
|
||||||
import {getNames} from './set.service';
|
import {getNames} from './set.service';
|
||||||
import {DAYS} from './time';
|
import {days} from './time';
|
||||||
|
|
||||||
export default function EditPlan() {
|
export default function EditPlan() {
|
||||||
const {params} = useRoute<RouteProp<PlanPageParams, 'EditPlan'>>();
|
const {params} = useRoute<RouteProp<PlanPageParams, 'EditPlan'>>();
|
||||||
|
@ -90,7 +90,7 @@ export default function EditPlan() {
|
||||||
<View style={{padding: PADDING}}>
|
<View style={{padding: PADDING}}>
|
||||||
<ScrollView style={{height: '90%'}}>
|
<ScrollView style={{height: '90%'}}>
|
||||||
<Text style={styles.title}>Days</Text>
|
<Text style={styles.title}>Days</Text>
|
||||||
{DAYS.map(day => (
|
{days.map(day => (
|
||||||
<View key={day} style={[styles.row, {alignItems: 'center'}]}>
|
<View key={day} style={[styles.row, {alignItems: 'center'}]}>
|
||||||
<MassiveSwitch
|
<MassiveSwitch
|
||||||
value={days.includes(day)}
|
value={days.includes(day)}
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
|
import {createDrawerNavigator} from '@react-navigation/drawer';
|
||||||
import React, {useContext, useEffect, useState} from 'react';
|
import React, {useContext, useEffect, useState} from 'react';
|
||||||
import {useColorScheme} from 'react-native';
|
import {useColorScheme} from 'react-native';
|
||||||
import {IconButton} from 'react-native-paper';
|
import {IconButton} from 'react-native-paper';
|
||||||
import {CustomTheme, Drawer} from './App';
|
import {CustomTheme} from './App';
|
||||||
import BestPage from './BestPage';
|
import BestPage from './BestPage';
|
||||||
import {runMigrations} from './db';
|
import {runMigrations} from './db';
|
||||||
|
import {DrawerParamList} from './drawer-param-list';
|
||||||
import HomePage from './HomePage';
|
import HomePage from './HomePage';
|
||||||
import PlanPage from './PlanPage';
|
import PlanPage from './PlanPage';
|
||||||
import Route from './route';
|
import Route from './route';
|
||||||
|
@ -11,6 +13,8 @@ import {getSettings, settings} from './settings.service';
|
||||||
import SettingsPage from './SettingsPage';
|
import SettingsPage from './SettingsPage';
|
||||||
import WorkoutsPage from './WorkoutsPage';
|
import WorkoutsPage from './WorkoutsPage';
|
||||||
|
|
||||||
|
const Drawer = createDrawerNavigator<DrawerParamList>();
|
||||||
|
|
||||||
export default function Routes() {
|
export default function Routes() {
|
||||||
const [migrated, setMigrated] = useState(false);
|
const [migrated, setMigrated] = useState(false);
|
||||||
const dark = useColorScheme() === 'dark';
|
const dark = useColorScheme() === 'dark';
|
||||||
|
@ -19,8 +23,8 @@ export default function Routes() {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
runMigrations()
|
runMigrations()
|
||||||
.then(getSettings)
|
.then(getSettings)
|
||||||
.then(() => setMigrated(true))
|
|
||||||
.then(() => {
|
.then(() => {
|
||||||
|
setMigrated(true);
|
||||||
if (settings.color) setColor(settings.color);
|
if (settings.color) setColor(settings.color);
|
||||||
});
|
});
|
||||||
}, [setColor]);
|
}, [setColor]);
|
||||||
|
|
|
@ -14,6 +14,7 @@ export type WorkoutsPageParams = {
|
||||||
value: Set;
|
value: Set;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const Stack = createStackNavigator<WorkoutsPageParams>();
|
const Stack = createStackNavigator<WorkoutsPageParams>();
|
||||||
|
|
||||||
export default function WorkoutsPage() {
|
export default function WorkoutsPage() {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import {db} from './db';
|
import {db} from './db';
|
||||||
import {Plan} from './plan';
|
import {Plan} from './plan';
|
||||||
import {DAYS} from './time';
|
import {days} from './time';
|
||||||
|
|
||||||
export const getPlans = async (search: string): Promise<Plan[]> => {
|
export const getPlans = async (search: string): Promise<Plan[]> => {
|
||||||
const select = `
|
const select = `
|
||||||
|
@ -12,7 +12,7 @@ export const getPlans = async (search: string): Promise<Plan[]> => {
|
||||||
};
|
};
|
||||||
|
|
||||||
export const getTodaysPlan = async (): Promise<Plan[]> => {
|
export const getTodaysPlan = async (): Promise<Plan[]> => {
|
||||||
const today = DAYS[new Date().getDay()];
|
const today = days[new Date().getDay()];
|
||||||
const [result] = await db.executeSql(
|
const [result] = await db.executeSql(
|
||||||
`SELECT * FROM plans WHERE days LIKE ? LIMIT 1`,
|
`SELECT * FROM plans WHERE days LIKE ? LIMIT 1`,
|
||||||
[`%${today}%`],
|
[`%${today}%`],
|
||||||
|
|
Loading…
Reference in New Issue
Block a user