Allow retries for failed tracks

src/screens/Downloads/index.tsx

@@ -1,17 +1,19 @@
 import useDefaultStyles from 'components/Colors';
 import React, { useCallback, useMemo } from 'react';
-import { Pressable, Text, View } from 'react-native';
+import { Text, TouchableOpacity, View } from 'react-native';
 import { FlatList } from 'react-native-gesture-handler';
 import { SafeAreaView } from 'react-native-safe-area-context';
 import { useTypedSelector } from 'store';
 import formatBytes from 'utility/formatBytes';
 import TrashIcon from 'assets/trash.svg';
+import ArrowClockwise from 'assets/arrow-clockwise.svg';
 import { THEME_COLOR } from 'CONSTANTS';
 import { useDispatch } from 'react-redux';
 import { EntityId } from '@reduxjs/toolkit';
-import { removeDownloadedTrack } from 'store/downloads/actions';
+import { downloadTrack, removeDownloadedTrack } from 'store/downloads/actions';
 import Button from 'components/Button';
 import { t } from 'i18n-js';
+import DownloadIcon from 'components/DownloadIcon';
 
 function Downloads() {
     const defaultStyles = useDefaultStyles();
@@ -25,13 +27,18 @@ function Downloads() {
         ids?.reduce<number>((sum, id) => sum + (entities[id]?.size || 0), 0)
     ), [ids, entities]);
 
+    // Describe handlers
     const handleDelete = useCallback((id: EntityId) => {
         dispatch(removeDownloadedTrack(id));
     }, [dispatch]);
     const handleDeleteAllTracks = useCallback(() => {
         ids.forEach((id) => dispatch(removeDownloadedTrack(id)));
     }, [dispatch, ids]);
+    const retryTrack = useCallback((id: EntityId) => {
+        dispatch(downloadTrack(id));
+    }, [dispatch]);
 
+    // If no tracks have beend ownloaded, show a short message describing this
     if (!ids.length) {
         return (
             <View style={{ margin: 24, flex: 1, alignItems: 'center', justifyContent: 'center' }}>
@@ -43,37 +50,66 @@ function Downloads() {
     }
 
     return (
-        <SafeAreaView style={{ flex: 1, marginHorizontal: 24 }}>
+        <SafeAreaView style={{ flex: 1 }}>
             <FlatList
                 style={{ flex: 1 }}
+                contentContainerStyle={{ flexGrow: 1 }}
                 ListHeaderComponent={
                     <Text style={[{ textAlign: 'center', marginVertical: 6 }, defaultStyles.textHalfOpacity]}>
                         {t('total-download-size')}: {formatBytes(totalDownloadSize)}
                     </Text>
                 }
                 ListFooterComponent={
-                    <Button
-                        icon={TrashIcon}
-                        title={t('delete-all-tracks')}
-                        onPress={handleDeleteAllTracks}
-                        disabled={!ids.length}
-                        style={{ marginTop: 8 }}
-                    />
+                    <View style={{ marginHorizontal: 20 }}>
+                        <Button
+                            icon={TrashIcon}
+                            title={t('delete-all-tracks')}
+                            onPress={handleDeleteAllTracks}
+                            disabled={!ids.length}
+                            style={{ marginTop: 8 }}
+                        />
+                    </View>
                 }
                 data={ids}
                 renderItem={({ item }) => (
-                    <View style={{ flex: 1, flexDirection: 'row', paddingVertical: 8, alignItems: 'center' }}>
-                        <View>
-                            <Text style={{ fontSize: 16, marginBottom: 4 }} numberOfLines={1}>{tracks[item]?.Name}</Text>
-                            <Text style={[{ flexShrink: 1, fontSize: 11 }, defaultStyles.textHalfOpacity]} numberOfLines={1}>{tracks[item]?.AlbumArtist} ({tracks[item]?.Album})</Text>
+                    <View
+                        style={[
+                            {
+                                flex: 1, 
+                                flexDirection: 'row', 
+                                paddingVertical: 12, 
+                                alignItems: 'center', 
+                                marginHorizontal: 20, 
+                                borderBottomWidth: 1,
+                            },
+                            defaultStyles.border,
+                        ]}
+                    >
+                        <View style={{ marginRight: 12 }}>
+                            <DownloadIcon trackId={item} />
+                        </View>
+                        <View style={{ flexShrink: 1, marginRight: 8 }}>
+                            <Text style={{ fontSize: 16, marginBottom: 4 }} numberOfLines={1}>
+                                {tracks[item]?.Name}
+                            </Text>
+                            <Text style={[{ flexShrink: 1, fontSize: 11 }, defaultStyles.textHalfOpacity]} numberOfLines={1}>
+                                {tracks[item]?.AlbumArtist} ({tracks[item]?.Album})
+                            </Text>
                         </View>
                         <View style={{ marginLeft: 'auto', flexDirection: 'row', alignItems: 'center' }}>
-                            <Text style={[defaultStyles.textHalfOpacity, { marginRight: 6 }]}>
-                                {formatBytes(entities[item]?.size || 0)}
-                            </Text>
-                            <Pressable onPress={() => handleDelete(item)}>
+                            {entities[item]?.isComplete && entities[item]?.size ? (
+                                <Text style={[defaultStyles.textHalfOpacity, { marginRight: 6, fontSize: 12 }]}>
+                                    {formatBytes(entities[item]?.size || 0)}
+                                </Text>
+                            ) : null}
+                            <TouchableOpacity onPress={() => handleDelete(item)}>
                                 <TrashIcon height={24} width={24} fill={THEME_COLOR} />
-                            </Pressable>
+                            </TouchableOpacity>
+                            {!entities[item]?.isComplete && (
+                                <TouchableOpacity onPress={() => retryTrack(item)}>
+                                    <ArrowClockwise height={18} width={18} fill={THEME_COLOR} />
+                                </TouchableOpacity>
+                            )}
                         </View>
                     </View>
                 )}