resize fix

This commit is contained in:
m
2026-07-29 19:43:44 +02:00
parent fe4fb6020e
commit c940d4448b
4 changed files with 134 additions and 110 deletions
+11 -5
View File
@@ -5,6 +5,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { NativeStackNavigationProp } from '@react-navigation/native-stack'; import { NativeStackNavigationProp } from '@react-navigation/native-stack';
import { MaterialIcons } from '@expo/vector-icons'; import { MaterialIcons } from '@expo/vector-icons';
import { Gesture, GestureDetector } from 'react-native-gesture-handler'; import { Gesture, GestureDetector } from 'react-native-gesture-handler';
import { runOnJS } from 'react-native-reanimated';
import { useAddTags, useMoveResources, useFolders, useFiles, useFreeLocalSpace } from '../hooks/useFiles'; import { useAddTags, useMoveResources, useFolders, useFiles, useFreeLocalSpace } from '../hooks/useFiles';
import { UnifiedFileItem, isFolder } from '../types'; import { UnifiedFileItem, isFolder } from '../types';
import { SearchBar, SearchFilters, MediaFilter } from '../components/SearchBar'; import { SearchBar, SearchFilters, MediaFilter } from '../components/SearchBar';
@@ -198,14 +199,18 @@ export function HomeScreen() {
return map; return map;
}, [sortedFiles]); }, [sortedFiles]);
const handlePinchEnd = useCallback((scale: number) => {
if (scale > 1.2) {
setNumColumns(prev => Math.max(2, prev - 1));
} else if (scale < 0.8) {
setNumColumns(prev => Math.min(6, prev + 1));
}
}, []);
const pinchGesture = useMemo(() => const pinchGesture = useMemo(() =>
Gesture.Pinch() Gesture.Pinch()
.onEnd((event) => { .onEnd((event) => {
if (event.scale > 1.2) { runOnJS(handlePinchEnd)(event.scale);
setNumColumns(prev => Math.max(2, prev - 1));
} else if (event.scale < 0.8) {
setNumColumns(prev => Math.min(6, prev + 1));
}
}), }),
[] []
); );
@@ -466,6 +471,7 @@ export function HomeScreen() {
<GestureDetector gesture={pinchGesture}> <GestureDetector gesture={pinchGesture}>
<View style={styles.listWrapper}> <View style={styles.listWrapper}>
<FlatList <FlatList
key={numColumns}
data={sortedFiles} data={sortedFiles}
keyExtractor={(item) => item.id} keyExtractor={(item) => item.id}
numColumns={numColumns} numColumns={numColumns}
+108 -96
View File
@@ -4,64 +4,65 @@ import {
Text, Text,
StyleSheet, StyleSheet,
TouchableOpacity, TouchableOpacity,
Dimensions, ScrollView,
ActivityIndicator,
} from 'react-native'; } from 'react-native';
import { useNavigation } from '@react-navigation/native'; import { useNavigation } from '@react-navigation/native';
import { MaterialIcons } from '@expo/vector-icons'; import { MaterialIcons } from '@expo/vector-icons';
import { ONBOARDING_STEPS, CURRENT_ONBOARDING_VERSION, type OnboardingStep } from '../config/onboarding'; import { ONBOARDING_STEPS, CURRENT_ONBOARDING_VERSION } from '../config/onboarding';
import { onboardingStorage } from '../services/onboardingStorage'; import { onboardingStorage } from '../services/onboardingStorage';
import { scanSubdirectories } from '../hooks/useDeviceFiles'; import { safDirectory, StoredFolder } from '../services/safDirectory';
import { safDirectory } from '../services/safDirectory';
import * as FileSystem from 'expo-file-system/legacy'; import * as FileSystem from 'expo-file-system/legacy';
const { width: SCREEN_WIDTH } = Dimensions.get('window'); function SelectFoldersStep({
selectedFolders,
type ScanState = 'idle' | 'scanning' | 'done'; onAddFolder,
onRemoveFolder,
function stepIcon(step: OnboardingStep): keyof typeof MaterialIcons.glyphMap { }: {
if (step.icon === 'waving-hand') return 'waving-hand'; selectedFolders: StoredFolder[];
if (step.icon === 'create-new-folder') return 'create-new-folder'; onAddFolder: () => void;
if (step.icon === 'check-circle') return 'check-circle'; onRemoveFolder: (folder: StoredFolder) => void;
if (step.icon === 'folder-off') return 'folder-off'; }) {
return 'info';
}
function ScanProgressView() {
return ( return (
<> <View style={styles.folderStepContent}>
<View style={styles.iconContainer}> <View style={styles.iconContainer}>
<ActivityIndicator size={48} color="#1976D2" /> <MaterialIcons name="create-new-folder" size={64} color="#1976D2" />
</View> </View>
<Text style={styles.title}>Scan en cours...</Text> <Text style={styles.title}>Ajoutez vos dossiers</Text>
<Text style={styles.description}> <Text style={styles.description}>
Dot. explore les sous-dossiers de votre stockage. Cela peut prendre quelques secondes. Sélectionnez les dossiers que vous souhaitez synchroniser avec Dot.
</Text> </Text>
</>
);
}
function ScanDoneView({ folderCount }: { folderCount: number }) { {selectedFolders.length > 0 && (
return ( <View style={styles.folderList}>
<> {selectedFolders.map((f) => (
<View style={[styles.iconContainer, { backgroundColor: '#E8F5E9' }]}> <View key={f.id} style={styles.selectedFolderRow}>
<MaterialIcons name="check-circle" size={64} color="#43A047" /> <MaterialIcons name="folder" size={20} color="#F57C00" />
</View> <Text style={styles.selectedFolderName} numberOfLines={1}>
<Text style={styles.title}>Scan terminé !</Text> {f.name}
<Text style={styles.description}> </Text>
{folderCount > 1 <TouchableOpacity
? `${folderCount} dossiers découverts et ajoutés à votre espace Dot.` onPress={() => onRemoveFolder(f)}
: '1 dossier ajouté à votre espace Dot.'} style={styles.removeBtn}
</Text> >
</> <MaterialIcons name="close" size={18} color="#E53935" />
</TouchableOpacity>
</View>
))}
</View>
)}
<TouchableOpacity style={styles.actionBtn} onPress={onAddFolder}>
<MaterialIcons name="add" size={20} color="#fff" />
<Text style={styles.actionBtnText}>Ajouter un dossier</Text>
</TouchableOpacity>
</View>
); );
} }
export function OnboardingScreen() { export function OnboardingScreen() {
const navigation = useNavigation(); const navigation = useNavigation();
const [currentIndex, setCurrentIndex] = useState(0); const [currentIndex, setCurrentIndex] = useState(0);
const [scanState, setScanState] = useState<ScanState>('idle'); const [selectedFolders, setSelectedFolders] = useState<StoredFolder[]>([]);
const [folderCount, setFolderCount] = useState(0);
const pendingSteps = onboardingStorage.getPendingSteps(); const pendingSteps = onboardingStorage.getPendingSteps();
const step = pendingSteps[currentIndex]; const step = pendingSteps[currentIndex];
@@ -71,44 +72,33 @@ export function OnboardingScreen() {
navigation.reset({ index: 0, routes: [{ name: 'Home' as never }] }); navigation.reset({ index: 0, routes: [{ name: 'Home' as never }] });
}, [navigation]); }, [navigation]);
const handleRecursiveScan = useCallback(async () => { const handlePickDirectory = useCallback(async () => {
try { try {
const result = await FileSystem.StorageAccessFramework.requestDirectoryPermissionsAsync(); const result = await FileSystem.StorageAccessFramework.requestDirectoryPermissionsAsync();
if (!result.granted) return; if (!result.granted) return;
const dirUri = result.directoryUri; const dirUri = result.directoryUri;
const parts = dirUri.split('/'); const parts = dirUri.split('/');
const dirName = decodeURIComponent(parts[parts.length - 1] ?? 'Stockage'); const dirName = decodeURIComponent(parts[parts.length - 1] ?? 'Dossier');
setScanState('scanning'); const folder = safDirectory.addFolder(dirUri, dirName);
setSelectedFolders((prev) => [...prev, folder]);
safDirectory.addFolder(dirUri, dirName);
const subdirs = await scanSubdirectories(dirUri);
if (subdirs.length > 0) {
safDirectory.addBatchFolders(
subdirs.map((d) => ({ uri: d.uri, name: d.name, source: 'recursive', parentUri: d.parentUri }))
);
}
setFolderCount(1 + subdirs.length);
setScanState('done');
safDirectory.setDiscovered();
} catch (err) { } catch (err) {
console.error('[Onboarding] recursive scan error:', err); console.error('[Onboarding] pickDirectory error:', err);
setScanState('idle');
} }
}, []); }, []);
const handleRemoveFolder = useCallback((folder: StoredFolder) => {
safDirectory.removeFolder(folder.id);
setSelectedFolders((prev) => prev.filter((f) => f.id !== folder.id));
}, []);
const handleNext = useCallback(async () => { const handleNext = useCallback(async () => {
if (!step) return; if (!step) return;
onboardingStorage.markStepSeen(step.id); onboardingStorage.markStepSeen(step.id);
if (currentIndex < pendingSteps.length - 1) { if (currentIndex < pendingSteps.length - 1) {
setCurrentIndex(currentIndex + 1); setCurrentIndex(currentIndex + 1);
setScanState('idle'); setSelectedFolders([]);
setFolderCount(0);
} else { } else {
complete(); complete();
} }
@@ -123,7 +113,7 @@ export function OnboardingScreen() {
return null; return null;
} }
const isScanStep = step.action?.type === 'recursive_scan'; const isFolderStep = step.action?.type === 'pick_directory';
return ( return (
<View style={styles.container}> <View style={styles.container}>
@@ -133,28 +123,23 @@ export function OnboardingScreen() {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={styles.content}> <ScrollView style={styles.scrollContent} contentContainerStyle={styles.scrollInner}>
{scanState === 'scanning' && isScanStep ? ( {isFolderStep ? (
<ScanProgressView /> <SelectFoldersStep
) : scanState === 'done' && isScanStep ? ( selectedFolders={selectedFolders}
<ScanDoneView folderCount={folderCount} /> onAddFolder={handlePickDirectory}
onRemoveFolder={handleRemoveFolder}
/>
) : ( ) : (
<> <View style={styles.welcomeContent}>
<View style={styles.iconContainer}> <View style={styles.iconContainer}>
<MaterialIcons name={stepIcon(step)} size={64} color="#1976D2" /> <MaterialIcons name="waving-hand" size={64} color="#1976D2" />
</View> </View>
<Text style={styles.title}>{step.title}</Text> <Text style={styles.title}>{step.title}</Text>
<Text style={styles.description}>{step.description}</Text> <Text style={styles.description}>{step.description}</Text>
</View>
{isScanStep && scanState === 'idle' && (
<TouchableOpacity style={styles.actionBtn} onPress={handleRecursiveScan}>
<MaterialIcons name="folder-open" size={20} color="#fff" />
<Text style={styles.actionBtnText}>{step.action?.label ?? 'Choisir un dossier'}</Text>
</TouchableOpacity>
)}
</>
)} )}
</View> </ScrollView>
<View style={styles.footer}> <View style={styles.footer}>
<View style={styles.dots}> <View style={styles.dots}>
@@ -166,21 +151,12 @@ export function OnboardingScreen() {
))} ))}
</View> </View>
{(!isScanStep || scanState === 'done') && ( <TouchableOpacity style={styles.nextBtn} onPress={handleNext}>
<TouchableOpacity style={styles.nextBtn} onPress={handleNext}> <Text style={styles.nextBtnText}>
<Text style={styles.nextBtnText}> {currentIndex < pendingSteps.length - 1 ? 'Suivant' : 'Commencer'}
{currentIndex < pendingSteps.length - 1 ? 'Suivant' : 'Commencer'} </Text>
</Text> <MaterialIcons name="arrow-forward" size={20} color="#fff" />
<MaterialIcons name="arrow-forward" size={20} color="#fff" /> </TouchableOpacity>
</TouchableOpacity>
)}
{isScanStep && scanState === 'idle' && (
<TouchableOpacity style={styles.nextBtn} onPress={handleNext}>
<Text style={styles.nextBtnText}>Passer cette étape</Text>
<MaterialIcons name="arrow-forward" size={20} color="#fff" />
</TouchableOpacity>
)}
</View> </View>
</View> </View>
); );
@@ -200,12 +176,24 @@ const styles = StyleSheet.create({
fontSize: 16, fontSize: 16,
color: '#999', color: '#999',
}, },
content: { scrollContent: {
flex: 1,
},
scrollInner: {
flexGrow: 1,
},
welcomeContent: {
flex: 1, flex: 1,
justifyContent: 'center', justifyContent: 'center',
alignItems: 'center', alignItems: 'center',
paddingHorizontal: 40, paddingHorizontal: 40,
}, },
folderStepContent: {
flex: 1,
alignItems: 'center',
paddingHorizontal: 40,
paddingTop: 40,
},
iconContainer: { iconContainer: {
width: 120, width: 120,
height: 120, height: 120,
@@ -227,16 +215,40 @@ const styles = StyleSheet.create({
color: '#666', color: '#666',
textAlign: 'center', textAlign: 'center',
lineHeight: 24, lineHeight: 24,
marginBottom: 20,
},
folderList: {
width: '100%',
marginBottom: 16,
},
selectedFolderRow: {
flexDirection: 'row',
alignItems: 'center',
backgroundColor: '#fafafa',
borderRadius: 10,
paddingHorizontal: 14,
paddingVertical: 12,
marginBottom: 8,
gap: 10,
},
selectedFolderName: {
flex: 1,
fontSize: 15,
color: '#333',
},
removeBtn: {
padding: 4,
}, },
actionBtn: { actionBtn: {
flexDirection: 'row', flexDirection: 'row',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center',
backgroundColor: '#F57C00', backgroundColor: '#F57C00',
borderRadius: 12, borderRadius: 12,
paddingHorizontal: 24, paddingHorizontal: 24,
paddingVertical: 14, paddingVertical: 14,
gap: 10, gap: 10,
marginTop: 32, width: '100%',
}, },
actionBtnText: { actionBtnText: {
fontSize: 16, fontSize: 16,
+7
View File
@@ -0,0 +1,7 @@
module.exports = function (api) {
api.cache(true);
return {
presets: ['babel-preset-expo'],
plugins: ['react-native-reanimated/plugin'],
};
};
+8 -9
View File
@@ -1,7 +1,7 @@
export const CURRENT_ONBOARDING_VERSION = 2; export const CURRENT_ONBOARDING_VERSION = 3;
export type OnboardingAction = { export type OnboardingAction = {
type: 'pick_directory' | 'recursive_scan'; type: 'pick_directory';
label: string; label: string;
}; };
@@ -18,18 +18,17 @@ export type OnboardingStep = {
export const ONBOARDING_STEPS: OnboardingStep[] = [ export const ONBOARDING_STEPS: OnboardingStep[] = [
{ {
id: 'welcome', id: 'welcome',
version: 2, version: 3,
title: 'Bienvenue sur Dot.', title: 'Bienvenue sur Dot.',
description: 'Votre espace document personnel, toujours accessible.', description: 'Votre espace document personnel, toujours accessible.',
icon: 'waving-hand', icon: 'waving-hand',
}, },
{ {
id: 'pick_root_folder', id: 'select_folders',
version: 2, version: 3,
title: 'Choisissez votre dossier principal', title: 'Ajoutez vos dossiers',
description: 'Sélectionnez la racine de votre stockage dans le sélecteur.\n\nDot. va scanner automatiquement tous les sous-dossiers (photos, téléchargements, documents…).', description: 'Sélectionnez les dossiers que vous souhaitez synchroniser avec Dot.\n\nAjoutez-en autant que vous voulez, vous pourrez les gérer plus tard.',
icon: 'create-new-folder', icon: 'create-new-folder',
action: { type: 'recursive_scan', label: 'Choisir le dossier principal' }, action: { type: 'pick_directory', label: 'Ajouter un dossier' },
condition: 'has_no_folders',
}, },
]; ];