Fix backup not resuming after closed and reopen (#266)

* Fixed app not resuming backup after closing and reopening the app * Fixed cosmetic effect of backup button doesn't change state right away after pressing start backup * Fixed grammar * Fixed deep copy problem that cause incorrect asset count when backing up * Format code
2025-10-29 17:40:28 +00:00 · 2022-06-25 15:12:47 -05:00
parent d02b97e1c1
commit 40a8115101
63 changed files with 677 additions and 300 deletions
--- a/mobile/lib/modules/sharing/ui/album_action_outlined_button.dart
+++ b/mobile/lib/modules/sharing/ui/album_action_outlined_button.dart
@@ -5,7 +5,11 @@ class AlbumActionOutlinedButton extends StatelessWidget {
  final String labelText;
  final IconData iconData;

-  const AlbumActionOutlinedButton({Key? key, this.onPressed, required this.labelText, required this.iconData})
+  const AlbumActionOutlinedButton(
+      {Key? key,
+      this.onPressed,
+      required this.labelText,
+      required this.iconData})
      : super(key: key);

  @override
@@ -26,7 +30,8 @@ class AlbumActionOutlinedButton extends StatelessWidget {
        icon: Icon(iconData, size: 15),
        label: Text(
          labelText,
-          style: const TextStyle(fontSize: 12, fontWeight: FontWeight.bold, color: Colors.black87),
+          style: const TextStyle(
+              fontSize: 12, fontWeight: FontWeight.bold, color: Colors.black87),
        ),
        onPressed: onPressed,
      ),
--- a/mobile/lib/modules/sharing/ui/album_title_text_field.dart
+++ b/mobile/lib/modules/sharing/ui/album_title_text_field.dart
@@ -29,7 +29,8 @@ class AlbumTitleTextField extends ConsumerWidget {
        ref.watch(albumTitleProvider.notifier).setAlbumTitle(v);
      },
      focusNode: albumTitleTextFieldFocusNode,
-      style: TextStyle(fontSize: 28, color: Colors.grey[700], fontWeight: FontWeight.bold),
+      style: TextStyle(
+          fontSize: 28, color: Colors.grey[700], fontWeight: FontWeight.bold),
      controller: albumTitleController,
      onTap: () {
        isAlbumTitleTextFieldFocus.value = true;
--- a/mobile/lib/modules/sharing/ui/album_viewer_editable_title.dart
+++ b/mobile/lib/modules/sharing/ui/album_viewer_editable_title.dart
@@ -7,11 +7,14 @@ import 'package:immich_mobile/modules/sharing/providers/album_viewer.provider.da
 class AlbumViewerEditableTitle extends HookConsumerWidget {
  final SharedAlbum albumInfo;
  final FocusNode titleFocusNode;
-  const AlbumViewerEditableTitle({Key? key, required this.albumInfo, required this.titleFocusNode}) : super(key: key);
+  const AlbumViewerEditableTitle(
+      {Key? key, required this.albumInfo, required this.titleFocusNode})
+      : super(key: key);

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final titleTextEditController = useTextEditingController(text: albumInfo.albumName);
+    final titleTextEditController =
+        useTextEditingController(text: albumInfo.albumName);

    void onFocusModeChange() {
      if (!titleFocusNode.hasFocus && titleTextEditController.text.isEmpty) {
@@ -40,7 +43,9 @@ class AlbumViewerEditableTitle extends HookConsumerWidget {
      onTap: () {
        FocusScope.of(context).requestFocus(titleFocusNode);

-        ref.watch(albumViewerProvider.notifier).setEditTitleText(albumInfo.albumName);
+        ref
+            .watch(albumViewerProvider.notifier)
+            .setEditTitleText(albumInfo.albumName);
        ref.watch(albumViewerProvider.notifier).enableEditAlbum();

        if (titleTextEditController.text == 'Untitled') {
--- a/mobile/lib/modules/sharing/ui/album_viewer_thumbnail.dart
+++ b/mobile/lib/modules/sharing/ui/album_viewer_thumbnail.dart
@@ -22,8 +22,10 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
    var thumbnailRequestUrl =
        '${box.get(serverEndpointKey)}/asset/file?aid=${asset.deviceAssetId}&did=${asset.deviceId}&isThumb=true';
    var deviceId = ref.watch(authenticationProvider).deviceId;
-    final selectedAssetsInAlbumViewer = ref.watch(assetSelectionProvider).selectedAssetsInAlbumViewer;
-    final isMultiSelectionEnable = ref.watch(assetSelectionProvider).isMultiselectEnable;
+    final selectedAssetsInAlbumViewer =
+        ref.watch(assetSelectionProvider).selectedAssetsInAlbumViewer;
+    final isMultiSelectionEnable =
+        ref.watch(assetSelectionProvider).isMultiselectEnable;

    _viewAsset() {
      if (asset.type == 'IMAGE') {
@@ -39,7 +41,8 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
      } else {
        AutoRouter.of(context).push(
          VideoViewerRoute(
-              videoUrl: '${box.get(serverEndpointKey)}/asset/file?aid=${asset.deviceAssetId}&did=${asset.deviceId}',
+              videoUrl:
+                  '${box.get(serverEndpointKey)}/asset/file?aid=${asset.deviceAssetId}&did=${asset.deviceId}',
              asset: asset),
        );
      }
@@ -58,7 +61,9 @@ class AlbumViewerThumbnail extends HookConsumerWidget {

    _enableMultiSelection() {
      ref.watch(assetSelectionProvider.notifier).enableMultiselection();
-      ref.watch(assetSelectionProvider.notifier).addAssetsInAlbumViewer([asset]);
+      ref
+          .watch(assetSelectionProvider.notifier)
+          .addAssetsInAlbumViewer([asset]);
    }

    _disableMultiSelection() {
@@ -96,7 +101,9 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
        right: 10,
        bottom: 5,
        child: Icon(
-          (deviceId != asset.deviceId) ? Icons.cloud_done_outlined : Icons.photo_library_rounded,
+          (deviceId != asset.deviceId)
+              ? Icons.cloud_done_outlined
+              : Icons.photo_library_rounded,
          color: Colors.white,
          size: 18,
        ),
@@ -136,7 +143,8 @@ class AlbumViewerThumbnail extends HookConsumerWidget {
          imageUrl: thumbnailRequestUrl,
          httpHeaders: {"Authorization": "Bearer ${box.get(accessTokenKey)}"},
          fadeInDuration: const Duration(milliseconds: 250),
-          progressIndicatorBuilder: (context, url, downloadProgress) => Transform.scale(
+          progressIndicatorBuilder: (context, url, downloadProgress) =>
+              Transform.scale(
            scale: 0.2,
            child: CircularProgressIndicator(value: downloadProgress.progress),
          ),
@@ -152,13 +160,17 @@ class AlbumViewerThumbnail extends HookConsumerWidget {

    _handleSelectionGesture() {
      if (selectedAssetsInAlbumViewer.contains(asset)) {
-        ref.watch(assetSelectionProvider.notifier).removeAssetsInAlbumViewer([asset]);
+        ref
+            .watch(assetSelectionProvider.notifier)
+            .removeAssetsInAlbumViewer([asset]);

        if (selectedAssetsInAlbumViewer.isEmpty) {
          _disableMultiSelection();
        }
      } else {
-        ref.watch(assetSelectionProvider.notifier).addAssetsInAlbumViewer([asset]);
+        ref
+            .watch(assetSelectionProvider.notifier)
+            .addAssetsInAlbumViewer([asset]);
      }
    }

--- a/mobile/lib/modules/sharing/ui/asset_grid_by_month.dart
+++ b/mobile/lib/modules/sharing/ui/asset_grid_by_month.dart
@@ -5,7 +5,8 @@ import 'package:immich_mobile/shared/models/immich_asset.model.dart';

 class AssetGridByMonth extends HookConsumerWidget {
  final List<ImmichAsset> assetGroup;
-  const AssetGridByMonth({Key? key, required this.assetGroup}) : super(key: key);
+  const AssetGridByMonth({Key? key, required this.assetGroup})
+      : super(key: key);
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    return SliverGrid(
--- a/mobile/lib/modules/sharing/ui/month_group_title.dart
+++ b/mobile/lib/modules/sharing/ui/month_group_title.dart
@@ -8,12 +8,15 @@ class MonthGroupTitle extends HookConsumerWidget {
  final String month;
  final List<ImmichAsset> assetGroup;

-  const MonthGroupTitle({Key? key, required this.month, required this.assetGroup}) : super(key: key);
+  const MonthGroupTitle(
+      {Key? key, required this.month, required this.assetGroup})
+      : super(key: key);

  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final selectedDateGroup = ref.watch(assetSelectionProvider).selectedMonths;
-    final selectedAssets = ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum;
+    final selectedAssets =
+        ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum;
    final isAlbumExist = ref.watch(assetSelectionProvider).isAlbumExist;

    _handleTitleIconClick() {
@@ -21,10 +24,16 @@ class MonthGroupTitle extends HookConsumerWidget {

      if (isAlbumExist) {
        if (selectedDateGroup.contains(month)) {
-          ref.watch(assetSelectionProvider.notifier).removeAssetsInMonth(month, []);
-          ref.watch(assetSelectionProvider.notifier).removeSelectedAdditionalAssets(assetGroup);
+          ref
+              .watch(assetSelectionProvider.notifier)
+              .removeAssetsInMonth(month, []);
+          ref
+              .watch(assetSelectionProvider.notifier)
+              .removeSelectedAdditionalAssets(assetGroup);
        } else {
-          ref.watch(assetSelectionProvider.notifier).addAllAssetsInMonth(month, []);
+          ref
+              .watch(assetSelectionProvider.notifier)
+              .addAllAssetsInMonth(month, []);

          // Deep clone assetGroup
          var assetGroupWithNewItems = [...assetGroup];
@@ -33,13 +42,19 @@ class MonthGroupTitle extends HookConsumerWidget {
            assetGroupWithNewItems.removeWhere((a) => a.id == selectedAsset.id);
          }

-          ref.watch(assetSelectionProvider.notifier).addAdditionalAssets(assetGroupWithNewItems);
+          ref
+              .watch(assetSelectionProvider.notifier)
+              .addAdditionalAssets(assetGroupWithNewItems);
        }
      } else {
        if (selectedDateGroup.contains(month)) {
-          ref.watch(assetSelectionProvider.notifier).removeAssetsInMonth(month, assetGroup);
+          ref
+              .watch(assetSelectionProvider.notifier)
+              .removeAssetsInMonth(month, assetGroup);
        } else {
-          ref.watch(assetSelectionProvider.notifier).addAllAssetsInMonth(month, assetGroup);
+          ref
+              .watch(assetSelectionProvider.notifier)
+              .addAllAssetsInMonth(month, assetGroup);
        }
      }
    }
@@ -59,7 +74,8 @@ class MonthGroupTitle extends HookConsumerWidget {

    return SliverToBoxAdapter(
      child: Padding(
-        padding: const EdgeInsets.only(top: 29.0, bottom: 29.0, left: 14.0, right: 8.0),
+        padding: const EdgeInsets.only(
+            top: 29.0, bottom: 29.0, left: 14.0, right: 8.0),
        child: Row(
          children: [
            GestureDetector(
--- a/mobile/lib/modules/sharing/ui/selection_thumbnail_image.dart
+++ b/mobile/lib/modules/sharing/ui/selection_thumbnail_image.dart
@@ -10,7 +10,8 @@ import 'package:immich_mobile/shared/models/immich_asset.model.dart';
 class SelectionThumbnailImage extends HookConsumerWidget {
  final ImmichAsset asset;

-  const SelectionThumbnailImage({Key? key, required this.asset}) : super(key: key);
+  const SelectionThumbnailImage({Key? key, required this.asset})
+      : super(key: key);

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -18,8 +19,10 @@ class SelectionThumbnailImage extends HookConsumerWidget {
    var box = Hive.box(userInfoBox);
    var thumbnailRequestUrl =
        '${box.get(serverEndpointKey)}/asset/file?aid=${asset.deviceAssetId}&did=${asset.deviceId}&isThumb=true';
-    var selectedAsset = ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum;
-    var newAssetsForAlbum = ref.watch(assetSelectionProvider).selectedAdditionalAssetsForAlbum;
+    var selectedAsset =
+        ref.watch(assetSelectionProvider).selectedNewAssetsForAlbum;
+    var newAssetsForAlbum =
+        ref.watch(assetSelectionProvider).selectedAdditionalAssetsForAlbum;
    var isAlbumExist = ref.watch(assetSelectionProvider).isAlbumExist;

    Widget _buildSelectionIcon(ImmichAsset asset) {
@@ -72,15 +75,21 @@ class SelectionThumbnailImage extends HookConsumerWidget {
          // Operation for existing album
          if (!selectedAsset.contains(asset)) {
            if (newAssetsForAlbum.contains(asset)) {
-              ref.watch(assetSelectionProvider.notifier).removeSelectedAdditionalAssets([asset]);
+              ref
+                  .watch(assetSelectionProvider.notifier)
+                  .removeSelectedAdditionalAssets([asset]);
            } else {
-              ref.watch(assetSelectionProvider.notifier).addAdditionalAssets([asset]);
+              ref
+                  .watch(assetSelectionProvider.notifier)
+                  .addAdditionalAssets([asset]);
            }
          }
        } else {
          // Operation for new album
          if (selectedAsset.contains(asset)) {
-            ref.watch(assetSelectionProvider.notifier).removeSelectedNewAssets([asset]);
+            ref
+                .watch(assetSelectionProvider.notifier)
+                .removeSelectedNewAssets([asset]);
          } else {
            ref.watch(assetSelectionProvider.notifier).addNewAssets([asset]);
          }
@@ -97,11 +106,15 @@ class SelectionThumbnailImage extends HookConsumerWidget {
              memCacheHeight: asset.type == 'IMAGE' ? 150 : 150,
              fit: BoxFit.cover,
              imageUrl: thumbnailRequestUrl,
-              httpHeaders: {"Authorization": "Bearer ${box.get(accessTokenKey)}"},
+              httpHeaders: {
+                "Authorization": "Bearer ${box.get(accessTokenKey)}"
+              },
              fadeInDuration: const Duration(milliseconds: 250),
-              progressIndicatorBuilder: (context, url, downloadProgress) => Transform.scale(
+              progressIndicatorBuilder: (context, url, downloadProgress) =>
+                  Transform.scale(
                scale: 0.2,
-                child: CircularProgressIndicator(value: downloadProgress.progress),
+                child:
+                    CircularProgressIndicator(value: downloadProgress.progress),
              ),
              errorWidget: (context, url, error) {
                return Icon(
--- a/mobile/lib/modules/sharing/ui/shared_album_thumbnail_image.dart
+++ b/mobile/lib/modules/sharing/ui/shared_album_thumbnail_image.dart
@@ -9,7 +9,8 @@ import 'package:immich_mobile/shared/models/immich_asset.model.dart';
 class SharedAlbumThumbnailImage extends HookConsumerWidget {
  final ImmichAsset asset;

-  const SharedAlbumThumbnailImage({Key? key, required this.asset}) : super(key: key);
+  const SharedAlbumThumbnailImage({Key? key, required this.asset})
+      : super(key: key);

  @override
  Widget build(BuildContext context, WidgetRef ref) {
@@ -34,9 +35,11 @@ class SharedAlbumThumbnailImage extends HookConsumerWidget {
            imageUrl: thumbnailRequestUrl,
            httpHeaders: {"Authorization": "Bearer ${box.get(accessTokenKey)}"},
            fadeInDuration: const Duration(milliseconds: 250),
-            progressIndicatorBuilder: (context, url, downloadProgress) => Transform.scale(
+            progressIndicatorBuilder: (context, url, downloadProgress) =>
+                Transform.scale(
              scale: 0.2,
-              child: CircularProgressIndicator(value: downloadProgress.progress),
+              child:
+                  CircularProgressIndicator(value: downloadProgress.progress),
            ),
            errorWidget: (context, url, error) {
              return Icon(
--- a/mobile/lib/modules/sharing/ui/sharing_sliver_appbar.dart
+++ b/mobile/lib/modules/sharing/ui/sharing_sliver_appbar.dart
@@ -37,11 +37,13 @@ class SharingSliverAppBar extends StatelessWidget {
                  padding: const EdgeInsets.only(right: 4.0),
                  child: TextButton.icon(
                    style: ButtonStyle(
-                      backgroundColor: MaterialStateProperty.all(Theme.of(context).primaryColor.withAlpha(20)),
+                      backgroundColor: MaterialStateProperty.all(
+                          Theme.of(context).primaryColor.withAlpha(20)),
                      // foregroundColor: MaterialStateProperty.all(Colors.white),
                    ),
                    onPressed: () {
-                      AutoRouter.of(context).push(const CreateSharedAlbumRoute());
+                      AutoRouter.of(context)
+                          .push(const CreateSharedAlbumRoute());
                    },
                    icon: const Icon(
                      Icons.photo_album_outlined,
@@ -49,7 +51,8 @@ class SharingSliverAppBar extends StatelessWidget {
                    ),
                    label: const Text(
                      "Create shared album",
-                      style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
+                      style:
+                          TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
                    ),
                  ),
                ),
@@ -59,7 +62,8 @@ class SharingSliverAppBar extends StatelessWidget {
                  padding: const EdgeInsets.only(left: 4.0),
                  child: TextButton.icon(
                    style: ButtonStyle(
-                      backgroundColor: MaterialStateProperty.all(Theme.of(context).primaryColor.withAlpha(20)),
+                      backgroundColor: MaterialStateProperty.all(
+                          Theme.of(context).primaryColor.withAlpha(20)),
                      // foregroundColor: MaterialStateProperty.all(Colors.white),
                    ),
                    onPressed: null,
@@ -69,7 +73,8 @@ class SharingSliverAppBar extends StatelessWidget {
                    ),
                    label: const Text(
                      "Share with partner",
-                      style: TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
+                      style:
+                          TextStyle(fontWeight: FontWeight.bold, fontSize: 12),
                    ),
                  ),
                ),