small ux improvements

lib/pages/collection_page.dart

@@ -72,7 +72,7 @@ class _CollectionPageState extends State<CollectionPage> {
       selected: selected,
       onTap: () {
         if (selected) {
-          onCancelSelectionPressed();
+          deselectBookmark();
           setState(() {});
         } else if (selectedBookmarkId != -1 && !selected) {
           selectedBookmarkId = bookmark.id;
@@ -131,7 +131,7 @@ class _CollectionPageState extends State<CollectionPage> {
         bottomNavigationBar: selectedBookmarkId > 0
             ? ListItemActionsWidget(
                 onDeletePressed: onDeleteBookmarkPressed,
-                onCancelPressed: onCancelSelectionPressed,
+                onCancelPressed: deselectBookmark,
                 onEditPressed: () => editBookmark(
                   bookmarks.firstWhere(
                     (element) => element.id == selectedBookmarkId,
@@ -158,8 +158,6 @@ class _CollectionPageState extends State<CollectionPage> {
     );
   }
 
-  void onCancelSelectionPressed() => deselectBookmark();
-
   void onDeleteBookmarkPressed() {
     Storage.deleteBookmarkById(
       selectedBookmarkId,

lib/pages/collections_list_page.dart

@@ -6,6 +6,8 @@ import '../model/collection.dart';
 import '../service/bookmarks_provider.dart';
 import '../service/shared_link_provider.dart';
 import '../service/storage.dart';
+import '../widgets/collection_page_widgets/list_item_actions_widget.dart'
+    show ListItemActionsWidget;
 import '../widgets/create_bookmark_collection_dialog.dart';
 import 'collection_page.dart';
 import 'search_page.dart' show SearchPage;
@@ -23,6 +25,7 @@ class CollectionsListPage extends StatefulWidget {
 class _CollectionsListPageState extends State<CollectionsListPage> {
   bool addingNewBookmark = false;
   var bookmarkCountMap = <int, int>{};
+  int selectedCollectionId = -1;
 
   Widget bottomSheetBuilder(BuildContext context) {
     final titleTextFieldController = TextEditingController(
@@ -52,11 +55,27 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
     BuildContext context,
     Collection collection,
   ) {
+    final selected = selectedCollectionId == collection.id;
     return ListTile(
       title: Text(collection.name),
-      onTap: () => navigateToCollection(collection.id),
+      onTap: () {
-      onLongPress: () => onEditCollection(collection),
+        if (selected) {
+          deselectCollection();
+          setState(() {});
+        } else if (selectedCollectionId != -1 && !selected) {
+          selectedCollectionId = collection.id;
+          setState(() {});
+        } else {
+          navigateToCollection(collection.id);
+        }
+      },
+      onLongPress: () => addingNewBookmark
+          ? null
+          : setState(() {
+              selectedCollectionId = collection.id;
+            }),
       leading: const Icon(Icons.list_rounded),
+      selected: selected,
       trailing: Text(
         bookmarkCountMap[collection.id]?.toString() ?? '0',
         style: Theme.of(context).textTheme.bodyMedium,
@@ -74,13 +93,8 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
     builder: (context) => CreateBookmarkCollectionDialog(
       selectedCollection: selectedCollection,
       onSavePressed: onCollectionSaved,
-      onDeletePressed: () {
-        Storage.deleteCollection(
-          selectedCollection,
-        ).whenComplete(() => setState(() {}));
-      },
     ),
-  );
+  ).whenComplete(deselectCollection);
 
   @override
   Widget build(BuildContext context) {
@@ -89,78 +103,105 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
     addingNewBookmark =
         Provider.of<SharedLinkProvider>(context).currentMapsLinkMetadata !=
         null;
-    return Scaffold(
+    return PopScope(
-      appBar: AppBar(
+      canPop: selectedCollectionId == -1,
-        title: addingNewBookmark
+      onPopInvokedWithResult: (didPop, result) {
-            ? Text(AppLocalizations.of(context)!.chooseCollection)
+        if (didPop == false) deselectCollection();
-            : Text(AppLocalizations.of(context)!.collections),
+      },
-        actions: [
+      child: Scaffold(
-          if (addingNewBookmark)
+        appBar: AppBar(
-            TextButton(
+          title: addingNewBookmark
-              onPressed: () => Provider.of<SharedLinkProvider>(
+              ? Text(AppLocalizations.of(context)!.chooseCollection)
-                context,
+              : Text(AppLocalizations.of(context)!.collections),
-                listen: false,
+          actions: [
-              ).removeCurrentMapsLink(),
+            if (addingNewBookmark)
-              child: Text(AppLocalizations.of(context)!.cancel),
+              TextButton(
-            )
+                onPressed: () => Provider.of<SharedLinkProvider>(
-          else
+                  context,
-            IconButton(
+                  listen: false,
-              onPressed: () =>
+                ).removeCurrentMapsLink(),
-                  Navigator.of(context).pushNamed(SearchPage.routeName),
+                child: Text(AppLocalizations.of(context)!.cancel),
-              icon: Icon(Icons.search_rounded),
+              )
-            ),
+            else
-          if (!addingNewBookmark)
+              IconButton(
-            IconButton(
+                onPressed: () =>
-              onPressed: () =>
+                    Navigator.of(context).pushNamed(SearchPage.routeName),
-                  Navigator.of(context).pushNamed(SettingsPage.routeName),
+                icon: Icon(Icons.search_rounded),
-              icon: Icon(Icons.settings_rounded),
+              ),
-            ),
+            if (!addingNewBookmark)
-        ],
+              IconButton(
-      ),
+                onPressed: () =>
-      bottomNavigationBar: addingNewBookmark
+                    Navigator.of(context).pushNamed(SettingsPage.routeName),
-          ? Container(
+                icon: Icon(Icons.settings_rounded),
-              decoration: BoxDecoration(
+              ),
-                borderRadius: BorderRadiusGeometry.circular(12),
+          ],
+        ),
+        bottomNavigationBar: addingNewBookmark
+            ? Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadiusGeometry.circular(12),
 
-                color: Theme.of(context).colorScheme.surfaceContainer,
+                  color: Theme.of(context).colorScheme.surfaceContainer,
-              ),
-              height: 100,
-              child: Padding(
-                padding: EdgeInsetsGeometry.fromLTRB(
-                  MediaQuery.of(context).size.width * 0.05,
-                  15,
-                  MediaQuery.of(context).size.width * 0.05,
-                  MediaQuery.of(context).viewInsets.bottom,
                 ),
-                child: Text(
+                height: 100,
-                  Provider.of<SharedLinkProvider>(
+                child: Padding(
-                    context,
+                  padding: EdgeInsetsGeometry.fromLTRB(
-                  ).currentMapsLinkMetadata!.placeName,
+                    MediaQuery.of(context).size.width * 0.05,
-                ),
+                    15,
-              ),
+                    MediaQuery.of(context).size.width * 0.05,
-            )
+                    MediaQuery.of(context).viewInsets.bottom,
-          : null,
+                  ),
-      floatingActionButton: FloatingActionButton(
+                  child: Text(
-        onPressed: onAddButtonPressed,
+                    Provider.of<SharedLinkProvider>(
-        child: Icon(Icons.add),
+                      context,
-      ),
+                    ).currentMapsLinkMetadata!.placeName,
-      body: collections.isNotEmpty
-          ? Center(
-              child: SizedBox(
-                width: MediaQuery.of(context).size.width * 0.9,
-                child: ListView.separated(
-                  itemBuilder: (context, index) => collectionsListItemBuilder(
-                    context,
-                    collections.elementAt(index),
                   ),
-                  itemCount: collections.length,
-                  separatorBuilder: (context, index) => SizedBox(height: 10),
                 ),
+              )
+            : selectedCollectionId > 0
+            ? ListItemActionsWidget(
+                onDeletePressed: onDeleteCollectionPressed,
+                onCancelPressed: deselectCollection,
+                onEditPressed: () => onEditCollection(
+                  collections.firstWhere(
+                    (element) => element.id == selectedCollectionId,
+                  ),
+                ),
+              )
+            : null,
+        floatingActionButton: FloatingActionButton(
+          onPressed: onAddButtonPressed,
+          child: Icon(Icons.add),
+        ),
+        body: collections.isNotEmpty
+            ? Center(
+                child: SizedBox(
+                  width: MediaQuery.of(context).size.width * 0.9,
+                  child: ListView.separated(
+                    itemBuilder: (context, index) => collectionsListItemBuilder(
+                      context,
+                      collections.elementAt(index),
+                    ),
+                    itemCount: collections.length,
+                    separatorBuilder: (context, index) => SizedBox(height: 10),
+                  ),
+                ),
+              )
+            : Center(
+                child: Text(AppLocalizations.of(context)!.tipCreateCollections),
               ),
-            )
+      ),
-          : Center(
-              child: Text(AppLocalizations.of(context)!.tipCreateCollections),
-            ),
     );
   }
+
+  void onDeleteCollectionPressed() {
+    Storage.deleteCollectionById(
+      selectedCollectionId,
+    ).whenComplete(() => deselectCollection());
+  }
+
+  void deselectCollection() {
+    selectedCollectionId = -1;
+    setState(() {});
+  }
 }

lib/service/storage.dart

@@ -163,6 +163,13 @@ class Storage {
     await saveCollections(collections);
   }
 
+  static Future<void> deleteCollectionById(int collectionId) async {
+    final collections = loadCollections();
+    await deleteCollection(
+      collections.firstWhere((collection) => collection.id == collectionId),
+    );
+  }
+
   static Map<String, int> getStats() {
     final statsJson = _prefs.getString(_statsKey) ?? '{}';
     final stats = jsonDecode(statsJson) as Map<String, dynamic>;