add floating nav bar + regroup files by date

This commit is contained in:
m
2026-09-10 22:21:46 +02:00
parent 6332e9cac4
commit 367073ed89
7 changed files with 182 additions and 30 deletions
+2
View File
@@ -28,6 +28,8 @@ function AuthGate() {
<> <>
<Stack> <Stack>
<Stack.Screen name="index" options={{ title: i18n.t('files') }} /> <Stack.Screen name="index" options={{ title: i18n.t('files') }} />
<Stack.Screen name="search" options={{ title: i18n.t('search') }} />
<Stack.Screen name="settings" options={{ title: i18n.t('configuration') }} />
<Stack.Screen name="folder/[id]" options={{ title: i18n.t('folder') }} /> <Stack.Screen name="folder/[id]" options={{ title: i18n.t('folder') }} />
<Stack.Screen name="login" options={{ title: i18n.t('login_title') }} /> <Stack.Screen name="login" options={{ title: i18n.t('login_title') }} />
</Stack> </Stack>
+123 -28
View File
@@ -1,21 +1,89 @@
import { useFocusEffect, useRouter } from 'expo-router'; import { Stack, useFocusEffect } from 'expo-router';
import { StatusBar } from 'expo-status-bar'; import { StatusBar } from 'expo-status-bar';
import { Ionicons } from '@expo/vector-icons';
import { useCallback, useState } from 'react'; import { useCallback, useState } from 'react';
import { FlatList, Pressable, StyleSheet, Text, View } from 'react-native'; import { Pressable, SectionList, StyleSheet, Text, View } from 'react-native';
import { syncRoot } from '../features/syncDevice'; import { syncRoot } from '../features/syncDevice';
import { pickDirectory } from '../services/safDirectory'; import { pickDirectory } from '../services/safDirectory';
import { getFolders, saveDirectory } from '../services/localStorage'; import { getFiles, saveDirectory } from '../services/localStorage';
import type { StoredFolder } from '../services/db/types'; import type { StoredFile } from '../services/db/types';
import FloatingNavBar from '../components/FloatingNavBar';
import i18n from '../i18n'; import i18n from '../i18n';
type FilePair = {
key: string;
left: StoredFile;
right: StoredFile | null;
};
type FileSection = {
key: string;
dayLabel: string;
data: FilePair[];
};
function formatSize(bytes: number): string {
if ( bytes < 1024 ) return `${bytes} ${i18n.t('bytes')}`;
if ( bytes < 1024 * 1024 ) return `${(bytes / 1024).toFixed(1)} ${i18n.t('kilobytes')}`;
return `${(bytes / (1024 * 1024)).toFixed(1)} ${i18n.t('megabytes')}`;
}
function formatDay(timestamp: number): string {
return new Intl.DateTimeFormat(i18n.locale, { day: 'numeric', month: 'long', year: 'numeric' }).format(timestamp);
}
function startOfDay(timestamp: number): number {
const date = new Date(timestamp);
date.setHours(0, 0, 0, 0);
return date.getTime();
}
function chunkToPairs(files: StoredFile[]): FilePair[] {
const pairs: FilePair[] = [];
for ( let i = 0; i < files.length; i += 2 ) {
pairs.push({
key: files[i].resource_id + (files[i + 1]?.resource_id ?? ''),
left: files[i],
right: files[i + 1] ?? null,
});
}
return pairs;
}
function groupFilesByDay(files: StoredFile[]): FileSection[] {
const byDay = new Map<number, StoredFile[]>();
for ( const file of files ) {
const day = startOfDay(file.addedAt);
const bucket = byDay.get(day);
if ( bucket ) bucket.push(file);
else byDay.set(day, [file]);
}
return [...byDay.entries()]
.sort((a, b) => b[0] - a[0])
.map(([day, data]) => ({
key: String(day),
dayLabel: formatDay(day),
data: chunkToPairs(data.sort((a, b) => b.addedAt - a.addedAt)),
}));
}
function FileCard({ file }: { file: StoredFile }) {
return (
<View style={styles.card}>
<Ionicons name="document-outline" size={28} color="#1a73e8" />
<Text style={styles.cardTitle} numberOfLines={1}>{file.name}</Text>
<Text style={styles.cardMeta}>{formatSize(file.size)}</Text>
</View>
);
}
export default function Index() { export default function Index() {
const router = useRouter(); const [sections, setSections] = useState<FileSection[]>([]);
const [roots, setRoots] = useState<StoredFolder[]>([]);
const load = useCallback(async () => { const load = useCallback(async () => {
const saved = await getFolders(); const files = await getFiles();
setRoots(saved.filter((folder) => folder.parent_resource_id === null)); setSections(groupFilesByDay(files));
}, []); }, []);
useFocusEffect( useFocusEffect(
@@ -39,28 +107,32 @@ export default function Index() {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<Stack.Screen options={{ title: i18n.t('files') }} />
<StatusBar style="auto" /> <StatusBar style="auto" />
<Pressable style={styles.button} onPress={handlePickDirectory}> <Pressable style={styles.button} onPress={handlePickDirectory}>
<Text style={styles.buttonText}>{i18n.t('add_folder')}</Text> <Text style={styles.buttonText}>{i18n.t('add_folder')}</Text>
</Pressable> </Pressable>
<FlatList <SectionList
data={roots} sections={sections}
keyExtractor={(item) => item.resource_id} keyExtractor={(item) => item.key}
renderItem={({ item }) => ( renderSectionHeader={({ section }) => (
<Pressable <Text style={styles.sectionHeader}>{section.dayLabel}</Text>
style={styles.row}
onPress={() => router.push(`/folder/${item.resource_id}`)}
>
<Text style={styles.rowTitle}>{item.name}</Text>
<Text style={styles.rowMeta}>{item.syncStatus}</Text>
</Pressable>
)} )}
renderItem={({ item }) => (
<View style={styles.row}>
<FileCard file={item.left} />
{item.right ? <FileCard file={item.right} /> : <View style={styles.cardSpacer} />}
</View>
)}
stickySectionHeadersEnabled
contentContainerStyle={styles.listContent}
ListEmptyComponent={ ListEmptyComponent={
<Text style={styles.empty}> <Text style={styles.empty}>
{i18n.t('no_folders_yet')} {i18n.t('no_files_yet')}
</Text> </Text>
} }
/> />
<FloatingNavBar />
</View> </View>
); );
} }
@@ -69,30 +141,53 @@ const styles = StyleSheet.create({
container: { container: {
flex: 1, flex: 1,
backgroundColor: '#fff', backgroundColor: '#fff',
padding: 16,
}, },
button: { button: {
backgroundColor: '#1a73e8', backgroundColor: '#1a73e8',
paddingVertical: 12, paddingVertical: 12,
borderRadius: 8, borderRadius: 8,
alignItems: 'center', alignItems: 'center',
marginBottom: 16, margin: 16,
}, },
buttonText: { buttonText: {
color: '#fff', color: '#fff',
fontSize: 16, fontSize: 16,
fontWeight: '600', fontWeight: '600',
}, },
listContent: {
paddingHorizontal: 16,
paddingBottom: 110,
},
row: { row: {
paddingVertical: 14, flexDirection: 'row',
borderBottomWidth: StyleSheet.hairlineWidth, gap: 12,
borderBottomColor: '#ddd', marginBottom: 12,
}, },
rowTitle: { sectionHeader: {
fontSize: 16, fontSize: 14,
fontWeight: '600',
color: '#6b7280',
textTransform: 'uppercase',
marginBottom: 12,
backgroundColor: '#fff',
},
card: {
flex: 1,
backgroundColor: '#f7f8fa',
borderRadius: 10,
padding: 12,
borderWidth: StyleSheet.hairlineWidth,
borderColor: '#eaeaea',
},
cardSpacer: {
flex: 1,
},
cardTitle: {
fontSize: 14,
fontWeight: '500', fontWeight: '500',
marginTop: 8,
}, },
rowMeta: { cardMeta: {
fontSize: 12, fontSize: 12,
color: '#888', color: '#888',
marginTop: 2, marginTop: 2,
+22
View File
@@ -0,0 +1,22 @@
import { Stack } from 'expo-router';
import { StatusBar } from 'expo-status-bar';
import { StyleSheet, View } from 'react-native';
import FloatingNavBar from '../components/FloatingNavBar';
import i18n from '../i18n';
export default function Search() {
return (
<View style={styles.container}>
<Stack.Screen options={{ title: i18n.t('search') }} />
<StatusBar style="auto" />
<FloatingNavBar />
</View>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
},
});
+22
View File
@@ -0,0 +1,22 @@
import { Stack } from 'expo-router';
import { StatusBar } from 'expo-status-bar';
import { StyleSheet, View } from 'react-native';
import FloatingNavBar from '../components/FloatingNavBar';
import i18n from '../i18n';
export default function Settings() {
return (
<View style={styles.container}>
<Stack.Screen options={{ title: i18n.t('configuration') }} />
<StatusBar style="auto" />
<FloatingNavBar />
</View>
);
}
const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#fff',
},
});
+1 -2
View File
@@ -43,7 +43,6 @@ export default function FloatingNavBar() {
const router = useRouter(); const router = useRouter();
const pathname = usePathname(); const pathname = usePathname();
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
const { t } = i18n;
return ( return (
<View style={[styles.wrapper, { bottom: Math.max(insets.bottom, 16) }]}> <View style={[styles.wrapper, { bottom: Math.max(insets.bottom, 16) }]}>
@@ -76,7 +75,7 @@ export default function FloatingNavBar() {
]} ]}
numberOfLines={1} numberOfLines={1}
> >
{t(tab.labelKey)} {i18n.t(tab.labelKey)}
</Text> </Text>
</Pressable> </Pressable>
); );
+6
View File
@@ -2,8 +2,14 @@
"files": "Files", "files": "Files",
"search": "Search", "search": "Search",
"configuration": "Settings", "configuration": "Settings",
"nav": {
"files": "Files",
"search": "Search",
"settings": "Settings"
},
"add_folder": "Add a folder", "add_folder": "Add a folder",
"no_folders_yet": "No folders yet. Tap \"Add a folder\" to sync a folder.", "no_folders_yet": "No folders yet. Tap \"Add a folder\" to sync a folder.",
"no_files_yet": "No files yet. Tap \"Add a folder\" to sync your files.",
"folder": "Folder", "folder": "Folder",
"empty_folder": "Empty folder — next syncDevice will refresh it.", "empty_folder": "Empty folder — next syncDevice will refresh it.",
"bytes": "B", "bytes": "B",
+6
View File
@@ -2,8 +2,14 @@
"files": "Fichiers", "files": "Fichiers",
"search": "Recherche", "search": "Recherche",
"configuration": "Configuration", "configuration": "Configuration",
"nav": {
"files": "Fichiers",
"search": "Recherche",
"settings": "Réglages"
},
"add_folder": "Ajouter un dossier", "add_folder": "Ajouter un dossier",
"no_folders_yet": "Aucun dossier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser un dossier.", "no_folders_yet": "Aucun dossier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser un dossier.",
"no_files_yet": "Aucun fichier pour le moment. Appuie sur « Ajouter un dossier » pour synchroniser tes fichiers.",
"folder": "Dossier", "folder": "Dossier",
"empty_folder": "Dossier vide — le prochain syncDevice l'actualisera.", "empty_folder": "Dossier vide — le prochain syncDevice l'actualisera.",
"bytes": "o", "bytes": "o",