Add RefreshControl to Album view
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import React, { useCallback, useEffect } from 'react';
|
import React, { useCallback, useEffect } from 'react';
|
||||||
import TrackPlayer from 'react-native-track-player';
|
import TrackPlayer from 'react-native-track-player';
|
||||||
import { StackParams } from '../types';
|
import { StackParams } from '../types';
|
||||||
import { Text, ScrollView, Dimensions, Button, TouchableOpacity } from 'react-native';
|
import { Text, ScrollView, Dimensions, Button, TouchableOpacity, RefreshControl } from 'react-native';
|
||||||
import { generateTrack, useGetImage } from '../../../utility/JellyfinApi';
|
import { generateTrack, useGetImage } from '../../../utility/JellyfinApi';
|
||||||
import styled from 'styled-components/native';
|
import styled from 'styled-components/native';
|
||||||
import { useRoute, RouteProp } from '@react-navigation/native';
|
import { useRoute, RouteProp } from '@react-navigation/native';
|
||||||
@@ -51,6 +51,7 @@ const Album: React.FC = () => {
|
|||||||
const { params: { id } } = useRoute<Route>();
|
const { params: { id } } = useRoute<Route>();
|
||||||
const tracks = useTypedSelector((state) => state.music.tracks.entities);
|
const tracks = useTypedSelector((state) => state.music.tracks.entities);
|
||||||
const album = useTypedSelector((state) => state.music.albums.entities[id]);
|
const album = useTypedSelector((state) => state.music.albums.entities[id]);
|
||||||
|
const isLoading = useTypedSelector((state) => state.music.tracks.isLoading);
|
||||||
const credentials = useTypedSelector((state) => state.settings.jellyfin);
|
const credentials = useTypedSelector((state) => state.settings.jellyfin);
|
||||||
|
|
||||||
// Retrieve helpers
|
// Retrieve helpers
|
||||||
@@ -72,12 +73,18 @@ const Album: React.FC = () => {
|
|||||||
await TrackPlayer.skip(album.Tracks[0]);
|
await TrackPlayer.skip(album.Tracks[0]);
|
||||||
TrackPlayer.play();
|
TrackPlayer.play();
|
||||||
}, [tracks, credentials]);
|
}, [tracks, credentials]);
|
||||||
|
const refresh = useCallback(() => { dispatch(fetchTracksByAlbum(id)); }, [id]);
|
||||||
|
|
||||||
// Retrieve album tracks on load
|
// Retrieve album tracks on load
|
||||||
useEffect(() => { dispatch(fetchTracksByAlbum(id)); }, []);
|
useEffect(refresh, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollView style={{ backgroundColor: '#f6f6f6', padding: 20, paddingBottom: 50 }}>
|
<ScrollView
|
||||||
|
style={{ backgroundColor: '#f6f6f6', padding: 20, paddingBottom: 50 }}
|
||||||
|
refreshControl={
|
||||||
|
<RefreshControl refreshing={isLoading} onRefresh={refresh} />
|
||||||
|
}
|
||||||
|
>
|
||||||
<AlbumImage source={{ uri: getImage(album.Id) }} />
|
<AlbumImage source={{ uri: getImage(album.Id) }} />
|
||||||
<Text style={{ fontSize: 36, fontWeight: 'bold' }} >{album?.Name}</Text>
|
<Text style={{ fontSize: 36, fontWeight: 'bold' }} >{album?.Name}</Text>
|
||||||
<Text style={{ fontSize: 24, opacity: 0.5, marginBottom: 24 }}>{album?.AlbumArtist}</Text>
|
<Text style={{ fontSize: 24, opacity: 0.5, marginBottom: 24 }}>{album?.AlbumArtist}</Text>
|
||||||
|
|||||||
@@ -21,7 +21,9 @@ const persistedReducer = persistReducer(persistConfig, reducers);
|
|||||||
|
|
||||||
const store = configureStore({
|
const store = configureStore({
|
||||||
reducer: persistedReducer,
|
reducer: persistedReducer,
|
||||||
middleware: getDefaultMiddleware({ serializableCheck: false }).concat(logger, ),
|
middleware: getDefaultMiddleware({ serializableCheck: false, immutableCheck: false }).concat(
|
||||||
|
logger
|
||||||
|
),
|
||||||
});
|
});
|
||||||
|
|
||||||
export type AppState = ReturnType<typeof store.getState>;
|
export type AppState = ReturnType<typeof store.getState>;
|
||||||
|
|||||||
@@ -51,9 +51,7 @@ export function generateTrack(track: AlbumTrack, credentials: Credentials): Trac
|
|||||||
title: track.Name,
|
title: track.Name,
|
||||||
artist: track.Artists.join(', '),
|
artist: track.Artists.join(', '),
|
||||||
album: track.Album,
|
album: track.Album,
|
||||||
// genre: Array.isArray(track.Genres) ? track.Genres[0] : undefined,
|
|
||||||
artwork: getImage(track.Id, credentials),
|
artwork: getImage(track.Id, credentials),
|
||||||
...generateConfig(credentials),
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user