v1.10.2: P0 versions sync + P1 FormatUtils résiduels + cap image annotate

Author: gitubpatrice

android/app/build.gradle.kts

@@ -54,7 +54,7 @@ android {
     defaultConfig {
         applicationId = "com.pdftech.pdf_tech"
         minSdk = flutter.minSdkVersion
-        // Pinné explicitement à 35 (cohérence avec compileSdk = 35) au lieu
+        // Pinné explicitement à 35 (cohérence avec compileSdk = 36) au lieu
         // de suivre `flutter.targetSdkVersion` qui peut diverger selon le SDK.
         targetSdk = 35
         versionCode = flutter.versionCode

lib/screens/about_screen.dart

@@ -10,7 +10,7 @@ class AboutScreen extends StatefulWidget {
 }
 
 class _AboutScreenState extends State<AboutScreen> {
-  static const _version = '1.10.0';
+  static const _version = '1.10.2';
   static const _author = 'Patrice Haltaya';
 
   bool _checkingUpdate = false;
@@ -216,7 +216,7 @@ class _AboutScreenState extends State<AboutScreen> {
                 ),
                 const SizedBox(height: 8),
                 Text(
-                  'Gestionnaire de PDF complet — 23 outils',
+                  'Gestionnaire de PDF complet — 22 outils',
                   style: Theme.of(context).textTheme.bodySmall,
                   textAlign: TextAlign.center,
                 ),

lib/screens/cloud/google_drive_screen.dart

@@ -158,12 +158,8 @@ class _GoogleDriveScreenState extends State<GoogleDriveScreen> {
   }
 
   String _formatSize(String? sizeStr) {
-    if (sizeStr == null) return '';
-    final bytes = int.tryParse(sizeStr);
-    if (bytes == null) return '';
-    if (bytes < 1024) return '$bytes o';
-    if (bytes < 1024 * 1024) return '${(bytes / 1024).toStringAsFixed(1)} Ko';
-    return '${(bytes / (1024 * 1024)).toStringAsFixed(2)} Mo';
+    final n = int.tryParse(sizeStr ?? '') ?? 0;
+    return FormatUtils.bytes(n);
   }
 
   String _formatDate(DateTime? dt) {

lib/screens/tools/decrypt_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:share_plus/share_plus.dart';
 import '../../services/pdf_tools_service.dart';
+import '../../widgets/pdf_file_header.dart';
 import '../../widgets/pdf_picker_screen.dart';
 
 class DecryptScreen extends StatefulWidget {
@@ -145,43 +146,12 @@ class _DecryptScreenState extends State<DecryptScreen> {
             // Fichier
             Text('Fichier PDF', style: Theme.of(context).textTheme.titleSmall),
             const SizedBox(height: 8),
-            _path == null
-                ? SizedBox(
-                    width: double.infinity,
-                    child: OutlinedButton.icon(
-                      onPressed: _pickFile,
-                      icon: const Icon(Icons.folder_open),
-                      label: const Text('Choisir un PDF'),
-                      style: OutlinedButton.styleFrom(
-                        minimumSize: const Size(0, 48),
-                      ),
-                    ),
-                  )
-                : ListTile(
-                    contentPadding: EdgeInsets.zero,
-                    leading: Container(
-                      width: 40,
-                      height: 40,
-                      decoration: BoxDecoration(
-                        color: Colors.red.withValues(alpha: 0.1),
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                      child: const Icon(
-                        Icons.picture_as_pdf,
-                        color: Colors.red,
-                        size: 22,
-                      ),
-                    ),
-                    title: Text(
-                      _name!,
-                      overflow: TextOverflow.ellipsis,
-                      style: const TextStyle(fontSize: 13),
-                    ),
-                    trailing: TextButton(
-                      onPressed: _pickFile,
-                      child: const Text('Changer'),
-                    ),
-                  ),
+            PdfFilePickerCard(
+              fileName: _name,
+              onPick: _pickFile,
+              pickLabel: _path == null ? 'Choisir' : 'Changer',
+              emptyLabel: 'Choisir un PDF',
+            ),
             const SizedBox(height: 24),
 
             // Mot de passe

lib/screens/tools/images_to_pdf_screen.dart

@@ -43,18 +43,42 @@ class _ImagesToPdfScreenState extends State<ImagesToPdfScreen> {
   bool _isProcessing = false;
 
   Future<void> _pickImages() async {
+    final messenger = ScaffoldMessenger.of(context);
     final result = await FilePicker.pickFiles(
       type: FileType.image,
       allowMultiple: true,
     );
     if (result == null) return;
-    setState(() {
-      for (final f in result.files) {
-        if (f.path != null && !_images.contains(f.path)) {
-          _images.add(f.path!);
+    final accepted = <String>[];
+    var skipped = 0;
+    for (final f in result.files) {
+      final p = f.path;
+      if (p == null || _images.contains(p)) continue;
+      try {
+        final len = await File(p).length();
+        if (len > 20 * 1024 * 1024) {
+          skipped++;
+          continue;
         }
+      } catch (_) {
+        skipped++;
+        continue;
       }
+      accepted.add(p);
+    }
+    if (!mounted) return;
+    setState(() {
+      _images.addAll(accepted);
     });
+    if (skipped > 0) {
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text(
+            '$skipped image${skipped > 1 ? 's' : ''} ignorée${skipped > 1 ? 's' : ''} (>20 Mo)',
+          ),
+        ),
+      );
+    }
   }
 
   Future<void> _convert() async {

lib/screens/tools/merge_screen.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
+import 'package:files_tech_core/files_tech_core.dart';
 import '../../services/pdf_tools_service.dart';
 import '../../widgets/pdf_picker_screen.dart';
 import '../../widgets/result_sheet.dart';
@@ -73,12 +74,7 @@ class _MergeScreenState extends State<MergeScreen> {
   }
 
   String _fileName(String path) => path.split(RegExp(r'[/\\]')).last;
-  String _fileSize(String path) {
-    final bytes = _fileSizes[path] ?? 0;
-    return bytes < 1024 * 1024
-        ? '${(bytes / 1024).toStringAsFixed(1)} Ko'
-        : '${(bytes / (1024 * 1024)).toStringAsFixed(1)} Mo';
-  }
+  String _fileSize(String path) => FormatUtils.bytes(_fileSizes[path] ?? 0);
 
   @override
   Widget build(BuildContext context) {

lib/screens/tools/pdf_annotate_screen.dart

@@ -133,7 +133,15 @@ class _PdfAnnotateScreenState extends State<PdfAnnotateScreen> {
     final messenger = ScaffoldMessenger.of(context);
     final res = await FilePicker.pickFiles(type: FileType.image);
     if (res == null || res.files.single.path == null) return;
-    final bytes = await File(res.files.single.path!).readAsBytes();
+    final imgFile = File(res.files.single.path!);
+    final length = await imgFile.length();
+    if (length > 30 * 1024 * 1024) {
+      messenger.showSnackBar(
+        const SnackBar(content: Text('Image trop volumineuse (>30 Mo)')),
+      );
+      return;
+    }
+    final bytes = await imgFile.readAsBytes();
     if (bytes.isEmpty) return;
     // Validation : on tente de décoder via PdfBitmap pour détecter les
     // images non supportées (HEIC sans codec, fichiers corrompus, etc.)

lib/services/app_update.dart

@@ -6,5 +6,5 @@ import 'package:files_tech_core/files_tech_core.dart';
 const appUpdateService = UpdateService(
   owner: 'gitubpatrice',
   repo: 'PDF-TECH',
-  currentVersion: '1.10.0',
+  currentVersion: '1.10.2',
 );

pubspec.yaml

@@ -1,7 +1,7 @@
 name: pdf_tech
 description: "Application de gestion de PDF - lecture, annotation, création, partage"
 publish_to: 'none'
-version: 1.10.1+11001
+version: 1.10.2+11002
 
 environment:
   sdk: ^3.11.5