Fix home page adding sets - 1.160 🚀
This commit is contained in:
parent
4cca538d74
commit
c88642b2ef
|
@ -67,13 +67,14 @@ export default function EditSet() {
|
||||||
const added = async (value: GymSet) => {
|
const added = async (value: GymSet) => {
|
||||||
startTimer(value.name);
|
startTimer(value.name);
|
||||||
console.log(`${EditSet.name}.add`, { set: value });
|
console.log(`${EditSet.name}.add`, { set: value });
|
||||||
if (!settings.notify) return;
|
if (!settings.notify) return navigate("Sets", { reset: value.id });
|
||||||
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)
|
||||||
) {
|
) {
|
||||||
toast("Great work King! That's a new record.");
|
toast("Great work King! That's a new record.");
|
||||||
}
|
}
|
||||||
|
console.log("Navigating...");
|
||||||
navigate("Sets", { reset: value.id });
|
navigate("Sets", { reset: value.id });
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@ export default function SetList() {
|
||||||
const [term, setTerm] = useState(params?.search || "");
|
const [term, setTerm] = useState(params?.search || "");
|
||||||
|
|
||||||
const refresh = async (gymSet: GymSet) => {
|
const refresh = async (gymSet: GymSet) => {
|
||||||
|
console.log(`${SetList.name}.refresh:`, gymSet);
|
||||||
if (!sets) return;
|
if (!sets) return;
|
||||||
const newSets = sets.map((oldSet) =>
|
const newSets = sets.map((oldSet) =>
|
||||||
oldSet.id === gymSet.id ? gymSet : oldSet
|
oldSet.id === gymSet.id ? gymSet : oldSet
|
||||||
|
@ -62,6 +63,7 @@ export default function SetList() {
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const search = (value: string) => {
|
const search = (value: string) => {
|
||||||
|
console.log(`${SetList.name}.search:`, value);
|
||||||
setTerm(value);
|
setTerm(value);
|
||||||
setOffset(0);
|
setOffset(0);
|
||||||
reset({
|
reset({
|
||||||
|
@ -71,6 +73,7 @@ export default function SetList() {
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
console.log(`${SetList.name}.useEffect:`, params);
|
||||||
if (!params)
|
if (!params)
|
||||||
reset({
|
reset({
|
||||||
skip: 0,
|
skip: 0,
|
||||||
|
@ -180,7 +183,7 @@ export default function SetList() {
|
||||||
renderItem={renderItem}
|
renderItem={renderItem}
|
||||||
onEndReached={next}
|
onEndReached={next}
|
||||||
refreshing={refreshing}
|
refreshing={refreshing}
|
||||||
keyExtractor={(set) => set.id.toString()}
|
keyExtractor={(set) => set.id?.toString()}
|
||||||
onRefresh={() => {
|
onRefresh={() => {
|
||||||
setOffset(0);
|
setOffset(0);
|
||||||
setRefreshing(true);
|
setRefreshing(true);
|
||||||
|
|
|
@ -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 36185
|
versionCode 36186
|
||||||
versionName "1.159"
|
versionName "1.160"
|
||||||
}
|
}
|
||||||
signingConfigs {
|
signingConfigs {
|
||||||
release {
|
release {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "massive",
|
"name": "massive",
|
||||||
"version": "1.159",
|
"version": "1.160",
|
||||||
"private": true,
|
"private": true,
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user