From 385f35b6e55846cf4ceb71b7c946ca1dc76505b0 Mon Sep 17 00:00:00 2001
From: Jacques Lucke <mail@jlucke.com>
Date: Thu, 5 Jun 2025 19:41:48 +0200
Subject: [PATCH] pop album selection

---
 mobile/lib/ui/collections/flex_grid_view.dart | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/ui/collections/flex_grid_view.dart b/mobile/lib/ui/collections/flex_grid_view.dart
index 5080167937..34e2402dfc 100644
--- a/mobile/lib/ui/collections/flex_grid_view.dart
+++ b/mobile/lib/ui/collections/flex_grid_view.dart
@@ -109,9 +109,23 @@ class _CollectionsFlexiGridViewWidgetState
 
   @override
   Widget build(BuildContext context) {
-    return widget.albumViewType == AlbumViewType.grid
-        ? _buildGridView(context, const ValueKey("grid_view"))
-        : _buildListView(context, const ValueKey("list_view"));
+    return PopScope(
+      canPop: !isAnyAlbumSelected,
+      onPopInvokedWithResult: (didPop, _) {
+        if (didPop) {
+          return;
+        }
+        if (isAnyAlbumSelected) {
+          widget.selectedAlbums!.clearAll();
+          setState(() {
+            isAnyAlbumSelected = false;
+          });
+        }
+      },
+      child: widget.albumViewType == AlbumViewType.grid
+          ? _buildGridView(context, const ValueKey("grid_view"))
+          : _buildListView(context, const ValueKey("list_view")),
+    );
   }
 
   Widget _buildGridView(BuildContext context, Key key) {