fix(bookmark_collections): 🐛 prevent from overwriting an already exis…

…ting collection (#58)
albertms10 · Feb 8, 2024 · 504abb6 · 504abb6
1 parent b2dd02d
commit 504abb6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/lib/localization/app_ca.arb b/lib/localization/app_ca.arb
@@ -33,6 +33,7 @@
   "cancel": "Canceŀla",
   "ok": "D’acord",
   "emptyCollectionValidation": "El nom de la coŀlecció no pot ser buit",
+  "collectionNameAlreadyInUseValidation": "El nom de la coŀlecció ja està en ús",
   "newCollection": "Nova coŀlecció",
   "addToACollection": "Afegeix a una coŀlecció",
   "changeCollections": "Canvia les coŀleccions",

diff --git a/lib/src/model/bookmark_collections.dart b/lib/src/model/bookmark_collections.dart
@@ -17,10 +17,14 @@ final class BookmarkCollections with ChangeNotifier {
   Set<BookmarkCollection> get sortedCollections =>
       SplayTreeSet.of(_collections.values);
 
-  void addCollection(String name) {
+  bool addCollection(String name) {
     notifyListeners();
 
+    if (_collections.containsKey(name)) return false;
+
     _collections.addAll({name: BookmarkCollection(name, {})});
+
+    return true;
   }
 
   /// Returns whether [id] is bookmarked.

diff --git a/lib/src/pages/collections_page.dart b/lib/src/pages/collections_page.dart
@@ -85,6 +85,8 @@ class _AddCollectionDialogState extends State<_AddCollectionDialog> {
 
   @override
   Widget build(BuildContext context) {
+    final collections = Provider.of<BookmarkCollections>(context).collections;
+
     final appLocalizations = AppLocalizations.of(context);
 
     return Form(
@@ -96,9 +98,12 @@ class _AddCollectionDialogState extends State<_AddCollectionDialog> {
           autofocus: true,
           decoration: const InputDecoration(errorMaxLines: 2),
           validator: (value) {
-            if (value == null || value.isEmpty) {
+            if (value == null || value.trim().isEmpty) {
               return appLocalizations.emptyCollectionValidation;
             }
+            if (collections.containsKey(value.trim())) {
+              return appLocalizations.collectionNameAlreadyInUseValidation;
+            }
 
             return null;
           },
@@ -110,9 +115,8 @@ class _AddCollectionDialogState extends State<_AddCollectionDialog> {
           ),
           TextButton(
             onPressed: () {
-              if (_formKey.currentState!.validate()) {
-                Navigator.of(context).pop<String>(_controller.text);
-              }
+              if (!_formKey.currentState!.validate()) return;
+              Navigator.of(context).pop<String>(_controller.text.trim());
             },
             child: Text(appLocalizations.ok),
           ),