added functionality to clear search text

.gitea/workflows/android_build.yml

@@ -0,0 +1,79 @@
+name: Flutter APK Build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+
+permissions:
+  contents: write
+  actions:  read
+
+jobs:
+  build_apk:
+    name: Build Flutter APK
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # - name: Cache pub deps
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: ~/.pub-cache
+      #     key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.yaml') }}
+      #     restore-keys: ${{ runner.os }}-pub-
+
+      - name: Setup Java (Temurin 17)
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: '17'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          packages: "platform-tools platforms;android-36 build-tools;36.0.0"
+      
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter --version
+      - run: flutter doctor
+      
+      - name: Get dependencies
+        run: flutter pub get
+      
+      - name: Build APK
+        run: flutter build apk --release
+      
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: flutter-apk
+          path: build/app/outputs/flutter-apk/app-release.apk
+          retention-days: 30
+          
+      - name: Create Gitea release
+        uses: akkuman/gitea-release-action@v1
+        env:
+          GITEA_TOKEN: ${{ secrets.RUNNER_CREATE_RELEASE  }}
+        with:
+          # tag & name: adjust to your versioning
+          tag_name: "v0.1.${{ github.run_number }}"
+          name: "Flutter Android v0.1.${{ github.run_number }}"
+          body: "Automated build from CI"
+          draft: false
+          prerelease: false
+          files: |
+            build/app/outputs/flutter-apk/app-release.apk
+          gitea_url: "https://git.skup.in"
+          owner: "marco"
+          repo: "maps_bookmarks"

lib/main.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'pages/collection_page.dart';
 import 'pages/collections_list_page.dart';
+import 'pages/search_page.dart';
+import 'service/search_provider.dart';
 import 'service/shared_link_provider.dart';
 import 'service/storage.dart';
 import 'service/share_intent_service.dart';
@@ -11,8 +13,11 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await Storage.initialize();
   runApp(
-    ChangeNotifierProvider(
+    MultiProvider(
-      create: (_) => SharedLinkProvider(),
+      providers: [
+        ChangeNotifierProvider(create: (_) => SharedLinkProvider()),
+        ChangeNotifierProvider(create: (_) => SearchProvider()),
+      ],
       child: const MapsBookmarks(),
     ),
   );
@@ -68,6 +73,7 @@ class _MapsBookmarksState extends State<MapsBookmarks>
       routes: {
         CollectionsListPage.routeName: (context) => const CollectionsListPage(),
         CollectionPage.routeName: (context) => const CollectionPage(),
+        SearchPage.routeName: (context) => const SearchPage(),
       },
     );
   }

lib/model/collection.dart

@@ -7,12 +7,28 @@ class Collection {
     createdAt: json['createdAt'] as int,
   );
 
-  String name;
   int createdAt; // used as Id with millisecondsSinceEpoch
+  String name;
+
+  @override
+  bool operator ==(Object other) {
+    if (other is Collection) {
+      return hashCode == other.hashCode;
+    } else {
+      return false;
+    }
+  }
+
+  @override
+  int get hashCode => id.hashCode;
 
   int get id => createdAt;
 
   DateTime get createdDate => DateTime.fromMillisecondsSinceEpoch(createdAt);
 
   Map<String, dynamic> toJson() => {'name': name, 'createdAt': createdAt};
+
+  Collection copyWith({String? name}) {
+    return Collection(name: name ?? this.name, createdAt: createdAt);
+  }
 }

lib/pages/collection_page.dart

@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
 import '../model/bookmark.dart';
 import '../model/maps_link_metadata.dart';
 import '../service/bookmarks_provider.dart';
+import '../service/notifying.dart';
 import '../service/shared_link_provider.dart';
 import '../service/storage.dart';
 import '../service/url_launcher.dart';
