Rename Home -> History
Although it is very common to have a Home page, I would rather have every pages name describe generally what it is.
This commit is contained in:
parent
1ac78de724
commit
d8eba22914
|
@ -30,12 +30,14 @@ export default function AppDrawer({
|
||||||
swipeEdgeWidth: 1000,
|
swipeEdgeWidth: 1000,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
}}
|
}}
|
||||||
initialRouteName={(route.params.startup || "Home") as keyof DrawerParams}
|
initialRouteName={
|
||||||
|
(route.params.startup as keyof DrawerParams) || "History"
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<Drawer.Screen
|
<Drawer.Screen
|
||||||
name="Home"
|
name="History"
|
||||||
component={SetList}
|
component={SetList}
|
||||||
options={{ drawerIcon: () => <IconButton icon="home-outline" /> }}
|
options={{ drawerIcon: () => <IconButton icon="history" /> }}
|
||||||
/>
|
/>
|
||||||
<Drawer.Screen
|
<Drawer.Screen
|
||||||
name="Exercises"
|
name="Exercises"
|
||||||
|
|
|
@ -80,7 +80,7 @@ export default function EditSet() {
|
||||||
);
|
);
|
||||||
|
|
||||||
const notify = (value: Partial<GymSet>) => {
|
const notify = (value: Partial<GymSet>) => {
|
||||||
if (!settings.notify) return navigate("Home");
|
if (!settings.notify) return navigate("History");
|
||||||
if (
|
if (
|
||||||
value.weight > set.weight ||
|
value.weight > set.weight ||
|
||||||
(value.reps > set.reps && value.weight === set.weight)
|
(value.reps > set.reps && value.weight === set.weight)
|
||||||
|
@ -122,7 +122,7 @@ export default function EditSet() {
|
||||||
const saved = await setRepo.save(newSet);
|
const saved = await setRepo.save(newSet);
|
||||||
notify(newSet);
|
notify(newSet);
|
||||||
if (typeof set.id !== "number") added(saved);
|
if (typeof set.id !== "number") added(saved);
|
||||||
navigate("Home");
|
navigate("History");
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeImage = useCallback(async () => {
|
const changeImage = useCallback(async () => {
|
||||||
|
@ -158,7 +158,7 @@ export default function EditSet() {
|
||||||
|
|
||||||
const remove = async () => {
|
const remove = async () => {
|
||||||
await setRepo.delete(set.id);
|
await setRepo.delete(set.id);
|
||||||
navigate("Home");
|
navigate("History");
|
||||||
};
|
};
|
||||||
|
|
||||||
const openMenu = async () => {
|
const openMenu = async () => {
|
||||||
|
|
|
@ -62,7 +62,7 @@ export default function EditSets() {
|
||||||
if (unit) update.unit = unit;
|
if (unit) update.unit = unit;
|
||||||
if (newImage) update.image = newImage;
|
if (newImage) update.image = newImage;
|
||||||
if (Object.keys(update).length > 0) await setRepo.update(ids, update);
|
if (Object.keys(update).length > 0) await setRepo.update(ids, update);
|
||||||
navigate("Home");
|
navigate("History");
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeImage = useCallback(async () => {
|
const changeImage = useCallback(async () => {
|
||||||
|
|
|
@ -162,7 +162,9 @@ export default function SetList() {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<DrawerHeader name={ids.length > 0 ? `${ids.length} selected` : "Home"}>
|
<DrawerHeader
|
||||||
|
name={ids.length > 0 ? `${ids.length} selected` : "History"}
|
||||||
|
>
|
||||||
<ListMenu
|
<ListMenu
|
||||||
onClear={clear}
|
onClear={clear}
|
||||||
onCopy={copy}
|
onCopy={copy}
|
||||||
|
|
|
@ -128,7 +128,7 @@ export default function SettingsPage() {
|
||||||
<Select
|
<Select
|
||||||
label={name}
|
label={name}
|
||||||
items={[
|
items={[
|
||||||
{ label: "Home", value: "Home" },
|
{ label: "History", value: "History" },
|
||||||
{ label: "Exercises", value: "Exercises" },
|
{ label: "Exercises", value: "Exercises" },
|
||||||
{ label: "Plans", value: "Plans" },
|
{ label: "Plans", value: "Plans" },
|
||||||
{ label: "Graphs", value: "Graphs" },
|
{ label: "Graphs", value: "Graphs" },
|
||||||
|
|
|
@ -35,6 +35,7 @@ import Settings from "./settings";
|
||||||
import Weight from "./weight";
|
import Weight from "./weight";
|
||||||
import { settingsStartup1699783784680 } from "./migrations/1699783784680-settings-startup";
|
import { settingsStartup1699783784680 } from "./migrations/1699783784680-settings-startup";
|
||||||
import { settingsBackupDir1699839054226 } from "./migrations/1699839054226-settings-backup-dir";
|
import { settingsBackupDir1699839054226 } from "./migrations/1699839054226-settings-backup-dir";
|
||||||
|
import { homeHistoryStartup1699853245534 } from "./migrations/1699853245534-home-history-startup";
|
||||||
|
|
||||||
export const AppDataSource = new DataSource({
|
export const AppDataSource = new DataSource({
|
||||||
type: "react-native",
|
type: "react-native",
|
||||||
|
@ -76,5 +77,6 @@ export const AppDataSource = new DataSource({
|
||||||
settingsDuration1699743753975,
|
settingsDuration1699743753975,
|
||||||
settingsStartup1699783784680,
|
settingsStartup1699783784680,
|
||||||
settingsBackupDir1699839054226,
|
settingsBackupDir1699839054226,
|
||||||
|
homeHistoryStartup1699853245534,
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
export type DrawerParams = {
|
export type DrawerParams = {
|
||||||
Home: {};
|
History: {};
|
||||||
Exercises: {};
|
Exercises: {};
|
||||||
Plans: {};
|
Plans: {};
|
||||||
Graphs: {};
|
Graphs: {};
|
||||||
|
|
10
migrations/1699853245534-home-history-startup.ts
Normal file
10
migrations/1699853245534-home-history-startup.ts
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||||
|
import { settingsRepo } from "../db";
|
||||||
|
|
||||||
|
export class homeHistoryStartup1699853245534 implements MigrationInterface {
|
||||||
|
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||||
|
await settingsRepo.update({ startup: "Home" }, { startup: "History" });
|
||||||
|
}
|
||||||
|
|
||||||
|
public async down(queryRunner: QueryRunner): Promise<void> {}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user