[mobile] Add custom filter to image editor (#6671)

## Description Add 10 custom filter to image editor and made it compatible with flutter 3.24.0 ## Tests
2025-07-29 13:17:55 +05:30
parent ed7cc5f8c1 ce48e2610a
commit 278156b11d
8 changed files with 447 additions and 347 deletions
--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_crop_rotate.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_crop_rotate.dart
@@ -137,7 +137,10 @@ class _ImageEditorCropRotateBarState extends State<ImageEditorCropRotateBar>
                    final aspectRatio = CropAspectRatioType.values[index];
                    final isSelected = selectedAspectRatio == aspectRatio;
                    return Padding(
-                      padding: const EdgeInsets.only(right: 12.0),
+                      padding: const EdgeInsets.only(
+                        left: 6.0,
+                        right: 6.0,
+                      ),
                      child: CropAspectChip(
                        label: aspectRatio.label,
                        svg: aspectRatio.svg,
--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_filter_bar.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_filter_bar.dart
@@ -2,7 +2,83 @@ import 'package:figma_squircle/figma_squircle.dart';
 import 'package:flutter/material.dart';
 import "package:photos/ente_theme_data.dart";
 import "package:photos/theme/ente_theme.dart";
-import 'package:pro_image_editor/pro_image_editor.dart';
+import 'package:pro_image_editor/pro_image_editor.dart'; 
+
+final filterList = [
+  FilterModel(
+    name: "Juno",
+    filters: [
+      ColorFilterAddons.rgbScale(1.01, 1.04, 1),
+      ColorFilterAddons.saturation(0.3),
+    ],
+  ),
+  FilterModel(
+    name: 'Perpetua',
+    filters: [
+      ColorFilterAddons.rgbScale(1.05, 1.1, 1),
+    ],
+  ),
+  FilterModel(
+    name: 'Reyes',
+    filters: [
+      ColorFilterAddons.sepia(0.4),
+      ColorFilterAddons.brightness(0.13),
+      ColorFilterAddons.contrast(-.05),
+    ],
+  ),
+  FilterModel(
+    name: 'Aden',
+    filters: [
+      ColorFilterAddons.colorOverlay(228, 130, 225, 0.13),
+      ColorFilterAddons.saturation(-0.2),
+    ],
+  ),
+  FilterModel(
+    name: "New preset",
+    filters: [
+      ColorFilterAddons.hue(-0.6),
+      ColorFilterAddons.rgbScale(0.8, 1.0, 1.2),
+      ColorFilterAddons.saturation(-0.8),
+      ColorFilterAddons.contrast(-0.6),
+    ],
+  ),
+  FilterModel(
+    name: 'Amaro',
+    filters: [
+      ColorFilterAddons.saturation(0.3),
+      ColorFilterAddons.brightness(0.15),
+    ],
+  ),
+  FilterModel(
+    name: 'Clarendon',
+    filters: [
+      ColorFilterAddons.brightness(.1),
+      ColorFilterAddons.contrast(.1),
+      ColorFilterAddons.saturation(.15),
+    ],
+  ),
+  FilterModel(
+    name: 'Brooklyn',
+    filters: [
+      ColorFilterAddons.colorOverlay(25, 240, 252, 0.05),
+      ColorFilterAddons.sepia(0.3),
+    ],
+  ),
+  FilterModel(
+    name: 'Sierra',
+    filters: [
+      ColorFilterAddons.contrast(-0.15),
+      ColorFilterAddons.saturation(0.1),
+    ],
+  ),
+  FilterModel(
+    name: 'Inkwell',
+    filters: [
+      ColorFilterAddons.contrast(0.2),
+      ColorFilterAddons.grayscale(),
+    ],
+  ),
+];

 class ImageEditorFilterBar extends StatefulWidget {
  const ImageEditorFilterBar({
--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_main_bottom_bar.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_main_bottom_bar.dart
@@ -121,7 +121,7 @@ class ImageEditorMainBottomBarState extends State<ImageEditorMainBottomBar>
                          svgPath: "assets/image-editor/image-editor-paint.svg", 
                          label: "Draw",
                          onTap: () {
-                            widget.editor.openPaintEditor();
+                            widget.editor.openPaintingEditor();
                          },
                        ),
                        CircularIconButton(
--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page_new.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page_new.dart
@@ -35,6 +35,7 @@ import "package:photos/ui/tools/editor/image_editor/image_editor_tune_bar.dart";
 import "package:photos/ui/viewer/file/detail_page.dart";
 import "package:photos/utils/dialog_util.dart";
 import "package:photos/utils/navigation_util.dart";
+import "package:pro_image_editor/models/editor_configs/main_editor_configs.dart";
 import 'package:pro_image_editor/pro_image_editor.dart';

 class NewImageEditor extends StatefulWidget {
@@ -177,6 +178,7 @@ class _NewImageEditorState extends State<NewImageEditor> {
    final colorScheme = getEnteColorScheme(context);
    final textTheme = getEnteTextTheme(context);
    return Scaffold(
+      resizeToAvoidBottomInset: false,
      backgroundColor: colorScheme.backgroundBase,
      body: PopScope(
        canPop: false,
@@ -203,12 +205,38 @@ class _NewImageEditorState extends State<NewImageEditor> {
            ),
          ),
          configs: ProImageEditorConfigs(
-            imageGeneration: const ImageGenerationConfigs(
+            imageEditorTheme: ImageEditorTheme(
+              appBarBackgroundColor: colorScheme.backgroundBase,
+              background: colorScheme.backgroundBase,
+              bottomBarBackgroundColor: colorScheme.backgroundBase,
+              filterEditor: FilterEditorTheme(
+                background: colorScheme.backgroundBase,
+              ),
+              paintingEditor: PaintingEditorTheme(
+                background: colorScheme.backgroundBase,
+              ),
+              textEditor: const TextEditorTheme(
+                background: Colors.transparent,
+                textFieldMargin: EdgeInsets.only(top: kToolbarHeight),
+              ),
+              cropRotateEditor: CropRotateEditorTheme(
+                background: colorScheme.backgroundBase,
+                cropCornerColor:
+                    Theme.of(context).colorScheme.imageEditorPrimaryColor,
+              ),
+              tuneEditor: TuneEditorTheme(
+                background: colorScheme.backgroundBase,
+              ),
+              emojiEditor: EmojiEditorTheme(
+                backgroundColor: colorScheme.backgroundBase,
+              ),
+            ),
+            imageGenerationConfigs: const ImageGenerationConfigs(
              jpegQuality: 100,
              generateInsideSeparateThread: true,
              pngLevel: 0,
            ),
-            layerInteraction: const LayerInteractionConfigs(
+            layerInteraction: const LayerInteraction(
              hideToolbarOnInteraction: false,
            ),
            theme: ThemeData(
@@ -222,50 +250,129 @@ class _NewImageEditorState extends State<NewImageEditor> {
              ),
              brightness: isLightMode ? Brightness.light : Brightness.dark,
            ),
-            mainEditor: MainEditorConfigs(
-              enableCloseButton: false,
-              style: MainEditorStyle(
-                appBarBackground: colorScheme.backgroundBase,
-                background: colorScheme.backgroundBase,
-                bottomBarBackground: colorScheme.backgroundBase,
+            customWidgets: ImageEditorCustomWidgets(
+              filterEditor: CustomWidgetsFilterEditor(
+                slider: (
+                  editorState,
+                  rebuildStream,
+                  value,
+                  onChanged,
+                  onChangeEnd,
+                ) =>
+                    ReactiveCustomWidget(
+                  builder: (context) {
+                    return const SizedBox.shrink();
+                  },
+                  stream: rebuildStream,
+                ),
+                filterButton: (
+                  filter,
+                  isSelected,
+                  scaleFactor,
+                  onSelectFilter,
+                  editorImage,
+                  filterKey,
+                ) {
+                  return ImageEditorFilterBar(
+                    filterModel: filter,
+                    isSelected: isSelected,
+                    onSelectFilter: () {
+                      onSelectFilter.call();
+                      editorKey.currentState?.setState(() {});
+                    },
+                    editorImage: editorImage,
+                    filterKey: filterKey,
+                  );
+                },
+                appBar: (editor, rebuildStream) {
+                  return ReactiveCustomAppbar(
+                    builder: (context) {
+                      return ImageEditorAppBar(
+                        key: const Key('image_editor_app_bar'),
+                        configs: editor.configs,
+                        done: () => editor.done(),
+                        close: () => editor.close(),
+                      );
+                    },
+                    stream: rebuildStream,
+                  );
+                },
              ),
-              widgets: MainEditorWidgets(
-                removeLayerArea: (removeAreaKey, editor, rebuildStream) {
-                  return Align(
-                    alignment: Alignment.bottomCenter,
-                    child: StreamBuilder(
-                      stream: rebuildStream,
-                      builder: (_, __) {
-                        final isHovered =
-                            editor.layerInteractionManager.hoverRemoveBtn;
+              tuneEditor: CustomWidgetsTuneEditor(
+                appBar: (editor, rebuildStream) {
+                  return ReactiveCustomAppbar(
+                    builder: (context) {
+                      return ImageEditorAppBar(
+                        enableRedo: editor.canRedo,
+                        enableUndo: editor.canUndo,
+                        key: const Key('image_editor_app_bar'),
+                        redo: () => editor.redo(),
+                        undo: () => editor.undo(),
+                        configs: editor.configs,
+                        done: () => editor.done(),
+                        close: () => editor.close(),
+                      );
+                    },
+                    stream: rebuildStream,
+                  );
+                },
+                bottomBar: (editorState, rebuildStream) {
+                  return ReactiveCustomWidget(
+                    builder: (context) {
+                      return ImageEditorTuneBar(
+                        configs: editorState.configs,
+                        callbacks: editorState.callbacks,
+                        editor: editorState,
+                      );
+                    },
+                    stream: rebuildStream,
+                  );
+                },
+              ),
+              mainEditor: CustomWidgetsMainEditor(
+                removeLayerArea: (key, rebuildStream) {
+                  return ReactiveCustomWidget(
+                    key: key,
+                    builder: (context) {
+                      return Align(
+                        alignment: Alignment.bottomCenter,
+                        child: StreamBuilder(
+                          stream: rebuildStream,
+                          builder: (context, snapshot) {
+                            final isHovered = editorKey.currentState!
+                                .layerInteractionManager.hoverRemoveBtn;

-                        return AnimatedContainer(
-                          key: removeAreaKey,
-                          duration: const Duration(milliseconds: 150),
-                          height: 56,
-                          width: 56,
-                          margin: const EdgeInsets.only(bottom: 24),
-                          decoration: BoxDecoration(
-                            color: isHovered
-                                ? colorScheme.warning400.withOpacity(0.8)
-                                : Colors.white,
-                            shape: BoxShape.circle,
-                          ),
-                          padding: const EdgeInsets.all(12),
-                          child: Center(
-                            child: SvgPicture.asset(
-                              "assets/image-editor/image-editor-delete.svg",
-                              colorFilter: ColorFilter.mode(
-                                isHovered
-                                    ? Colors.white
-                                    : colorScheme.warning400.withOpacity(0.8),
-                                BlendMode.srcIn,
+                            return AnimatedContainer(
+                              key: key,
+                              duration: const Duration(milliseconds: 150),
+                              height: 56,
+                              width: 56,
+                              margin: const EdgeInsets.only(bottom: 24),
+                              decoration: BoxDecoration(
+                                color: isHovered
+                                    ? colorScheme.warning400.withOpacity(0.8)
+                                    : Colors.white,
+                                shape: BoxShape.circle,
                              ),
-                            ),
-                          ),
-                        );
-                      },
-                    ),
+                              padding: const EdgeInsets.all(12),
+                              child: Center(
+                                child: SvgPicture.asset(
+                                  "assets/image-editor/image-editor-delete.svg",
+                                  colorFilter: ColorFilter.mode(
+                                    isHovered
+                                        ? Colors.white
+                                        : colorScheme.warning400
+                                            .withOpacity(0.8),
+                                    BlendMode.srcIn,
+                                  ),
+                                ),
+                              ),
+                            );
+                          },
+                        ),
+                      );
+                    },
+                    stream: rebuildStream,
                  );
                },
                appBar: (editor, rebuildStream) {
@@ -305,13 +412,7 @@ class _NewImageEditorState extends State<NewImageEditor> {
                  stream: rebuildStream,
                ),
              ),
-            ),
-            paintEditor: PaintEditorConfigs(
-              style: PaintEditorStyle(
-                background: colorScheme.backgroundBase,
-                initialStrokeWidth: 5,
-              ),
-              widgets: PaintEditorWidgets(
+              paintEditor: CustomWidgetsPaintEditor(
                appBar: (editor, rebuildStream) {
                  return ReactiveCustomAppbar(
                    builder: (context) {
@@ -346,21 +447,7 @@ class _NewImageEditorState extends State<NewImageEditor> {
                  );
                },
              ),
-            ),
-            textEditor: TextEditorConfigs(
-              canToggleBackgroundMode: true,
-              canToggleTextAlign: true,
-              customTextStyles: [
-                GoogleFonts.inter(),
-                GoogleFonts.giveYouGlory(),
-                GoogleFonts.dmSerifText(),
-                GoogleFonts.comicNeue(),
-              ],
-              style: const TextEditorStyle(
-                background: Colors.transparent,
-                textFieldMargin: EdgeInsets.only(top: kToolbarHeight),
-              ),
-              widgets: TextEditorWidgets(
+              textEditor: CustomWidgetsTextEditor(
                appBar: (textEditor, rebuildStream) => ReactiveCustomAppbar(
                  builder: (context) {
                    return ImageEditorAppBar(
@@ -404,14 +491,7 @@ class _NewImageEditorState extends State<NewImageEditor> {
                  );
                },
              ),
-            ),
-            cropRotateEditor: CropRotateEditorConfigs(
-              style: CropRotateEditorStyle(
-                background: colorScheme.backgroundBase,
-                cropCornerColor:
-                    Theme.of(context).colorScheme.imageEditorPrimaryColor,
-              ),
-              widgets: CropRotateEditorWidgets(
+              cropRotateEditor: CustomWidgetsCropRotateEditor(
                appBar: (editor, rebuildStream) {
                  return ReactiveCustomAppbar(
                    builder: (context) {
@@ -440,115 +520,45 @@ class _NewImageEditorState extends State<NewImageEditor> {
                ),
              ),
            ),
-            filterEditor: FilterEditorConfigs(
+            mainEditorConfigs: const MainEditorConfigs(enableZoom: true),
+            paintEditorConfigs: const PaintEditorConfigs(enabled: true),
+            textEditorConfigs: TextEditorConfigs(
+              canToggleBackgroundMode: true,
+              canToggleTextAlign: true,
+              customTextStyles: [
+                GoogleFonts.inter(),
+                GoogleFonts.giveYouGlory(),
+                GoogleFonts.dmSerifText(),
+                GoogleFonts.comicNeue(),
+              ],
+            ),
+            cropRotateEditorConfigs: const CropRotateEditorConfigs(
+              canChangeAspectRatio: true,
+              canFlip: true,
+              canRotate: true,
+              canReset: true,
+              enabled: true,
+            ),
+            filterEditorConfigs: FilterEditorConfigs(
+              enabled: true,
              fadeInUpDuration: fadeInDuration,
              fadeInUpStaggerDelayDuration: fadeInDelay,
-              style: FilterEditorStyle(
-                filterListSpacing: 7,
-                background: colorScheme.backgroundBase,
-              ),
-              widgets: FilterEditorWidgets(
-                slider: (
-                  editorState,
-                  rebuildStream,
-                  value,
-                  onChanged,
-                  onChangeEnd,
-                ) =>
-                    ReactiveCustomWidget(
-                  builder: (context) {
-                    return const SizedBox.shrink();
-                  },
-                  stream: rebuildStream,
-                ),
-                filterButton: (
-                  filter,
-                  isSelected,
-                  scaleFactor,
-                  onSelectFilter,
-                  editorImage,
-                  filterKey,
-                ) {
-                  return ImageEditorFilterBar(
-                    filterModel: filter,
-                    isSelected: isSelected,
-                    onSelectFilter: onSelectFilter,
-                    editorImage: editorImage,
-                    filterKey: filterKey,
-                  );
-                },
-                appBar: (editor, rebuildStream) {
-                  return ReactiveCustomAppbar(
-                    builder: (context) {
-                      return ImageEditorAppBar(
-                        key: const Key('image_editor_app_bar'),
-                        configs: editor.configs,
-                        done: () => editor.done(),
-                        close: () => editor.close(),
-                      );
-                    },
-                    stream: rebuildStream,
-                  );
-                },
-              ),
+              filterList: filterList,
            ),
-            tuneEditor: TuneEditorConfigs(
-              style: TuneEditorStyle(
-                background: colorScheme.backgroundBase,
-              ),
-              widgets: TuneEditorWidgets(
-                appBar: (editor, rebuildStream) {
-                  return ReactiveCustomAppbar(
-                    builder: (context) {
-                      return ImageEditorAppBar(
-                        enableRedo: editor.canRedo,
-                        enableUndo: editor.canUndo,
-                        key: const Key('image_editor_app_bar'),
-                        redo: () => editor.redo(),
-                        undo: () => editor.undo(),
-                        configs: editor.configs,
-                        done: () => editor.done(),
-                        close: () => editor.close(),
-                      );
-                    },
-                    stream: rebuildStream,
-                  );
-                },
-                bottomBar: (editorState, rebuildStream) {
-                  return ReactiveCustomWidget(
-                    builder: (context) {
-                      return ImageEditorTuneBar(
-                        configs: editorState.configs,
-                        callbacks: editorState.callbacks,
-                        editor: editorState,
-                      );
-                    },
-                    stream: rebuildStream,
-                  );
-                },
-              ),
-            ),
-            blurEditor: const BlurEditorConfigs(
+            tuneEditorConfigs: const TuneEditorConfigs(enabled: true),
+            blurEditorConfigs: const BlurEditorConfigs(
              enabled: false,
            ),
-            emojiEditor: EmojiEditorConfigs(
-              icons: const EmojiEditorIcons(),
-              style: EmojiEditorStyle(
-                backgroundColor: colorScheme.backgroundBase,
-                emojiViewConfig: const EmojiViewConfig(
-                  gridPadding: EdgeInsets.zero,
-                  horizontalSpacing: 0,
-                  verticalSpacing: 0,
-                  recentsLimit: 40,
-                  loadingIndicator: Center(child: CircularProgressIndicator()),
-                  replaceEmojiOnLimitExceed: false,
-                ),
-                bottomActionBarConfig: const BottomActionBarConfig(
-                  enabled: false,
-                ),
-              ),
+            emojiEditorConfigs: const EmojiEditorConfigs(
+              enabled: true,
+              checkPlatformCompatibility: true,
+            ),
+            stickerEditorConfigs: StickerEditorConfigs(
+              enabled: false,
+              buildStickers: (setLayer, scrollController) {
+                return const SizedBox.shrink();
+              },
            ),
-            stickerEditor: const StickerEditorConfigs(enabled: false),
          ),
        ),
      ),
--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_paint_bar.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_paint_bar.dart
@@ -18,7 +18,7 @@ class ImageEditorPaintBar extends StatefulWidget with SimpleConfigsAccess {
    required this.i18nColor,
  });

-  final PaintEditorState editor;
+  final PaintingEditorState editor;

  @override
  final ProImageEditorConfigs configs;
--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_tune_bar.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_tune_bar.dart
@@ -315,7 +315,9 @@ class _CircularProgressWithValueState extends State<CircularProgressWithValue>
          AnimatedBuilder(
            animation: _progressAnimation,
            builder: (context, child) {
-              final animatedValue = _progressAnimation.value;
+              final animatedValue =
+                  displayValue == 0 ? 0.0 : _progressAnimation.value;
+
              final isClockwise =
                  _isClockwise(animatedValue, widget.min, widget.max);
              final progressValue = _normalizeValueForProgress(
--- a/mobile/apps/photos/pubspec.lock
+++ b/mobile/apps/photos/pubspec.lock
@@ -5,23 +5,23 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
      url: "https://pub.dev"
    source: hosted
-    version: "76.0.0"
+    version: "72.0.0"
  _flutterfire_internals:
    dependency: transitive
    description:
      name: _flutterfire_internals
-      sha256: "401dd18096f5eaa140404ccbbbf346f83c850e6f27049698a7ee75a3488ddb32"
+      sha256: ff0a84a2734d9e1089f8aedd5c0af0061b82fb94e95260d943404e0ef2134b11
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.52"
+    version: "1.3.59"
  _macros:
    dependency: transitive
    description: dart
    source: sdk
-    version: "0.3.3"
+    version: "0.3.2"
  adaptive_theme:
    dependency: "direct main"
    description:
@@ -34,10 +34,10 @@ packages:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
      url: "https://pub.dev"
    source: hosted
-    version: "6.11.0"
+    version: "6.7.0"
  android_intent_plus:
    dependency: "direct main"
    description:
@@ -114,18 +114,18 @@ packages:
    dependency: transitive
    description:
      name: args
-      sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
      url: "https://pub.dev"
    source: hosted
-    version: "2.6.0"
+    version: "2.7.0"
  asn1lib:
    dependency: transitive
    description:
      name: asn1lib
-      sha256: "4bae5ae63e6d6dd17c4aac8086f3dec26c0236f6a0f03416c6c19d830c367cf5"
+      sha256: "9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024"
      url: "https://pub.dev"
    source: hosted
-    version: "1.5.8"
+    version: "1.6.5"
  async:
    dependency: "direct main"
    description:
@@ -227,10 +227,10 @@ packages:
    dependency: transitive
    description:
      name: built_value
-      sha256: "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2"
+      sha256: "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62"
      url: "https://pub.dev"
    source: hosted
-    version: "8.9.3"
+    version: "8.11.0"
  cached_network_image:
    dependency: "direct main"
    description:
@@ -260,7 +260,7 @@ packages:
    description:
      path: "."
      ref: multicast_version
-      resolved-ref: "1f39cd4d6efa9363e77b2439f0317bae0c92dda1"
+      resolved-ref: af6378574352884beab6cddec462c7fdfc9a8c35
      url: "https://github.com/guyluz11/flutter_cast.git"
    source: git
    version: "2.0.9"
@@ -289,6 +289,14 @@ packages:
      url: "https://github.com/ente-io/chewie.git"
    source: git
    version: "1.10.0"
+  cli_config:
+    dependency: transitive
+    description:
+      name: cli_config
+      sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
  cli_util:
    dependency: transitive
    description:
@@ -317,10 +325,10 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.19.0"
+    version: "1.18.0"
  computer:
    dependency: "direct main"
    description:
@@ -334,10 +342,10 @@ packages:
    dependency: "direct main"
    description:
      name: connectivity_plus
-      sha256: "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27"
+      sha256: "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.3"
+    version: "6.1.4"
  connectivity_plus_platform_interface:
    dependency: transitive
    description:
@@ -358,18 +366,18 @@ packages:
    dependency: transitive
    description:
      name: coverage
-      sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
+      sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.1"
+    version: "1.15.0"
  cronet_http:
    dependency: transitive
    description:
      name: cronet_http
-      sha256: "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415"
+      sha256: df26af0de7c4eff46c53c190b5590e22457bfce6ea679aedb1e6326197f27d6f
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
  cross_file:
    dependency: transitive
    description:
@@ -398,10 +406,10 @@ packages:
    dependency: transitive
    description:
      name: cupertino_http
-      sha256: "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c"
+      sha256: "8fb9e2c36d0732d9d96abd76683406b57e78a2514e27c962e0c603dbe6f2e3f8"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.2"
+    version: "2.2.0"
  cupertino_icons:
    dependency: "direct main"
    description:
@@ -470,10 +478,10 @@ packages:
    dependency: transitive
    description:
      name: dio_web_adapter
-      sha256: e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a
+      sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
  dots_indicator:
    dependency: "direct main"
    description:
@@ -652,17 +660,18 @@ packages:
    description:
      path: "flutter/flutter"
      ref: android-packaged
-      resolved-ref: "6d5d27a8c259eda6292f204a27fba53da70af20e"
+      resolved-ref: e33d4d2f49a25af6bc493e9114350434e6c34ab4
      url: "https://github.com/ente-io/ffmpeg-kit"
    source: git
    version: "6.0.3"
  ffmpeg_kit_flutter_platform_interface:
    dependency: transitive
    description:
-      name: ffmpeg_kit_flutter_platform_interface
-      sha256: addf046ae44e190ad0101b2fde2ad909a3cd08a2a109f6106d2f7048b7abedee
-      url: "https://pub.dev"
-    source: hosted
+      path: "flutter/flutter_platform_interface"
+      ref: android-packaged
+      resolved-ref: e33d4d2f49a25af6bc493e9114350434e6c34ab4
+      url: "https://github.com/ente-io/ffmpeg-kit"
+    source: git
    version: "0.2.1"
  figma_squircle:
    dependency: "direct main"
@@ -692,50 +701,50 @@ packages:
    dependency: "direct main"
    description:
      name: firebase_core
-      sha256: "6a4ea0f1d533443c8afc3d809cd36a4e2b8f2e2e711f697974f55bb31d71d1b8"
+      sha256: "7be63a3f841fc9663342f7f3a011a42aef6a61066943c90b1c434d79d5c995c5"
      url: "https://pub.dev"
    source: hosted
-    version: "3.12.0"
+    version: "3.15.2"
  firebase_core_platform_interface:
    dependency: transitive
    description:
      name: firebase_core_platform_interface
-      sha256: d7253d255ff10f85cfd2adaba9ac17bae878fa3ba577462451163bd9f1d1f0bf
+      sha256: "5dbc900677dcbe5873d22ad7fbd64b047750124f1f9b7ebe2a33b9ddccc838eb"
      url: "https://pub.dev"
    source: hosted
-    version: "5.4.0"
+    version: "6.0.0"
  firebase_core_web:
    dependency: transitive
    description:
      name: firebase_core_web
-      sha256: e47f5c2776de018fa19bc9f6f723df136bc75cdb164d64b65305babd715c8e41
+      sha256: "0ed0dc292e8f9ac50992e2394e9d336a0275b6ae400d64163fdf0a8a8b556c37"
      url: "https://pub.dev"
    source: hosted
-    version: "2.21.0"
+    version: "2.24.1"
  firebase_messaging:
    dependency: "direct main"
    description:
      name: firebase_messaging
-      sha256: "8755a083a20bac4485e8b46d223f6f2eab34e659a76a75f8cf3cded53bc98a15"
+      sha256: "60be38574f8b5658e2f22b7e311ff2064bea835c248424a383783464e8e02fcc"
      url: "https://pub.dev"
    source: hosted
-    version: "15.2.3"
+    version: "15.2.10"
  firebase_messaging_platform_interface:
    dependency: transitive
    description:
      name: firebase_messaging_platform_interface
-      sha256: "8cc771079677460de53ad8fcca5bc3074d58c5fc4f9d89b19585e5bfd9c64292"
+      sha256: "685e1771b3d1f9c8502771ccc9f91485b376ffe16d553533f335b9183ea99754"
      url: "https://pub.dev"
    source: hosted
-    version: "4.6.3"
+    version: "4.6.10"
  firebase_messaging_web:
    dependency: transitive
    description:
      name: firebase_messaging_web
-      sha256: caa73059b0396c97f691683c4cfc3f897c8543801579b7dd4851c431d8e4e091
+      sha256: "0d1be17bc89ed3ff5001789c92df678b2e963a51b6fa2bdb467532cc9dbed390"
      url: "https://pub.dev"
    source: hosted
-    version: "3.10.3"
+    version: "3.10.10"
  fixnum:
    dependency: "direct main"
    description:
@@ -934,10 +943,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: b94a50aabbe56ef254f95f3be75640f99120429f0a153b2dc30143cffc9bfdf3
+      sha256: "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae"
      url: "https://pub.dev"
    source: hosted
-    version: "19.2.1"
+    version: "19.4.0"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
@@ -950,18 +959,18 @@ packages:
    dependency: transitive
    description:
      name: flutter_local_notifications_platform_interface
-      sha256: "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c"
+      sha256: "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe"
      url: "https://pub.dev"
    source: hosted
-    version: "9.0.0"
+    version: "9.1.0"
  flutter_local_notifications_windows:
    dependency: transitive
    description:
      name: flutter_local_notifications_windows
-      sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e
+      sha256: ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
  flutter_localizations:
    dependency: "direct main"
    description: flutter
@@ -1011,10 +1020,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_plugin_android_lifecycle
-      sha256: "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e"
+      sha256: "1c2b787f99bdca1f3718543f81d38aa1b124817dfeb9fb196201bea85b6134bf"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.24"
+    version: "2.0.26"
  flutter_secure_storage:
    dependency: "direct main"
    description:
@@ -1027,10 +1036,10 @@ packages:
    dependency: transitive
    description:
      name: flutter_secure_storage_linux
-      sha256: bf7404619d7ab5c0a1151d7c4e802edad8f33535abfbeff2f9e1fe1274e2d705
+      sha256: be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
  flutter_secure_storage_macos:
    dependency: transitive
    description:
@@ -1100,10 +1109,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_svg
-      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
+      sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.17"
+    version: "2.1.0"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@@ -1113,10 +1122,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_timezone
-      sha256: bc286cecb0366d88e6c4644e3962ebd1ce1d233abc658eb1e0cd803389f84b64
+      sha256: "13b2109ad75651faced4831bf262e32559e44aa549426eab8a597610d385d934"
      url: "https://pub.dev"
    source: hosted
-    version: "4.1.0"
+    version: "4.1.1"
  flutter_web_plugins:
    dependency: transitive
    description: flutter
@@ -1219,10 +1228,10 @@ packages:
    dependency: transitive
    description:
      name: html
-      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
      url: "https://pub.dev"
    source: hosted
-    version: "0.15.5"
+    version: "0.15.6"
  html_unescape:
    dependency: "direct main"
    description:
@@ -1235,10 +1244,10 @@ packages:
    dependency: "direct main"
    description:
      name: http
-      sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
+      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
  http_client_helper:
    dependency: transitive
    description:
@@ -1315,10 +1324,10 @@ packages:
    dependency: "direct main"
    description:
      name: in_app_purchase
-      sha256: "11a40f148eeb4f681a0572003e2b33432e110c90c1bbb4f9ef83b81ec0c4f737"
+      sha256: "5cddd7f463f3bddb1d37a72b95066e840d5822d66291331d7f8f05ce32c24b6c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.1"
+    version: "3.2.3"
  in_app_purchase_android:
    dependency: transitive
    description:
@@ -1339,10 +1348,10 @@ packages:
    dependency: transitive
    description:
      name: in_app_purchase_storekit
-      sha256: "276831961023055b55a2156c1fc043f50f6215ff49fb0f5f2273da6eeb510ecf"
+      sha256: "02f08d5688fc2776e3e386ff7d3071b7b375ea8222e8e6bd027b15c0708e4045"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.21"
+    version: "0.4.0"
  integration_test:
    dependency: "direct dev"
    description: flutter
@@ -1376,18 +1385,18 @@ packages:
    dependency: transitive
    description:
      name: iso_base_media
-      sha256: "0f5594feef1fba98179a2df95d1afbdda952de0c7a2e35e6815093f7c00aaf06"
+      sha256: "0a94fa4ff4ce7e6894d7afc96c1eee6911c12827f8cf184ca752ce3437a818a1"
      url: "https://pub.dev"
    source: hosted
-    version: "4.5.2"
+    version: "4.6.1"
  jni:
    dependency: transitive
    description:
      name: jni
-      sha256: f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b
+      sha256: d2c361082d554d4593c3012e26f6b188f902acd291330f13d6427641a92b3da1
      url: "https://pub.dev"
    source: hosted
-    version: "0.10.1"
+    version: "0.14.2"
  js:
    dependency: "direct overridden"
    description:
@@ -1432,18 +1441,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.7"
+    version: "10.0.5"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.8"
+    version: "3.0.5"
  leak_tracker_testing:
    dependency: transitive
    description:
@@ -1456,10 +1465,10 @@ packages:
    dependency: "direct main"
    description:
      name: like_button
-      sha256: "08e6a45b78888412df5d351786c550205ad3a677e72a0820d5bbc0b063c8a463"
+      sha256: "8b349521182ea6252b7fe1eaaad5932a9f55f94c3e87849376cfc25c78bac53a"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.5"
+    version: "2.1.0"
  lints:
    dependency: transitive
    description:
@@ -1488,10 +1497,10 @@ packages:
    dependency: "direct main"
    description:
      name: local_auth_android
-      sha256: "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92"
+      sha256: "8bba79f4f0f7bc812fce2ca20915d15618c37721246ba6c3ef2aa7a763a90cf2"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.46"
+    version: "1.0.47"
  local_auth_darwin:
    dependency: transitive
    description:
@@ -1528,10 +1537,10 @@ packages:
    dependency: transitive
    description:
      name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
+      sha256: "2621da01aabaf223f8f961e751f2c943dbb374dc3559b982f200ccedadaa6999"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
  logging:
    dependency: "direct main"
    description:
@@ -1552,10 +1561,10 @@ packages:
    dependency: transitive
    description:
      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.3-main.0"
+    version: "0.1.2-main.4"
  maps_launcher:
    dependency: "direct main"
    description:
@@ -1594,24 +1603,24 @@ packages:
    description:
      path: media_kit
      ref: HEAD
-      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
      url: "https://github.com/media-kit/media-kit"
    source: git
-    version: "1.1.11"
+    version: "1.2.0"
  media_kit_libs_android_video:
    dependency: transitive
    description:
      name: media_kit_libs_android_video
-      sha256: "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c"
+      sha256: adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.6"
+    version: "1.3.7"
  media_kit_libs_ios_video:
    dependency: "direct main"
    description:
      path: "libs/ios/media_kit_libs_ios_video"
      ref: HEAD
-      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
      url: "https://github.com/media-kit/media-kit"
    source: git
    version: "1.1.4"
@@ -1619,10 +1628,10 @@ packages:
    dependency: transitive
    description:
      name: media_kit_libs_linux
-      sha256: e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310
+      sha256: "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.3"
+    version: "1.2.1"
  media_kit_libs_macos_video:
    dependency: transitive
    description:
@@ -1636,27 +1645,27 @@ packages:
    description:
      path: "libs/universal/media_kit_libs_video"
      ref: HEAD
-      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
      url: "https://github.com/media-kit/media-kit"
    source: git
-    version: "1.0.5"
+    version: "1.0.6"
  media_kit_libs_windows_video:
    dependency: transitive
    description:
      name: media_kit_libs_windows_video
-      sha256: "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887"
+      sha256: dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.10"
+    version: "1.0.11"
  media_kit_video:
    dependency: "direct main"
    description:
      path: media_kit_video
      ref: HEAD
-      resolved-ref: "3c4ff28c43d20e68f8d587956b2f525292c25a80"
+      resolved-ref: c9617f570b8c0ba02857e721997f78c053a856c1
      url: "https://github.com/media-kit/media-kit"
    source: git
-    version: "1.2.5"
+    version: "1.3.0"
  meta:
    dependency: transitive
    description:
@@ -1720,7 +1729,7 @@ packages:
    description:
      path: "."
      ref: HEAD
-      resolved-ref: "7814e2c61ee1fa74cef73b946eb08519c35bdaa5"
+      resolved-ref: "64e47a446bf3b64f012f2076481cebea51ca27cf"
      url: "https://github.com/ente-io/motionphoto.git"
    source: git
    version: "0.0.1"
@@ -1737,10 +1746,10 @@ packages:
    dependency: transitive
    description:
      name: multicast_dns
-      sha256: "0a568c8411ab0979ab8cd4af1c29b6d316d854ab81592463ccceb92b35fde813"
+      sha256: de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.2+8"
+    version: "0.3.3"
  nanoid:
    dependency: "direct main"
    description:
@@ -1753,10 +1762,10 @@ packages:
    dependency: "direct main"
    description:
      name: native_dio_adapter
-      sha256: "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03"
+      sha256: "1c51bd42027861d27ccad462ba0903f5e3197461cc6d59a0bb8658cb5ad7bd01"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
  native_video_player:
    dependency: "direct main"
    description:
@@ -1793,10 +1802,10 @@ packages:
    dependency: transitive
    description:
      name: objective_c
-      sha256: "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584"
+      sha256: "9f034ba1eeca53ddb339bc8f4813cb07336a849cd735559b60cdc068ecce2dc7"
      url: "https://pub.dev"
    source: hosted
-    version: "4.1.0"
+    version: "7.1.0"
  octo_image:
    dependency: transitive
    description:
@@ -1834,26 +1843,26 @@ packages:
    dependency: transitive
    description:
      name: package_config
-      sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
+      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.2.0"
  package_info_plus:
    dependency: "direct main"
    description:
      name: package_info_plus
-      sha256: "67eae327b1b0faf761964a1d2e5d323c797f3799db0e85aa232db8d9e922bc35"
+      sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191"
      url: "https://pub.dev"
    source: hosted
-    version: "8.2.1"
+    version: "8.3.0"
  package_info_plus_platform_interface:
    dependency: transitive
    description:
      name: package_info_plus_platform_interface
-      sha256: "205ec83335c2ab9107bbba3f8997f9356d72ca3c715d2f038fc773d0366b4c76"
+      sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.0"
+    version: "3.2.0"
  panorama:
    dependency: "direct main"
    description:
@@ -1963,10 +1972,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_apple
-      sha256: f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
      url: "https://pub.dev"
    source: hosted
-    version: "9.4.6"
+    version: "9.4.7"
  permission_handler_html:
    dependency: transitive
    description:
@@ -2003,10 +2012,10 @@ packages:
    dependency: "direct main"
    description:
      name: photo_manager
-      sha256: "0bc7548fd3111eb93a3b0abf1c57364e40aeda32512c100085a48dade60e574f"
+      sha256: a0d9a7a9bc35eda02d33766412bde6d883a8b0acb86bbe37dac5f691a0894e8a
      url: "https://pub.dev"
    source: hosted
-    version: "3.6.4"
+    version: "3.7.1"
  photo_manager_image_provider:
    dependency: transitive
    description:
@@ -2084,10 +2093,10 @@ packages:
    dependency: "direct main"
    description:
      name: pro_image_editor
-      sha256: "1df9d15d514d958c740fc6aeacc41cc94b77cdcd8d72dac13c8f3a781c5680da"
+      sha256: ee86d144ec76957578fb3dc7dee3d5e9cd03383cb153eb58f531be16ac528c63
      url: "https://pub.dev"
    source: hosted
-    version: "7.2.0"
+    version: "6.0.0"
  process:
    dependency: transitive
    description:
@@ -2116,18 +2125,18 @@ packages:
    dependency: transitive
    description:
      name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
      url: "https://pub.dev"
    source: hosted
-    version: "6.1.2"
+    version: "6.1.5"
  pub_semver:
    dependency: transitive
    description:
      name: pub_semver
-      sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
+      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.5"
+    version: "2.2.0"
  pubspec_parse:
    dependency: transitive
    description:
@@ -2148,10 +2157,10 @@ packages:
    dependency: transitive
    description:
      name: random_access_source
-      sha256: dc86934da2cc4777334f43916234410f232032738c519c0c3452147c5d4fec89
+      sha256: "26d1509a9fd935ab9c77102ab4c94b343d36216387d985975c380efe450b81b8"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "3.0.0"
  receive_sharing_intent:
    dependency: "direct main"
    description:
@@ -2181,10 +2190,10 @@ packages:
    dependency: transitive
    description:
      name: screen_brightness_android
-      sha256: ff9141bed547db02233e7dd88f990ab01973a0c8a8c04ddb855c7b072f33409a
+      sha256: fb5fa43cb89d0c9b8534556c427db1e97e46594ac5d66ebdcf16063b773d54ed
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
  screen_brightness_platform_interface:
    dependency: transitive
    description:
@@ -2245,18 +2254,18 @@ packages:
    dependency: "direct main"
    description:
      name: shared_preferences
-      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22
+      sha256: "9f9f3d372d4304723e6136663bb291c0b93f5e4c8a4a6314347f481a33bda2b1"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.6"
+    version: "2.4.7"
  shared_preferences_foundation:
    dependency: transitive
    description:
@@ -2333,7 +2342,7 @@ packages:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.0"
+    version: "0.0.99"
  source_gen:
    dependency: transitive
    description:
@@ -2434,18 +2443,18 @@ packages:
    dependency: transitive
    description:
      name: sqlite3
-      sha256: "32b632dda27d664f85520093ed6f735ae5c49b5b75345afb8b19411bc59bb53d"
+      sha256: dd806fff004a0aeb01e208b858dbc649bc72104670d425a81a6dd17698535f6e
      url: "https://pub.dev"
    source: hosted
-    version: "2.7.4"
+    version: "2.8.0"
  sqlite3_flutter_libs:
    dependency: "direct main"
    description:
      name: sqlite3_flutter_libs
-      sha256: "57fafacd815c981735406215966ff7caaa8eab984b094f52e692accefcbd9233"
+      sha256: fd996da5515a73aacd0a04ae7063db5fe8df42670d974df4c3ee538c652eef2e
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.30"
+    version: "0.5.38"
  sqlite_async:
    dependency: "direct main"
    description:
@@ -2458,10 +2467,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.12.0"
+    version: "1.11.1"
  step_progress_indicator:
    dependency: "direct main"
    description:
@@ -2490,10 +2499,10 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
  styled_text:
    dependency: "direct main"
    description:
@@ -2554,26 +2563,26 @@ packages:
    dependency: "direct dev"
    description:
      name: test
-      sha256: "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f"
+      sha256: "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e"
      url: "https://pub.dev"
    source: hosted
-    version: "1.25.8"
+    version: "1.25.7"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
  test_core:
    dependency: transitive
    description:
      name: test_core
-      sha256: "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d"
+      sha256: "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696"
      url: "https://pub.dev"
    source: hosted
-    version: "0.6.5"
+    version: "0.6.4"
  thermal:
    dependency: "direct main"
    description:
@@ -2682,10 +2691,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_ios
-      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
+      sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
      url: "https://pub.dev"
    source: hosted
-    version: "6.3.2"
+    version: "6.3.3"
  url_launcher_linux:
    dependency: transitive
    description:
@@ -2812,10 +2821,10 @@ packages:
    dependency: transitive
    description:
      name: video_player_avfoundation
-      sha256: "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc"
+      sha256: "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f"
      url: "https://pub.dev"
    source: hosted
-    version: "2.7.0"
+    version: "2.7.1"
  video_player_platform_interface:
    dependency: transitive
    description:
@@ -2828,10 +2837,10 @@ packages:
    dependency: transitive
    description:
      name: video_player_web
-      sha256: "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476"
+      sha256: e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.4"
+    version: "2.3.5"
  video_thumbnail:
    dependency: "direct main"
    description:
@@ -2853,74 +2862,74 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
      url: "https://pub.dev"
    source: hosted
-    version: "14.3.0"
+    version: "14.2.5"
  volume_controller:
    dependency: transitive
    description:
      name: volume_controller
-      sha256: "30863a51338db47fe16f92902b1a6c4ee5e15c9287b46573d7c2eb6be1f197d2"
+      sha256: d75039e69c0d90e7810bfd47e3eedf29ff8543ea7a10392792e81f9bded7edf5
      url: "https://pub.dev"
    source: hosted
-    version: "3.3.1"
+    version: "3.4.0"
  wakelock_plus:
    dependency: "direct main"
    description:
      name: wakelock_plus
-      sha256: "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e"
+      sha256: a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.10"
+    version: "1.3.2"
  wakelock_plus_platform_interface:
    dependency: transitive
    description:
      name: wakelock_plus_platform_interface
-      sha256: "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a"
+      sha256: e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.2"
+    version: "1.2.3"
  watcher:
    dependency: "direct overridden"
    description:
      name: watcher
-      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
+      sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
  web:
    dependency: transitive
    description:
      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
+      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  web_socket:
    dependency: transitive
    description:
      name: web_socket
-      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.6"
+    version: "1.0.1"
  web_socket_channel:
    dependency: transitive
    description:
      name: web_socket_channel
-      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  webdriver:
    dependency: transitive
    description:
      name: webdriver
-      sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
+      sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.4"
+    version: "3.0.3"
  webkit_inspection_protocol:
    dependency: transitive
    description:
@@ -3019,4 +3028,4 @@ packages:
    version: "3.1.3"
 sdks:
  dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.27.0"
+  flutter: ">=3.24.0"
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -174,7 +174,7 @@ dependencies:
    git:
      url: https://github.com/eddyuan/privacy_screen.git
      ref: 855418e
-  pro_image_editor: ^7.2.0
+  pro_image_editor: 6.0.0
  receive_sharing_intent: # pub.dev is behind
    git:
      url: https://github.com/KasemJaffer/receive_sharing_intent.git