@@ -21,6 +22,14 @@ class CollectionPage extends StatefulWidget {
 class _CollectionPageState extends State<CollectionPage> {
   MapsLinkMetadata? selectedMapsLink;
 
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (selectedMapsLink != null) onAddButtonPressed();
+    });
+  }
+
   void onAddButtonPressed() => showDialog(
     context: context,
     builder: (context) => CreateBookmarkDialog(
@@ -37,30 +46,27 @@ class _CollectionPageState extends State<CollectionPage> {
       selectedBookmark: selectedBookmark,
       onSavePressed: onBookmarkSaved,
       onDeletePressed: () {
-        Storage.deleteBookmarkById(selectedBookmark.id);
+        Storage.deleteBookmarkById(
-        setState(() {});
+          selectedBookmark.id,
+        ).whenComplete(() => setState(() {}));
       },
     ),
   );
 
-  @override
-  void initState() {
-    super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (selectedMapsLink != null) onAddButtonPressed();
-    });
-  }
-
   void onBookmarkSaved(Bookmark bookmark) {
     Storage.addOrUpdateBookmark(bookmark);
     setState(() {});
     context.read<SharedLinkProvider>().removeCurrentMapsLink();
   }
 
-  Widget bookmarkListBuilder(BuildContext context, Bookmark bookmark) {
+  Widget bookmarksListItemBuilder(BuildContext context, Bookmark bookmark) {
     return ListTile(
       title: Text(bookmark.name),
-      onTap: () => launchUrlFromString(bookmark.link),
+      onTap: () => launchUrlFromString(bookmark.link).then((errorCode) {
+        if (context.mounted) {
+          return Notifying.showUrlErrorSnackbar(context, errorCode);
+        }
+      }),
       onLongPress: () => editBookmark(bookmark),
     );
   }
@@ -95,7 +101,7 @@ class _CollectionPageState extends State<CollectionPage> {
       ),
       body: ListView.builder(
         itemBuilder: (context, index) =>
-            bookmarkListBuilder(context, bookmarks.elementAt(index)),
+            bookmarksListItemBuilder(context, bookmarks.elementAt(index)),
         itemCount: bookmarks.length,
       ),
       floatingActionButton: FloatingActionButton(

lib/pages/collections_list_page.dart

@@ -7,9 +7,11 @@ import '../service/shared_link_provider.dart';
 import '../service/storage.dart';
 import '../widgets/create_bookmark_collection_dialog.dart';
 import 'collection_page.dart';
+import 'search_page.dart' show SearchPage;
 
 class CollectionsListPage extends StatefulWidget {
   const CollectionsListPage({super.key});
+
   static const String routeName = '/collections';
 
   @override
@@ -17,38 +19,8 @@ class CollectionsListPage extends StatefulWidget {
 }
 
 class _CollectionsListPageState extends State<CollectionsListPage> {
-  final collections = Storage.loadCollections();
   bool addingNewBookmark = false;
 
-  @override
-  Widget build(BuildContext context) {
-    final provider = context.watch<SharedLinkProvider>();
-    addingNewBookmark = provider.currentMapsLinkMetadata != null;
-    return Scaffold(
-      appBar: AppBar(
-        title: addingNewBookmark ? Text('Choose Collection') : null,
-        actions: [
-          if (addingNewBookmark)
-            TextButton(
-              onPressed: () => provider.removeCurrentMapsLink(),
-              child: Text('Cancel'),
-            ),
-        ],
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: onAddButtonPressed,
-        child: Icon(Icons.add),
-      ),
-      body: ListView.builder(
-        itemBuilder: itemBuilder,
-        itemCount: collections.length,
-      ),
-      // bottomSheet: provider.currentMapsLinkMetadata == null
-      //     ? null
-      //     : BottomSheet(onClosing: () {}, builder: bottomSheetBuilder),
-    );
-  }
-
   Widget bottomSheetBuilder(BuildContext context) {
     final titleTextFieldController = TextEditingController(
       text: context
@@ -62,26 +34,25 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
     );
   }
 
-  void onAddButtonPressed() =>
+  void onAddButtonPressed() => showDialog(
-      showDialog(
     context: context,
     builder: (context) =>
         CreateBookmarkCollectionDialog(onSavePressed: onCollectionSaved),
-      ).whenComplete(() {
+  );
-        if (addingNewBookmark) navigateToCollection(collections.last.id);
-      });
 
-  void onCollectionSaved(String name) {
+  void onCollectionSaved(Collection collection) {
-    collections.add(Collection(name: name));
+    Storage.addOrUpdateCollection(collection);
-    Storage.saveCollections(collections);
     setState(() {});
   }
 
-  Widget itemBuilder(BuildContext context, int index) {
+  Widget collectionsListItemBuilder(
-    final collection = collections.elementAt(index);
+    BuildContext context,
+    Collection collection,
+  ) {
     return ListTile(
       title: Text(collection.name),
       onTap: () => navigateToCollection(collection.id),
+      onLongPress: () => onEditCollection(collection),
     );
   }
 
@@ -90,8 +61,56 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
     Navigator.pushNamed(context, CollectionPage.routeName);
   }
 
+  void onEditCollection(Collection selectedCollection) => showDialog(
+    context: context,
+    builder: (context) => CreateBookmarkCollectionDialog(
+      selectedCollection: selectedCollection,
+      onSavePressed: onCollectionSaved,
+      onDeletePressed: () {
+        Storage.deleteCollection(
+          selectedCollection,
+        ).whenComplete(() => setState(() {}));
+      },
+    ),
+  );
+
   @override
-  void didChangeDependencies() {
+  Widget build(BuildContext context) {
-    super.didChangeDependencies();
+    final collections = Storage.loadCollections();
+    final provider = context.watch<SharedLinkProvider>();
+    addingNewBookmark = provider.currentMapsLinkMetadata != null;
+    return Scaffold(
+      appBar: AppBar(
+        title: addingNewBookmark
+            ? Text('Choose Collection')
+            : Text('Collections'),
+        actions: [
+          if (addingNewBookmark)
+            TextButton(
+              onPressed: () => provider.removeCurrentMapsLink(),
+              child: Text('Cancel'),
+            )
+          else
+            IconButton(
+              onPressed: () =>
+                  Navigator.of(context).pushNamed(SearchPage.routeName),
+              icon: Icon(Icons.search),
+            ),
+        ],
+      ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: onAddButtonPressed,
+        child: Icon(Icons.add),
+      ),
+      body: collections.isNotEmpty
+          ? ListView.builder(
+              itemBuilder: (context, index) => collectionsListItemBuilder(
+                context,
+                collections.elementAt(index),
+              ),
+              itemCount: collections.length,
+            )
+          : Center(child: Text('Create your first Collection to get started!')),
+    );
   }
 }

lib/pages/search_page.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../service/search_provider.dart';
+import '../widgets/search_widgets/search_bar_widget.dart';
+import '../widgets/search_widgets/search_results_widget.dart';
+
+class SearchPage extends StatelessWidget {
+  const SearchPage({super.key});
+
+  static const String routeName = '/search';
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text('Search')),
+      body: Column(
+        children: [
+          SearchBarWidget(
+            onEditingComplete: context.read<SearchProvider>().setSearchText,
+            onResetSearch: context.read<SearchProvider>().removeSearchText,
+          ),
+          Expanded(child: SearchResultsWidget()),
+        ],
+      ),
+    );
+  }
+}

lib/service/notifying.dart

@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+
+import 'url_launcher.dart' show UrlLaunchErrorCode;
+
+class Notifying {
+  static void showSnackbar(
+    BuildContext context, {
+    required String text,
+    bool isError = false,
+  }) {
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          text,
+          style: isError
+              ? TextStyle(color: Theme.of(context).colorScheme.error)
+              : null,
+        ),
+      ),
+    );
+  }
+
+  static void showUrlErrorSnackbar(
+    BuildContext context,
+    UrlLaunchErrorCode errorCode,
+  ) {
+    String errorText = '';
+    if (errorCode == UrlLaunchErrorCode.none) {
+      return;
+    } else if (errorCode == UrlLaunchErrorCode.couldNotLaunch) {
+      errorText = 'Could not launch Url';
+    } else {
+      errorText = 'Invalid Url';
+    }
+    showSnackbar(context, text: errorText, isError: true);
+  }
+}

