diff --git a/EditExercise.tsx b/EditExercise.tsx
index 43d7679..4e71595 100644
--- a/EditExercise.tsx
+++ b/EditExercise.tsx
@@ -12,13 +12,14 @@ import { Button, Card, TouchableRipple } from "react-native-paper";
import AppInput from "./AppInput";
import { StackParams } from "./AppStack";
import ConfirmDialog from "./ConfirmDialog";
+import PrimaryButton from "./PrimaryButton";
+import StackHeader from "./StackHeader";
import { MARGIN, PADDING } from "./constants";
import { getNow, planRepo, setRepo, settingsRepo } from "./db";
import { DrawerParams } from "./drawer-params";
import { fixNumeric } from "./fix-numeric";
import GymSet, { defaultSet } from "./gym-set";
import Settings from "./settings";
-import StackHeader from "./StackHeader";
import { toast } from "./toast";
export default function EditExercise() {
@@ -189,14 +190,9 @@ export default function EditExercise() {
)}
-
+
>();
@@ -187,14 +188,9 @@ export default function EditExercises() {
)}
-
+
>();
@@ -189,19 +189,18 @@ export default function EditPlan() {
containerStyle={{ flex: 1 }}
/>
)}
-
-
+
+ {
+ await save();
+ drawerNavigate("Plans");
+ }}
+ >
+ Save
+
>
);
}
diff --git a/EditSet.tsx b/EditSet.tsx
index 3561b3b..1315739 100644
--- a/EditSet.tsx
+++ b/EditSet.tsx
@@ -31,6 +31,7 @@ import Select from "./Select";
import Settings from "./settings";
import StackHeader from "./StackHeader";
import { toast } from "./toast";
+import PrimaryButton from "./PrimaryButton";
export default function EditSet() {
const { params } = useRoute>();
@@ -340,15 +341,14 @@ export default function EditSet() {
)}
-
+
>();
@@ -181,14 +182,13 @@ export default function EditSets() {
)}
-
+
>
);
}
diff --git a/EditWeight.tsx b/EditWeight.tsx
index abd3318..254bc93 100644
--- a/EditWeight.tsx
+++ b/EditWeight.tsx
@@ -9,17 +9,18 @@ import {
import { format } from "date-fns";
import { useCallback, useRef, useState } from "react";
import { TextInput, View } from "react-native";
-import { Button, IconButton } from "react-native-paper";
+import { IconButton } from "react-native-paper";
import AppInput from "./AppInput";
import { StackParams } from "./AppStack";
import ConfirmDialog from "./ConfirmDialog";
+import PrimaryButton from "./PrimaryButton";
+import Select from "./Select";
+import StackHeader from "./StackHeader";
import { MARGIN, PADDING } from "./constants";
import { AppDataSource } from "./data-source";
import { getNow, settingsRepo, weightRepo } from "./db";
import { DrawerParams } from "./drawer-params";
-import Select from "./Select";
import Settings from "./settings";
-import StackHeader from "./StackHeader";
import { toast } from "./toast";
import Weight from "./weight";
@@ -149,15 +150,14 @@ export default function EditWeight() {
)}
-
+
>
);
}
diff --git a/PrimaryButton.tsx b/PrimaryButton.tsx
new file mode 100644
index 0000000..6dbd63e
--- /dev/null
+++ b/PrimaryButton.tsx
@@ -0,0 +1,14 @@
+import { ComponentProps } from "react";
+import { Button, useTheme } from "react-native-paper";
+
+type PrimaryButtonProps = Omit>, "mode">;
+
+export default function PrimaryButton(props: PrimaryButtonProps) {
+ const { colors } = useTheme();
+
+ return (
+
+ );
+}
diff --git a/StartPlan.tsx b/StartPlan.tsx
index c23d795..9017be0 100644
--- a/StartPlan.tsx
+++ b/StartPlan.tsx
@@ -12,6 +12,7 @@ import {
Button,
IconButton,
ProgressBar,
+ useTheme,
} from "react-native-paper";
import { check, PERMISSIONS, request, RESULTS } from "react-native-permissions";
import AppInput from "./AppInput";
@@ -29,6 +30,7 @@ import Settings from "./settings";
import StackHeader from "./StackHeader";
import StartPlanItem from "./StartPlanItem";
import { toast } from "./toast";
+import PrimaryButton from "./PrimaryButton";
export default function StartPlan() {
const { params } = useRoute>();
@@ -38,6 +40,7 @@ export default function StartPlan() {
const [selected, setSelected] = useState(0);
const [settings, setSettings] = useState();
const [counts, setCounts] = useState();
+ const { colors } = useTheme();
const weightRef = useRef(null);
const repsRef = useRef(null);
const exercises = useMemo(() => params.plan.exercises.split(","), [params]);
@@ -241,9 +244,9 @@ export default function StartPlan() {
/>
)}
-
+
>
);
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6898a0c..c33677f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -85,8 +85,8 @@ android {
applicationId "com.massive"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 36212
- versionName "1.186"
+ versionCode 36213
+ versionName "1.187"
}
signingConfigs {
release {
diff --git a/package.json b/package.json
index 7754940..129dad6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "massive",
- "version": "1.186",
+ "version": "1.187",
"private": true,
"license": "GPL-3.0-only",
"scripts": {