From c88642b2efa0e32305ad45f14ca685aecd174bf7 Mon Sep 17 00:00:00 2001 From: Brandon Presley Date: Wed, 18 Oct 2023 10:41:12 +1300 Subject: [PATCH] =?UTF-8?q?Fix=20home=20page=20adding=20sets=20-=201.160?= =?UTF-8?q?=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EditSet.tsx | 3 ++- SetList.tsx | 5 ++++- android/app/build.gradle | 4 ++-- package.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/EditSet.tsx b/EditSet.tsx index a4d4296..3a16179 100644 --- a/EditSet.tsx +++ b/EditSet.tsx @@ -67,13 +67,14 @@ export default function EditSet() { const added = async (value: GymSet) => { startTimer(value.name); console.log(`${EditSet.name}.add`, { set: value }); - if (!settings.notify) return; + if (!settings.notify) return navigate("Sets", { reset: value.id }); if ( value.weight > set.weight || (value.reps > set.reps && value.weight === set.weight) ) { toast("Great work King! That's a new record."); } + console.log("Navigating..."); navigate("Sets", { reset: value.id }); }; diff --git a/SetList.tsx b/SetList.tsx index 42303b2..8a012af 100644 --- a/SetList.tsx +++ b/SetList.tsx @@ -31,6 +31,7 @@ export default function SetList() { const [term, setTerm] = useState(params?.search || ""); const refresh = async (gymSet: GymSet) => { + console.log(`${SetList.name}.refresh:`, gymSet); if (!sets) return; const newSets = sets.map((oldSet) => oldSet.id === gymSet.id ? gymSet : oldSet @@ -62,6 +63,7 @@ export default function SetList() { }, []); const search = (value: string) => { + console.log(`${SetList.name}.search:`, value); setTerm(value); setOffset(0); reset({ @@ -71,6 +73,7 @@ export default function SetList() { }; useEffect(() => { + console.log(`${SetList.name}.useEffect:`, params); if (!params) reset({ skip: 0, @@ -180,7 +183,7 @@ export default function SetList() { renderItem={renderItem} onEndReached={next} refreshing={refreshing} - keyExtractor={(set) => set.id.toString()} + keyExtractor={(set) => set.id?.toString()} onRefresh={() => { setOffset(0); setRefreshing(true); diff --git a/android/app/build.gradle b/android/app/build.gradle index 781d797..2caaa81 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 36185 - versionName "1.159" + versionCode 36186 + versionName "1.160" } signingConfigs { release { diff --git a/package.json b/package.json index 5b8eb1b..317de35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "massive", - "version": "1.159", + "version": "1.160", "private": true, "license": "GPL-3.0-only", "scripts": {