Validate numbers in EditWorkout - 1.147

This commit is contained in:
Brandon Presley 2023-08-12 15:36:24 +12:00
parent f51284e4ea
commit af96ec8507
3 changed files with 17 additions and 5 deletions

View File

@ -12,9 +12,11 @@ import AppInput from "./AppInput";
import ConfirmDialog from "./ConfirmDialog"; import ConfirmDialog from "./ConfirmDialog";
import { MARGIN, PADDING } from "./constants"; import { MARGIN, PADDING } from "./constants";
import { getNow, planRepo, setRepo, settingsRepo } from "./db"; import { getNow, planRepo, setRepo, settingsRepo } from "./db";
import { fixNumeric } from "./fix-numeric";
import { defaultSet } from "./gym-set"; import { defaultSet } from "./gym-set";
import Settings from "./settings"; import Settings from "./settings";
import StackHeader from "./StackHeader"; import StackHeader from "./StackHeader";
import { toast } from "./toast";
import { WorkoutsPageParams } from "./WorkoutsPage"; import { WorkoutsPageParams } from "./WorkoutsPage";
export default function EditWorkout() { export default function EditWorkout() {
@ -131,7 +133,12 @@ export default function EditWorkout() {
<AppInput <AppInput
innerRef={setsRef} innerRef={setsRef}
value={sets} value={sets}
onChangeText={setSets} onChangeText={(newSets) => {
const fixed = fixNumeric(newSets);
setSets(fixed);
if (fixed.length !== newSets.length)
toast("Sets must be a number");
}}
label="Sets per workout" label="Sets per workout"
keyboardType="numeric" keyboardType="numeric"
onSubmitEditing={() => minutesRef.current?.focus()} onSubmitEditing={() => minutesRef.current?.focus()}
@ -142,7 +149,12 @@ export default function EditWorkout() {
innerRef={minutesRef} innerRef={minutesRef}
onSubmitEditing={() => secondsRef.current?.focus()} onSubmitEditing={() => secondsRef.current?.focus()}
value={minutes} value={minutes}
onChangeText={setMinutes} onChangeText={(newMinutes) => {
const fixed = fixNumeric(newMinutes);
setMinutes(fixed);
if (fixed.length !== newMinutes.length)
toast("Reps must be a number");
}}
label="Rest minutes" label="Rest minutes"
keyboardType="numeric" keyboardType="numeric"
/> />

View File

@ -85,8 +85,8 @@ android {
applicationId "com.massive" applicationId "com.massive"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 36172 versionCode 36173
versionName "1.146" versionName "1.147"
} }
signingConfigs { signingConfigs {
release { release {

View File

@ -1,6 +1,6 @@
{ {
"name": "massive", "name": "massive",
"version": "1.146", "version": "1.147",
"private": true, "private": true,
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"scripts": { "scripts": {