lib/service/search_provider.dart

@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+
+class SearchProvider extends ChangeNotifier {
+  String _searchText = '';
+
+  void setSearchText(String searchText, {bool silent = false}) {
+    _searchText = searchText;
+    if (!silent) notifyListeners();
+  }
+
+  void removeSearchText({bool silent = false}) {
+    _searchText = '';
+    if (!silent) notifyListeners();
+  }
+
+  String get searchText => _searchText;
+}

lib/service/storage.dart

@@ -6,10 +6,10 @@ import '../model/bookmark.dart';
 import '../model/collection.dart';
 
 class Storage {
-  static const String _collectionsKey = 'collections';
   static const String _bookmarksKey = 'bookmarks';
-  static const String _statsKey = 'stats';
+  static const String _collectionsKey = 'collections';
   static SharedPreferencesWithCache? _prefsWithCache;
+  static const String _statsKey = 'stats';
 
   static Future<void> initialize() async {
     _prefsWithCache = await SharedPreferencesWithCache.create(
@@ -19,15 +19,6 @@ class Storage {
     );
   }
 
-  static SharedPreferencesWithCache get _prefs {
-    if (_prefsWithCache == null) {
-      throw StateError(
-        'BookmarkStorage not initialized. Call initialize() first.',
-      );
-    }
-    return _prefsWithCache!;
-  }
-
   static List<Collection> loadCollections() {
     final jsonString = _prefs.getString(_collectionsKey) ?? '[]';
     final jsonList = jsonDecode(jsonString) as List;
@@ -36,12 +27,7 @@ class Storage {
         .toList();
   }
 
-  static Future<void> saveCollections(List<Collection> collections) async {
+  static List<Bookmark> loadBookmarks() {
-    final jsonList = collections.map((c) => c.toJson()).toList();
-    await _prefs.setString(_collectionsKey, jsonEncode(jsonList));
-  }
-
-  static List<Bookmark> loadAllBookmarks() {
     final jsonString = _prefs.getString(_bookmarksKey) ?? '[]';
     final jsonList = jsonDecode(jsonString) as List;
     return jsonList
@@ -49,42 +35,29 @@ class Storage {
         .toList();
   }
 
-  static Future<void> saveAllBookmarks(List<Bookmark> bookmarks) async {
+  static Future<void> saveCollections(List<Collection> collections) async {
+    final jsonList = collections.map((c) => c.toJson()).toList();
+    await _prefs.setString(_collectionsKey, jsonEncode(jsonList));
+  }
+
+  static Future<void> saveBookmarks(List<Bookmark> bookmarks) async {
     final jsonList = bookmarks.map((b) => b.toJson()).toList();
     await _prefs.setString(_bookmarksKey, jsonEncode(jsonList));
   }
 
   static List<Bookmark> loadBookmarksForCollection(int collectionId) {
-    final allBookmarks = loadAllBookmarks();
+    final allBookmarks = loadBookmarks();
     return allBookmarks.where((b) => b.collectionId == collectionId).toList();
   }
 
   static Future<void> addBookmark(Bookmark bookmark) async {
-    final bookmarks = loadAllBookmarks();
+    final bookmarks = loadBookmarks();
     bookmarks.add(bookmark);
-    await saveAllBookmarks(bookmarks);
+    await saveBookmarks(bookmarks);
-  }
-
-  static Future<void> deleteBookmark(Bookmark bookmark) async {
-    final bookmarks = loadAllBookmarks();
-    bookmarks.remove(bookmark);
-    await saveAllBookmarks(bookmarks);
-  }
-
-  static Future<void> deleteBookmarkById(int bookmarkId) async {
-    final bookmarks = loadAllBookmarks();
-    bookmarks.removeWhere((b) => b.id == bookmarkId);
-    await saveAllBookmarks(bookmarks);
-  }
-
-  static Future<void> deleteBookmarksForCollection(int collectionId) async {
-    final bookmarks = loadAllBookmarks();
-    bookmarks.removeWhere((b) => b.collectionId == collectionId);
-    await saveAllBookmarks(bookmarks);
   }
 
   static Future<void> addOrUpdateBookmark(Bookmark bookmark) async {
-    final bookmarks = loadAllBookmarks();
+    final bookmarks = loadBookmarks();
     final index = bookmarks.indexWhere((b) => b.id == bookmark.id);
 
     if (index == -1) {
@@ -92,7 +65,19 @@ class Storage {
     } else if (index >= 0) {
       bookmarks[index] = bookmark;
     }
-    await saveAllBookmarks(bookmarks);
+    await saveBookmarks(bookmarks);
+  }
+
+  static Future<void> addOrUpdateCollection(Collection collection) async {
+    final collections = loadCollections();
+    final index = collections.indexWhere((b) => b.id == collection.id);
+
+    if (index == -1) {
+      collections.add(collection);
+    } else if (index >= 0) {
+      collections[index] = collection;
+    }
+    await saveCollections(collections);
   }
 
   static Future<void> updateBookmarkById(
@@ -101,7 +86,7 @@ class Storage {
     String? description,
     String? link,
   }) async {
-    final bookmarks = loadAllBookmarks();
+    final bookmarks = loadBookmarks();
     final index = bookmarks.indexWhere((b) => b.id == bookmarkId);
 
     if (index == -1) return;
@@ -110,7 +95,34 @@ class Storage {
     if (description != null) bookmarks[index].description = description;
     if (link != null) bookmarks[index].link = link;
 
-    await saveAllBookmarks(bookmarks);
+    await saveBookmarks(bookmarks);
+  }
+
+  static Future<void> deleteBookmark(Bookmark bookmark) async {
+    final bookmarks = loadBookmarks();
+    bookmarks.remove(bookmark);
+    await saveBookmarks(bookmarks);
+  }
+
+  static Future<void> deleteBookmarkById(int bookmarkId) async {
+    final bookmarks = loadBookmarks();
+    bookmarks.removeWhere((b) => b.id == bookmarkId);
+    await saveBookmarks(bookmarks);
+  }
+
+  static Future<void> deleteBookmarksForCollection(int collectionId) async {
+    final bookmarks = loadBookmarks();
+    bookmarks.removeWhere((b) => b.collectionId == collectionId);
+    await saveBookmarks(bookmarks);
+  }
+
+  static Future<void> deleteCollection(Collection collection) async {
+    final collections = loadCollections();
+    final bookmarks = loadBookmarks();
+    bookmarks.removeWhere((bookmark) => bookmark.collectionId == collection.id);
+    collections.remove(collection);
+    await saveBookmarks(bookmarks);
+    await saveCollections(collections);
   }
 
   static Map<String, int> getStats() {
@@ -124,7 +136,7 @@ class Storage {
 
   static Future<void> updateStats() async {
     final collections = loadCollections();
-    final bookmarks = loadAllBookmarks();
+    final bookmarks = loadBookmarks();
 
     final stats = {
       'totalCollections': collections.length,
@@ -134,4 +146,13 @@ class Storage {
 
     await _prefs.setString(_statsKey, jsonEncode(stats));
   }
+
+  static SharedPreferencesWithCache get _prefs {
+    if (_prefsWithCache == null) {
+      throw StateError(
+        'BookmarkStorage not initialized. Call initialize() first.',
+      );
+    }
+    return _prefsWithCache!;
+  }
 }

lib/service/url_launcher.dart

@@ -1,8 +1,14 @@
 import 'package:url_launcher/url_launcher.dart';
 
-Future<void> launchUrlFromString(String url) async {
+Future<UrlLaunchErrorCode> launchUrlFromString(String url) async {
-  final Uri uri = Uri.parse(url);
+  final Uri? uri = Uri.tryParse(url);
+  final isValid =
+      uri != null && uri.hasAbsolutePath && uri.scheme.startsWith('http');
+  if (!isValid) return UrlLaunchErrorCode.invalidUrl;
   if (!await launchUrl(uri, mode: LaunchMode.externalApplication)) {
-    throw Exception('Could not launch $url');
+    return UrlLaunchErrorCode.couldNotLaunch;
   }
+  return UrlLaunchErrorCode.none;
 }
+
+enum UrlLaunchErrorCode { none, couldNotLaunch, invalidUrl }

lib/widgets/create_bookmark_collection_dialog.dart

@@ -1,18 +1,35 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import '../model/collection.dart';
+import 'edit_dialog_widgets/edit_dialog_actions.dart' show EditDialogActions;
+import 'edit_dialog_widgets/edit_dialog_title.dart';
+
 class CreateBookmarkCollectionDialog extends StatelessWidget {
   const CreateBookmarkCollectionDialog({
     super.key,
     required this.onSavePressed,
+    this.onDeletePressed,
+    this.selectedCollection,
   });
-  final void Function(String name) onSavePressed;
+
+  final void Function()? onDeletePressed;
+  final void Function(Collection collection) onSavePressed;
+  final Collection? selectedCollection;
 
   @override
   Widget build(BuildContext context) {
     final nameController = TextEditingController();
+
+    if (selectedCollection != null) {
+      nameController.text = selectedCollection!.name;
+    }
+
     return AlertDialog(
-      title: Text('Create Collection'),
+      title: EditDialogTitle(
+        dialogType: DialogType.collection,
+        onDeletePressed: onDeletePressed,
+      ),
       content: TextField(
         controller: nameController,
         autofocus: true,
@@ -23,17 +40,20 @@ class CreateBookmarkCollectionDialog extends StatelessWidget {
           FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
         ],
         decoration: InputDecoration(
+          // TODO: Localize
           labelText: 'Collection Name',
           border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)),
         ),
       ),
       actions: [
-        FloatingActionButton(
+        EditDialogActions(
-          onPressed: () {
+          onSavePressed: () {
-            onSavePressed(nameController.text);
+            final bookmark =
+                selectedCollection?.copyWith(name: nameController.text) ??
+                Collection(name: nameController.text);
+            onSavePressed(bookmark);
             Navigator.of(context).pop();
           },
-          child: Icon(Icons.save),
         ),
       ],
     );

lib/widgets/create_bookmark_dialog.dart

@@ -3,6 +3,8 @@ import 'package:flutter/services.dart';
 
 import '../model/bookmark.dart';
 import '../model/maps_link_metadata.dart';
+import 'edit_dialog_widgets/edit_dialog_actions.dart';
+import 'edit_dialog_widgets/edit_dialog_title.dart';
 
 class CreateBookmarkDialog extends StatelessWidget {
   const CreateBookmarkDialog({
@@ -13,6 +15,7 @@ class CreateBookmarkDialog extends StatelessWidget {
     this.selectedBookmark,
     this.selectedMapsLink,
   });
+
   final void Function(Bookmark bookmark)? onSavePressed;
   final void Function()? onDeletePressed;
   final int collectionId;
@@ -36,7 +39,10 @@ class CreateBookmarkDialog extends StatelessWidget {
     }
 
     return AlertDialog(
-      title: Text('Create Bookmark'),
+      title: EditDialogTitle(
+        dialogType: DialogType.bookmark,
+        onDeletePressed: onDeletePressed,
+      ),
       content: SingleChildScrollView(
         child: Column(
           children: [
@@ -97,15 +103,8 @@ class CreateBookmarkDialog extends StatelessWidget {
         ),
       ),
       actions: [
-        Row(
+        EditDialogActions(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          onSavePressed: () {
-          children: [
-            TextButton(
-              onPressed: () => Navigator.of(context).pop(),
-              child: Text('Cancel'),
-            ),
-            FloatingActionButton(
-              onPressed: () {
             final bookmark =
                 selectedBookmark?.copyWith(
                   name: nameController.text,
@@ -121,17 +120,6 @@ class CreateBookmarkDialog extends StatelessWidget {
             onSavePressed?.call(bookmark);
             Navigator.of(context).pop();
           },
-              child: Icon(Icons.save),
-            ),
-            if (selectedBookmark != null)
-              TextButton(
-                onPressed: () {
-                  onDeletePressed?.call();
-                  Navigator.of(context).pop();
-                },
-                child: Text('Delete'),
-              ),
-          ],
         ),
       ],
     );

lib/widgets/edit_dialog_widgets/edit_dialog_actions.dart

@@ -0,0 +1,22 @@
+import 'package:flutter/material.dart'
+    show TextButton, FloatingActionButton, Icons;
+import 'package:flutter/widgets.dart';
+
+class EditDialogActions extends StatelessWidget {
+  const EditDialogActions({super.key, required this.onSavePressed});
+  final VoidCallback onSavePressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: Text('Cancel'),
+        ),
+        FloatingActionButton(onPressed: onSavePressed, child: Icon(Icons.save)),
+      ],
+    );
+  }
+}

lib/widgets/edit_dialog_widgets/edit_dialog_title.dart

@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart' show TextButton, Theme;
+import 'package:flutter/widgets.dart';
+
+class EditDialogTitle extends StatelessWidget {
+  const EditDialogTitle({
+    super.key,
+    this.onDeletePressed,
+    required this.dialogType,
+  });
+  final VoidCallback? onDeletePressed;
+  final DialogType dialogType;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        // TODO: Localize
+        if (dialogType == DialogType.bookmark)
+          Text('Create Bookmark')
+        else
+          Text('Create Collection'),
+
+        if (onDeletePressed != null)
+          TextButton(
+            onPressed: () {
+              onDeletePressed!.call();
+              Navigator.of(context).pop();
+            },
+            child: Text(
+              'Delete',
+              style: TextStyle(color: Theme.of(context).colorScheme.error),
+            ),
+          ),
+      ],
+    );
+  }
+}
+
+enum DialogType { bookmark, collection }

lib/widgets/search_widgets/search_bar_widget.dart

@@ -0,0 +1,34 @@
+import 'package:flutter/material.dart';
+
+class SearchBarWidget extends StatelessWidget {
+  const SearchBarWidget({
+    super.key,
+    required this.onEditingComplete,
+    required this.onResetSearch,
+  });
+
+  final Function(String searchString) onEditingComplete;
+  final Function() onResetSearch;
+
+  void onChanged(String text, BuildContext context) {
+    if (context.mounted) onEditingComplete(text);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final searchTextController = TextEditingController();
+    return TextField(
+      controller: searchTextController,
+      onChanged: (text) => onChanged(text, context),
+      decoration: InputDecoration(
+        suffixIcon: IconButton(
+          onPressed: () {
+            searchTextController.clear();
+            onResetSearch();
+          },
+          icon: Icon(Icons.delete_outline_outlined),
+        ),
+      ),
+    );
+  }
+}

lib/widgets/search_widgets/search_results_widget.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../../model/bookmark.dart';
+import '../../service/notifying.dart';
+import '../../service/search_provider.dart';
+import '../../service/storage.dart' show Storage;
+import '../../service/url_launcher.dart';
+
+class SearchResultsWidget extends StatefulWidget {
+  const SearchResultsWidget({super.key});
+
+  @override
+  State<SearchResultsWidget> createState() => _SearchResultsWidgetState();
+}
+
+class _SearchResultsWidgetState extends State<SearchResultsWidget> {
+  final List<Bookmark> allBookmarks = Storage.loadBookmarks();
+
+  @override
+  void deactivate() {
+    context.read<SearchProvider>().removeSearchText(silent: true);
+    super.deactivate();
+  }
+
+  Widget bookmarkListItemBuilder(BuildContext context, int index) {
+    final bookmark = filteredBookmarks.elementAt(index);
+    return ListTile(
+      title: Text(bookmark.name),
+      onTap: () => launchUrlFromString(bookmark.link).then((errorCode) {
+        if (context.mounted && errorCode != UrlLaunchErrorCode.none) {
+          Notifying.showUrlErrorSnackbar(context, errorCode);
+        } else if (context.mounted) {
+          Navigator.of(context).pop();
+        }
+      }),
+    );
+  }
+
+  Iterable<Bookmark> get filteredBookmarks => allBookmarks.where(
+    (bookmark) => bookmark.name.toLowerCase().contains(
+      context.watch<SearchProvider>().searchText.toLowerCase(),
+    ),
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    if (filteredBookmarks.isNotEmpty) {
+      return ListView.builder(
+        itemBuilder: bookmarkListItemBuilder,
+        itemCount: filteredBookmarks.length,
+      );
+    }
+    return Center(child: Text('Start searching'));
+  }
+}