Remove old remnants of multiple stack navigators
This commit is contained in:
parent
ef63fcf470
commit
52f04ad11c
|
@ -11,18 +11,18 @@ import DocumentPicker from "react-native-document-picker";
|
||||||
import { Button, Card, TouchableRipple } from "react-native-paper";
|
import { Button, Card, TouchableRipple } from "react-native-paper";
|
||||||
import { In } from "typeorm";
|
import { In } from "typeorm";
|
||||||
import AppInput from "./AppInput";
|
import AppInput from "./AppInput";
|
||||||
|
import { StackParams } from "./AppStack";
|
||||||
import ConfirmDialog from "./ConfirmDialog";
|
import ConfirmDialog from "./ConfirmDialog";
|
||||||
|
import StackHeader from "./StackHeader";
|
||||||
import { MARGIN, PADDING } from "./constants";
|
import { MARGIN, PADDING } from "./constants";
|
||||||
import { planRepo, setRepo, settingsRepo } from "./db";
|
import { planRepo, setRepo, settingsRepo } from "./db";
|
||||||
import { ExercisesPageParams } from "./ExercisesPage";
|
import { DrawerParams } from "./drawer-param-list";
|
||||||
import { fixNumeric } from "./fix-numeric";
|
import { fixNumeric } from "./fix-numeric";
|
||||||
import Settings from "./settings";
|
import Settings from "./settings";
|
||||||
import StackHeader from "./StackHeader";
|
|
||||||
import { toast } from "./toast";
|
import { toast } from "./toast";
|
||||||
|
|
||||||
export default function EditExercises() {
|
export default function EditExercises() {
|
||||||
const { params } =
|
const { params } = useRoute<RouteProp<StackParams, "EditExercises">>();
|
||||||
useRoute<RouteProp<ExercisesPageParams, "EditExercises">>();
|
|
||||||
const [removeImage, setRemoveImage] = useState(false);
|
const [removeImage, setRemoveImage] = useState(false);
|
||||||
const [showRemove, setShowRemove] = useState(false);
|
const [showRemove, setShowRemove] = useState(false);
|
||||||
const [name, setName] = useState("");
|
const [name, setName] = useState("");
|
||||||
|
@ -36,7 +36,7 @@ export default function EditExercises() {
|
||||||
const [oldSeconds, setOldSeconds] = useState("");
|
const [oldSeconds, setOldSeconds] = useState("");
|
||||||
const [sets, setSets] = useState("");
|
const [sets, setSets] = useState("");
|
||||||
const [oldSets, setOldSets] = useState("");
|
const [oldSets, setOldSets] = useState("");
|
||||||
const navigation = useNavigation<NavigationProp<ExercisesPageParams>>();
|
const navigation = useNavigation<NavigationProp<DrawerParams>>();
|
||||||
const setsRef = useRef<TextInput>(null);
|
const setsRef = useRef<TextInput>(null);
|
||||||
const stepsRef = useRef<TextInput>(null);
|
const stepsRef = useRef<TextInput>(null);
|
||||||
const minutesRef = useRef<TextInput>(null);
|
const minutesRef = useRef<TextInput>(null);
|
||||||
|
@ -85,7 +85,7 @@ export default function EditExercises() {
|
||||||
.where("exercises LIKE :name", { name: `%${oldName}%` })
|
.where("exercises LIKE :name", { name: `%${oldName}%` })
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
navigation.navigate("ExerciseList", { clearNames: true });
|
navigation.navigate("Exercises");
|
||||||
};
|
};
|
||||||
|
|
||||||
const changeImage = useCallback(async () => {
|
const changeImage = useCallback(async () => {
|
||||||
|
|
|
@ -3,9 +3,9 @@ import { useCallback, useMemo } from "react";
|
||||||
import { Image } from "react-native";
|
import { Image } from "react-native";
|
||||||
import { List } from "react-native-paper";
|
import { List } from "react-native-paper";
|
||||||
import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
|
import { DARK_RIPPLE, LIGHT_RIPPLE } from "./constants";
|
||||||
import { ExercisesPageParams } from "./ExercisesPage";
|
|
||||||
import GymSet from "./gym-set";
|
import GymSet from "./gym-set";
|
||||||
import useDark from "./use-dark";
|
import useDark from "./use-dark";
|
||||||
|
import { StackParams } from "./AppStack";
|
||||||
|
|
||||||
export default function ExerciseItem({
|
export default function ExerciseItem({
|
||||||
item,
|
item,
|
||||||
|
@ -20,7 +20,7 @@ export default function ExerciseItem({
|
||||||
names: string[];
|
names: string[];
|
||||||
alarm: boolean;
|
alarm: boolean;
|
||||||
}) {
|
}) {
|
||||||
const navigation = useNavigation<NavigationProp<ExercisesPageParams>>();
|
const navigation = useNavigation<NavigationProp<StackParams>>();
|
||||||
const dark = useDark();
|
const dark = useDark();
|
||||||
|
|
||||||
const description = useMemo(() => {
|
const description = useMemo(() => {
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
import { createStackNavigator } from "@react-navigation/stack";
|
|
||||||
import EditExercise from "./EditExercise";
|
|
||||||
import EditExercises from "./EditExercises";
|
|
||||||
import ExerciseList from "./ExerciseList";
|
|
||||||
import GymSet from "./gym-set";
|
|
||||||
|
|
||||||
export type ExercisesPageParams = {
|
|
||||||
ExerciseList: {
|
|
||||||
clearNames?: boolean;
|
|
||||||
search?: string;
|
|
||||||
update?: GymSet;
|
|
||||||
reset?: number;
|
|
||||||
};
|
|
||||||
EditExercise: {
|
|
||||||
gymSet: GymSet;
|
|
||||||
};
|
|
||||||
EditExercises: {
|
|
||||||
names: string[];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
const Stack = createStackNavigator<ExercisesPageParams>();
|
|
||||||
|
|
||||||
export default function ExercisesPage() {
|
|
||||||
return (
|
|
||||||
<Stack.Navigator
|
|
||||||
screenOptions={{ headerShown: false, animationEnabled: false }}
|
|
||||||
>
|
|
||||||
<Stack.Screen name="ExerciseList" component={ExerciseList} />
|
|
||||||
<Stack.Screen name="EditExercise" component={EditExercise} />
|
|
||||||
<Stack.Screen name="EditExercises" component={EditExercises} />
|
|
||||||
</Stack.Navigator>
|
|
||||||
);
|
|
||||||
}
|
|
|
@ -10,17 +10,17 @@ import { getBestSets } from "./best.service";
|
||||||
import { LIMIT } from "./constants";
|
import { LIMIT } from "./constants";
|
||||||
import { settingsRepo } from "./db";
|
import { settingsRepo } from "./db";
|
||||||
import DrawerHeader from "./DrawerHeader";
|
import DrawerHeader from "./DrawerHeader";
|
||||||
import { GraphsPageParams } from "./GraphsPage";
|
|
||||||
import GymSet from "./gym-set";
|
import GymSet from "./gym-set";
|
||||||
import Page from "./Page";
|
import Page from "./Page";
|
||||||
import Settings from "./settings";
|
import Settings from "./settings";
|
||||||
|
import { StackParams } from "./AppStack";
|
||||||
|
|
||||||
export default function GraphsList() {
|
export default function GraphsList() {
|
||||||
const [bests, setBests] = useState<GymSet[]>();
|
const [bests, setBests] = useState<GymSet[]>();
|
||||||
const [offset, setOffset] = useState(0);
|
const [offset, setOffset] = useState(0);
|
||||||
const [end, setEnd] = useState(false);
|
const [end, setEnd] = useState(false);
|
||||||
const [term, setTerm] = useState("");
|
const [term, setTerm] = useState("");
|
||||||
const navigation = useNavigation<NavigationProp<GraphsPageParams>>();
|
const navigation = useNavigation<NavigationProp<StackParams>>();
|
||||||
const [settings, setSettings] = useState<Settings>();
|
const [settings, setSettings] = useState<Settings>();
|
||||||
const [refreshing, setRefreshing] = useState(false);
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
import { createStackNavigator } from "@react-navigation/stack";
|
|
||||||
import GraphsList from "./GraphsList";
|
|
||||||
|
|
||||||
const Stack = createStackNavigator<GraphsPageParams>();
|
|
||||||
export type GraphsPageParams = {
|
|
||||||
GraphsList: {};
|
|
||||||
ViewGraph: {
|
|
||||||
name: string;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function GraphsPage() {
|
|
||||||
return (
|
|
||||||
<Stack.Navigator
|
|
||||||
screenOptions={{ headerShown: false, animationEnabled: false }}
|
|
||||||
>
|
|
||||||
<Stack.Screen name="GraphsList" component={GraphsList} />
|
|
||||||
</Stack.Navigator>
|
|
||||||
);
|
|
||||||
}
|
|
|
@ -9,16 +9,16 @@ import { captureScreen } from "react-native-view-shot";
|
||||||
import Chart from "./Chart";
|
import Chart from "./Chart";
|
||||||
import { PADDING } from "./constants";
|
import { PADDING } from "./constants";
|
||||||
import { setRepo } from "./db";
|
import { setRepo } from "./db";
|
||||||
import { GraphsPageParams } from "./GraphsPage";
|
|
||||||
import GymSet from "./gym-set";
|
import GymSet from "./gym-set";
|
||||||
import { Metrics } from "./metrics";
|
import { Metrics } from "./metrics";
|
||||||
import { Periods } from "./periods";
|
import { Periods } from "./periods";
|
||||||
import Select from "./Select";
|
import Select from "./Select";
|
||||||
import StackHeader from "./StackHeader";
|
import StackHeader from "./StackHeader";
|
||||||
import Volume from "./volume";
|
import Volume from "./volume";
|
||||||
|
import { StackParams } from "./AppStack";
|
||||||
|
|
||||||
export default function ViewGraph() {
|
export default function ViewGraph() {
|
||||||
const { params } = useRoute<RouteProp<GraphsPageParams, "ViewGraph">>();
|
const { params } = useRoute<RouteProp<StackParams, "ViewGraph">>();
|
||||||
const [weights, setWeights] = useState<GymSet[]>();
|
const [weights, setWeights] = useState<GymSet[]>();
|
||||||
const [volumes, setVolumes] = useState<Volume[]>();
|
const [volumes, setVolumes] = useState<Volume[]>();
|
||||||
const [metric, setMetric] = useState(Metrics.OneRepMax);
|
const [metric, setMetric] = useState(Metrics.OneRepMax);
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { useCallback, useMemo } from "react";
|
||||||
import { List, Text } from "react-native-paper";
|
import { List, Text } from "react-native-paper";
|
||||||
import Settings from "./settings";
|
import Settings from "./settings";
|
||||||
import Weight from "./weight";
|
import Weight from "./weight";
|
||||||
import { WeightPageParams } from "./WeightPage";
|
import { StackParams } from "./AppStack";
|
||||||
|
|
||||||
export default function WeightItem({
|
export default function WeightItem({
|
||||||
item,
|
item,
|
||||||
|
@ -13,7 +13,7 @@ export default function WeightItem({
|
||||||
item: Weight;
|
item: Weight;
|
||||||
settings: Settings;
|
settings: Settings;
|
||||||
}) {
|
}) {
|
||||||
const navigation = useNavigation<NavigationProp<WeightPageParams>>();
|
const navigation = useNavigation<NavigationProp<StackParams>>();
|
||||||
|
|
||||||
const press = useCallback(() => {
|
const press = useCallback(() => {
|
||||||
navigation.navigate("EditWeight", { weight: item });
|
navigation.navigate("EditWeight", { weight: item });
|
||||||
|
|
|
@ -14,7 +14,7 @@ import Page from "./Page";
|
||||||
import Settings from "./settings";
|
import Settings from "./settings";
|
||||||
import { default as Weight, defaultWeight } from "./weight";
|
import { default as Weight, defaultWeight } from "./weight";
|
||||||
import WeightItem from "./WeightItem";
|
import WeightItem from "./WeightItem";
|
||||||
import { WeightPageParams } from "./WeightPage";
|
import { StackParams } from "./AppStack";
|
||||||
|
|
||||||
export default function WeightList() {
|
export default function WeightList() {
|
||||||
const [refreshing, setRefreshing] = useState(false);
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
@ -22,7 +22,7 @@ export default function WeightList() {
|
||||||
const [offset, setOffset] = useState(0);
|
const [offset, setOffset] = useState(0);
|
||||||
const [end, setEnd] = useState(false);
|
const [end, setEnd] = useState(false);
|
||||||
const [settings, setSettings] = useState<Settings>();
|
const [settings, setSettings] = useState<Settings>();
|
||||||
const { navigate } = useNavigation<NavigationProp<WeightPageParams>>();
|
const { navigate } = useNavigation<NavigationProp<StackParams>>();
|
||||||
const [term, setTerm] = useState("");
|
const [term, setTerm] = useState("");
|
||||||
|
|
||||||
const reset = useCallback(
|
const reset = useCallback(
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
import { createStackNavigator } from "@react-navigation/stack";
|
|
||||||
import Weight from "./weight";
|
|
||||||
import WeightList from "./WeightList";
|
|
||||||
|
|
||||||
export type WeightPageParams = {
|
|
||||||
Weights: {};
|
|
||||||
EditWeight: {
|
|
||||||
weight: Weight;
|
|
||||||
};
|
|
||||||
ViewWeightGraph: {};
|
|
||||||
};
|
|
||||||
|
|
||||||
const Stack = createStackNavigator<WeightPageParams>();
|
|
||||||
|
|
||||||
export default function WeightPage() {
|
|
||||||
return (
|
|
||||||
<Stack.Navigator
|
|
||||||
screenOptions={{ headerShown: false, animationEnabled: false }}
|
|
||||||
>
|
|
||||||
<Stack.Screen name="Weights" component={WeightList} />
|
|
||||||
</Stack.Navigator>
|
|
||||||
);
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user