Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Fix edited photo viewer ordering

Neeraj Guptad775004b707c
diff --git a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart
index 0da02c6fe1..20762ed6a4 100644
--- a/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart
+++ b/mobile/apps/photos/lib/ui/tools/editor/image_editor/image_editor_page.dart
@@ -150,7 +150,7 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
showShortToast(context, l10n.editsSaved);
_logger.info("Original file " + widget.originalFile.toString());
_logger.info("Saved edits to file " + newFile.toString());
- final files = widget.detailPageConfig.files;
+ final files = List<ente.EnteFile>.of(widget.detailPageConfig.files);
// the index could be -1 if the files fetched doesn't contain the newly
// edited files
@@ -158,8 +158,17 @@ class _ImageEditorPageState extends State<ImageEditorPage> {
(file) => file.generatedID == newFile.generatedID,
);
if (selectionIndex == -1) {
- files.add(newFile);
- selectionIndex = files.length - 1;
+ final fallbackIndex = min(
+ max(widget.detailPageConfig.selectedIndex, 0),
+ files.length,
+ );
+ final originalIndex = widget.originalFile.generatedID == null
+ ? -1
+ : files.indexWhere(
+ (file) => file.generatedID == widget.originalFile.generatedID,
+ );
+ selectionIndex = originalIndex == -1 ? fallbackIndex : originalIndex;
+ files.insert(selectionIndex, newFile);
}
await dialog.hide();
if (!mounted) return;