Fix showing new workout image in workouts list
This commit is contained in:
parent
03e284ed87
commit
0f9ed2257b
|
@ -1,9 +1,9 @@
|
||||||
import {NavigationProp, useNavigation} from '@react-navigation/native';
|
import {NavigationProp, useNavigation} from '@react-navigation/native';
|
||||||
import React, {useCallback, useEffect, useState} from 'react';
|
import React, {useCallback, useState} from 'react';
|
||||||
import {GestureResponderEvent, Image} from 'react-native';
|
import {GestureResponderEvent, Image} from 'react-native';
|
||||||
import {List, Menu, Text} from 'react-native-paper';
|
import {List, Menu, Text} from 'react-native-paper';
|
||||||
import ConfirmDialog from './ConfirmDialog';
|
import ConfirmDialog from './ConfirmDialog';
|
||||||
import {deleteSetsBy, getSets} from './set.service';
|
import {deleteSetsBy} from './set.service';
|
||||||
import Workout from './workout';
|
import Workout from './workout';
|
||||||
import {WorkoutsPageParams} from './WorkoutsPage';
|
import {WorkoutsPageParams} from './WorkoutsPage';
|
||||||
|
|
||||||
|
@ -17,15 +17,8 @@ export default function WorkoutItem({
|
||||||
const [showMenu, setShowMenu] = useState(false);
|
const [showMenu, setShowMenu] = useState(false);
|
||||||
const [anchor, setAnchor] = useState({x: 0, y: 0});
|
const [anchor, setAnchor] = useState({x: 0, y: 0});
|
||||||
const [showRemove, setShowRemove] = useState('');
|
const [showRemove, setShowRemove] = useState('');
|
||||||
const [uri, setUri] = useState<string>();
|
|
||||||
const navigation = useNavigation<NavigationProp<WorkoutsPageParams>>();
|
const navigation = useNavigation<NavigationProp<WorkoutsPageParams>>();
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
getSets({search: item.name, limit: 1, offset: 0}).then(sets =>
|
|
||||||
setUri(sets[0]?.image),
|
|
||||||
);
|
|
||||||
}, [item.name]);
|
|
||||||
|
|
||||||
const remove = useCallback(async () => {
|
const remove = useCallback(async () => {
|
||||||
await deleteSetsBy(item.name);
|
await deleteSetsBy(item.name);
|
||||||
setShowMenu(false);
|
setShowMenu(false);
|
||||||
|
@ -48,7 +41,12 @@ export default function WorkoutItem({
|
||||||
onLongPress={longPress}
|
onLongPress={longPress}
|
||||||
right={() => (
|
right={() => (
|
||||||
<>
|
<>
|
||||||
{uri && <Image source={{uri}} style={{height: 75, width: 75}} />}
|
{item.image && (
|
||||||
|
<Image
|
||||||
|
source={{uri: item.image}}
|
||||||
|
style={{height: 75, width: 75}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<Text
|
<Text
|
||||||
style={{
|
style={{
|
||||||
alignSelf: 'center',
|
alignSelf: 'center',
|
||||||
|
|
|
@ -112,7 +112,7 @@ export const getWorkouts = async ({
|
||||||
offset,
|
offset,
|
||||||
}: PageParams): Promise<Workout[]> => {
|
}: PageParams): Promise<Workout[]> => {
|
||||||
const select = `
|
const select = `
|
||||||
SELECT DISTINCT sets.name
|
SELECT DISTINCT sets.name, sets.image
|
||||||
FROM sets
|
FROM sets
|
||||||
WHERE sets.name LIKE ?
|
WHERE sets.name LIKE ?
|
||||||
ORDER BY sets.name
|
ORDER BY sets.name
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
export default interface Workout {
|
export default interface Workout {
|
||||||
name: string;
|
name: string;
|
||||||
sets: number;
|
sets: number;
|
||||||
|
image: string;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user