Improve auto backup (#56)

* Improve auto-backup * Improve auto-backup
canopas · Nov 19, 2024 · 64554c1 · 64554c1
1 parent 939b07f
commit 64554c1
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 33 deletions.
diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml
diff --git a/app/lib/components/thumbnail_builder.dart b/app/lib/components/thumbnail_builder.dart
@@ -25,7 +25,7 @@ class AppMediaImage extends StatelessWidget {
       child: Hero(
         tag: heroTag ?? '',
         child: Image(
-          image: AppMediaImageProvider(media: media, thumbnailSize: size),
+          image: AppMediaImageProvider(media: media, thumbnailSize: size * 2),
           loadingBuilder: (context, child, loadingProgress) {
             if (loadingProgress != null) {
               return AppMediaPlaceHolder(

diff --git a/app/lib/ui/flow/home/home_screen.dart b/app/lib/ui/flow/home/home_screen.dart
@@ -117,8 +117,9 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
               tapTargetSize: MaterialTapTargetSize.shrinkWrap,
               size: 36,
               backgroundColor: context.colorScheme.containerNormal,
-              onPressed: () {
-                TransferRoute().push(context);
+              onPressed: () async {
+                await TransferRoute().push(context);
+                _notifier.loadMedias();
               },
               icon: Icon(
                 CupertinoIcons.arrow_up_arrow_down,
@@ -137,8 +138,9 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
       size: 36,
       backgroundColor: context.colorScheme.containerNormal,
       tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-      onPressed: () {
-        AccountRoute().push(context);
+      onPressed: () async {
+        await AccountRoute().push(context);
+        _notifier.loadMedias();
       },
       icon: Icon(
         CupertinoIcons.person,
@@ -261,7 +263,7 @@ class _HomeScreenState extends ConsumerState<HomeScreen> {
                               startFrom: media.id,
                             ),
                           ).push(context);
-                          _notifier.loadLocalMedia();
+                          _notifier.loadMedias();
                         }
                       },
                       onLongTap: () {

diff --git a/app/lib/ui/flow/home/home_screen_view_model.dart b/app/lib/ui/flow/home/home_screen_view_model.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import '../../../domain/extensions/map_extensions.dart';
 import '../../../domain/extensions/media_list_extension.dart';
-import 'package:collection/collection.dart';
 import 'package:data/models/app_process/app_process.dart';
 import 'package:data/models/media/media.dart';
 import 'package:data/models/media/media_extension.dart';
@@ -61,7 +60,7 @@ class HomeViewStateNotifier extends StateNotifier<HomeViewState>
     _listenUserGoogleAccount();
     _googleDriveProcessRepo.setBackUpFolderId(_backUpFolderId);
     _googleDriveProcessRepo.addListener(_listenGoogleDriveProcess);
-    _loadInitialMedia();
+    loadMedias();
     _checkAutoBackUp();
   }
 
@@ -75,17 +74,7 @@ class HomeViewStateNotifier extends StateNotifier<HomeViewState>
 
   void _checkAutoBackUp() {
     if (_autoBackUpStatus) {
-      _googleDriveProcessRepo.uploadMediasInGoogleDrive(
-        medias: state.medias.valuesWhere(
-          (element) =>
-              element.isLocalStored &&
-              state.mediaProcesses.firstWhereOrNull(
-                    (process) => process.id == element.id,
-                  ) ==
-                  null,
-        ),
-        isFromAutoBackup: true,
-      );
+      _googleDriveProcessRepo.autoBackInGoogleDrive();
     }
   }
 
@@ -157,8 +146,8 @@ class HomeViewStateNotifier extends StateNotifier<HomeViewState>
     );
   }
 
-  Future<void> _loadInitialMedia() async {
-    state = state.copyWith(loading: true, error: null);
+  Future<void> loadMedias() async {
+    state = state.copyWith(loading: state.medias.isEmpty, error: null);
     final hasAccess = await _localMediaService.requestPermission();
     state = state.copyWith(hasLocalMediaAccess: hasAccess, loading: false);
     if (hasAccess) {
@@ -364,9 +353,7 @@ class HomeViewStateNotifier extends StateNotifier<HomeViewState>
           )
           .toList();
 
-      _googleDriveProcessRepo.uploadMediasInGoogleDrive(
-        medias: medias,
-      );
+      _googleDriveProcessRepo.uploadMedia(medias);
       state = state.copyWith(selectedMedias: []);
     } catch (error) {
       state = state.copyWith(error: error);

diff --git a/app/lib/ui/flow/media_preview/media_preview_view_model.dart b/app/lib/ui/flow/media_preview/media_preview_view_model.dart
@@ -110,7 +110,7 @@ class MediaPreviewStateNotifier extends StateNotifier<MediaPreviewState> {
   }
 
   Future<void> uploadMediaInGoogleDrive({required AppMedia media}) async {
-    _googleDriveProcessRepo.uploadMediasInGoogleDrive(medias: [media]);
+    _googleDriveProcessRepo.uploadMedia([media]);
   }
 
   void updateVideoPosition(Duration position) {