Merge pull request 'Theme changes' (#4) from development into main

Reviewed-on: #4

.gitea/workflows/android_build.yml

@@ -0,0 +1,71 @@
+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: 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: "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"

l10n.yaml

@@ -0,0 +1,3 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart

lib/l10n/app_de.arb

@@ -0,0 +1,27 @@
+{
+    "@@locale": "de", 
+    "addToCollection": "Speichern in {collection_name}",
+    "@addToCollection": {
+        "placeholders": {
+            "collection_name" : {
+                "type": "String"
+            }
+        }
+    },
+    "cancel": "Abbrechen",
+    "chooseCollection": "Sammlung auswählen",
+    "collections": "Sammlungen",
+    "tipCreateCollections": "Erstelle deine erste Sammlung!",
+    "search": "Suche",
+    "createBookmark": "Lesezeichen erstellen",
+    "createCollection": "Sammlung erstellen",
+    "create": "Erstellen",
+    "delete": "Löschen",
+    "add": "Hinzufügen",
+    "startSearching": "Suche etwas",
+    "tipNoResults": "Keine Suchergebnisse gefunden",
+    "collectionName": "Name der Sammlung",
+    "bookmarkTitle": "Titel des Lesezeichens",
+    "url": "Url",
+    "description": "Beschreibung"
+}

lib/l10n/app_en.arb

@@ -0,0 +1,27 @@
+{
+    "@@locale": "en", 
+    "addToCollection": "Add to {collection_name}",
+    "@addToCollection": {
+        "placeholders": {
+            "collection_name" : {
+                "type": "String"
+            }
+        }
+    },
+    "cancel": "Cancel",
+    "chooseCollection": "Choose Collection",
+    "collections": "Collections",
+    "tipCreateCollections": "Create your first Collection to get started!",
+    "search": "Search",
+    "createBookmark": "Create Bookmark",
+    "createCollection": "Create Collection",
+    "create": "Create",
+    "delete": "Delete",
+    "add": "Add",
+    "startSearching": "Start searching",
+    "tipNoResults": "There are no results that match your search",
+    "collectionName": "Collection Name",
+    "bookmarkTitle": "Bookmark Title",
+    "url": "Url",
+    "description": "Description"
+}

lib/l10n/app_localizations.dart

@@ -0,0 +1,236 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:intl/intl.dart' as intl;
+
+import 'app_localizations_de.dart';
+import 'app_localizations_en.dart';
+
+// ignore_for_file: type=lint
+
+/// Callers can lookup localized strings with an instance of AppLocalizations
+/// returned by `AppLocalizations.of(context)`.
+///
+/// Applications need to include `AppLocalizations.delegate()` in their app's
+/// `localizationDelegates` list, and the locales they support in the app's
+/// `supportedLocales` list. For example:
+///
+/// ```dart
+/// import 'l10n/app_localizations.dart';
+///
+/// return MaterialApp(
+///   localizationsDelegates: AppLocalizations.localizationsDelegates,
+///   supportedLocales: AppLocalizations.supportedLocales,
+///   home: MyApplicationHome(),
+/// );
+/// ```
+///
+/// ## Update pubspec.yaml
+///
+/// Please make sure to update your pubspec.yaml to include the following
+/// packages:
+///
+/// ```yaml
+/// dependencies:
+///   # Internationalization support.
+///   flutter_localizations:
+///     sdk: flutter
+///   intl: any # Use the pinned version from flutter_localizations
+///
+///   # Rest of dependencies
+/// ```
+///
+/// ## iOS Applications
+///
+/// iOS applications define key application metadata, including supported
+/// locales, in an Info.plist file that is built into the application bundle.
+/// To configure the locales supported by your app, you’ll need to edit this
+/// file.
+///
+/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
+/// Then, in the Project Navigator, open the Info.plist file under the Runner
+/// project’s Runner folder.
+///
+/// Next, select the Information Property List item, select Add Item from the
+/// Editor menu, then select Localizations from the pop-up menu.
+///
+/// Select and expand the newly-created Localizations item then, for each
+/// locale your application supports, add a new item and select the locale
+/// you wish to add from the pop-up menu in the Value field. This list should
+/// be consistent with the languages listed in the AppLocalizations.supportedLocales
+/// property.
+abstract class AppLocalizations {
+  AppLocalizations(String locale)
+    : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+
+  final String localeName;
+
+  static AppLocalizations? of(BuildContext context) {
+    return Localizations.of<AppLocalizations>(context, AppLocalizations);
+  }
+
+  static const LocalizationsDelegate<AppLocalizations> delegate =
+      _AppLocalizationsDelegate();
+
+  /// A list of this localizations delegate along with the default localizations
+  /// delegates.
+  ///
+  /// Returns a list of localizations delegates containing this delegate along with
+  /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
+  /// and GlobalWidgetsLocalizations.delegate.
+  ///
+  /// Additional delegates can be added by appending to this list in
+  /// MaterialApp. This list does not have to be used at all if a custom list
+  /// of delegates is preferred or required.
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
+      <LocalizationsDelegate<dynamic>>[
+        delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+      ];
+
+  /// A list of this localizations delegate's supported locales.
+  static const List<Locale> supportedLocales = <Locale>[
+    Locale('de'),
+    Locale('en'),
+  ];
+
+  /// No description provided for @addToCollection.
+  ///
+  /// In en, this message translates to:
+  /// **'Add to {collection_name}'**
+  String addToCollection(String collection_name);
+
+  /// No description provided for @cancel.
+  ///
+  /// In en, this message translates to:
+  /// **'Cancel'**
+  String get cancel;
+
+  /// No description provided for @chooseCollection.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose Collection'**
+  String get chooseCollection;
+
+  /// No description provided for @collections.
+  ///
+  /// In en, this message translates to:
+  /// **'Collections'**
+  String get collections;
+
+  /// No description provided for @tipCreateCollections.
+  ///
+  /// In en, this message translates to:
+  /// **'Create your first Collection to get started!'**
+  String get tipCreateCollections;
+
+  /// No description provided for @search.
+  ///
+  /// In en, this message translates to:
+  /// **'Search'**
+  String get search;
+
+  /// No description provided for @createBookmark.
+  ///
+  /// In en, this message translates to:
+  /// **'Create Bookmark'**
+  String get createBookmark;
+
+  /// No description provided for @createCollection.
+  ///
+  /// In en, this message translates to:
+  /// **'Create Collection'**
+  String get createCollection;
+
+  /// No description provided for @create.
+  ///
+  /// In en, this message translates to:
+  /// **'Create'**
+  String get create;
+
+  /// No description provided for @delete.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete'**
+  String get delete;
+
+  /// No description provided for @add.
+  ///
+  /// In en, this message translates to:
+  /// **'Add'**
+  String get add;
+
+  /// No description provided for @startSearching.
+  ///
+  /// In en, this message translates to:
+  /// **'Start searching'**
+  String get startSearching;
+
+  /// No description provided for @tipNoResults.
+  ///
+  /// In en, this message translates to:
+  /// **'There are no results that match your search'**
+  String get tipNoResults;
+
+  /// No description provided for @collectionName.
+  ///
+  /// In en, this message translates to:
+  /// **'Collection Name'**
+  String get collectionName;
+
+  /// No description provided for @bookmarkTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Bookmark Title'**
+  String get bookmarkTitle;
+
+  /// No description provided for @url.
+  ///
+  /// In en, this message translates to:
+  /// **'Url'**
+  String get url;
+
+  /// No description provided for @description.
+  ///
+  /// In en, this message translates to:
+  /// **'Description'**
+  String get description;
+}
+
+class _AppLocalizationsDelegate
+    extends LocalizationsDelegate<AppLocalizations> {
+  const _AppLocalizationsDelegate();
+
+  @override
+  Future<AppLocalizations> load(Locale locale) {
+    return SynchronousFuture<AppLocalizations>(lookupAppLocalizations(locale));
+  }
+
+  @override
+  bool isSupported(Locale locale) =>
+      <String>['de', 'en'].contains(locale.languageCode);
+
+  @override
+  bool shouldReload(_AppLocalizationsDelegate old) => false;
+}
+
+AppLocalizations lookupAppLocalizations(Locale locale) {
+  // Lookup logic when only language code is specified.
+  switch (locale.languageCode) {
+    case 'de':
+      return AppLocalizationsDe();
+    case 'en':
+      return AppLocalizationsEn();
+  }
+
+  throw FlutterError(
+    'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+    'an issue with the localizations generation tool. Please file an issue '
+    'on GitHub with a reproducible sample app and the gen-l10n configuration '
+    'that was used.',
+  );
+}

lib/l10n/app_localizations_de.dart

@@ -0,0 +1,63 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for German (`de`).
+class AppLocalizationsDe extends AppLocalizations {
+  AppLocalizationsDe([String locale = 'de']) : super(locale);
+
+  @override
+  String addToCollection(String collection_name) {
+    return 'Speichern in $collection_name';
+  }
+
+  @override
+  String get cancel => 'Abbrechen';
+
+  @override
+  String get chooseCollection => 'Sammlung auswählen';
+
+  @override
+  String get collections => 'Sammlungen';
+
+  @override
+  String get tipCreateCollections => 'Erstelle deine erste Sammlung!';
+
+  @override
+  String get search => 'Suche';
+
+  @override
+  String get createBookmark => 'Lesezeichen erstellen';
+
+  @override
+  String get createCollection => 'Sammlung erstellen';
+
+  @override
+  String get create => 'Erstellen';
+
+  @override
+  String get delete => 'Löschen';
+
+  @override
+  String get add => 'Hinzufügen';
+
+  @override
+  String get startSearching => 'Suche etwas';
+
+  @override
+  String get tipNoResults => 'Keine Suchergebnisse gefunden';
+
+  @override
+  String get collectionName => 'Name der Sammlung';
+
+  @override
+  String get bookmarkTitle => 'Titel des Lesezeichens';
+
+  @override
+  String get url => 'Url';
+
+  @override
+  String get description => 'Beschreibung';
+}

lib/l10n/app_localizations_en.dart

@@ -0,0 +1,64 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for English (`en`).
+class AppLocalizationsEn extends AppLocalizations {
+  AppLocalizationsEn([String locale = 'en']) : super(locale);
+
+  @override
+  String addToCollection(String collection_name) {
+    return 'Add to $collection_name';
+  }
+
+  @override
+  String get cancel => 'Cancel';
+
+  @override
+  String get chooseCollection => 'Choose Collection';
+
+  @override
+  String get collections => 'Collections';
+
+  @override
+  String get tipCreateCollections =>
+      'Create your first Collection to get started!';
+
+  @override
+  String get search => 'Search';
+
+  @override
+  String get createBookmark => 'Create Bookmark';
+
+  @override
+  String get createCollection => 'Create Collection';
+
+  @override
+  String get create => 'Create';
+
+  @override
+  String get delete => 'Delete';
+
+  @override
+  String get add => 'Add';
+
+  @override
+  String get startSearching => 'Start searching';
+
+  @override
+  String get tipNoResults => 'There are no results that match your search';
+
+  @override
+  String get collectionName => 'Collection Name';
+
+  @override
+  String get bookmarkTitle => 'Bookmark Title';
+
+  @override
+  String get url => 'Url';
+
+  @override
+  String get description => 'Description';
+}

lib/main.dart

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
+import 'l10n/app_localizations.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';
@@ -12,8 +15,11 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await Storage.initialize();
   runApp(
-    ChangeNotifierProvider(
-      create: (_) => SharedLinkProvider(),
+    MultiProvider(
+      providers: [
+        ChangeNotifierProvider(create: (_) => SharedLinkProvider()),
+        ChangeNotifierProvider(create: (_) => SearchProvider()),
+      ],
       child: const MapsBookmarks(),
     ),
   );
@@ -62,6 +68,13 @@ class _MapsBookmarksState extends State<MapsBookmarks>
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      localizationsDelegates: [
+        AppLocalizations.delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+      ],
+      supportedLocales: [Locale('en'), Locale('de')],
       navigatorKey: _navigatorKey,
       theme: lightTheme,
       darkTheme: darkTheme,

lib/pages/collection_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../l10n/app_localizations.dart';
 import '../model/bookmark.dart';
 import '../model/maps_link_metadata.dart';
 import '../service/bookmarks_provider.dart';
@@ -89,20 +90,28 @@ class _CollectionPageState extends State<CollectionPage> {
     return Scaffold(
       appBar: AppBar(
         title: selectedMapsLink != null
-            ? Text('Add to ${collection.name}')
+            ? Text(
+                AppLocalizations.of(context)!.addToCollection(collection.name),
+              )
             : Text(collection.name),
         actions: [
           if (selectedMapsLink != null)
             TextButton(
               onPressed: () => provider.removeCurrentMapsLink(),
-              child: Text('Cancel'),
+              child: Text(AppLocalizations.of(context)!.cancel),
             ),
         ],
       ),
-      body: ListView.builder(
-        itemBuilder: (context, index) =>
-            bookmarksListItemBuilder(context, bookmarks.elementAt(index)),
-        itemCount: bookmarks.length,
+      body: Center(
+        child: SizedBox(
+          width: MediaQuery.of(context).size.width * 0.9,
+          child: ListView.separated(
+            itemBuilder: (context, index) =>
+                bookmarksListItemBuilder(context, bookmarks.elementAt(index)),
+            itemCount: bookmarks.length,
+            separatorBuilder: (context, index) => SizedBox(height: 10),
+          ),
+        ),
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: onAddButtonPressed,

lib/pages/collections_list_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
+import '../l10n/app_localizations.dart';
 import '../model/collection.dart';
 import '../service/bookmarks_provider.dart';
 import '../service/shared_link_provider.dart';
@@ -20,6 +21,7 @@ class CollectionsListPage extends StatefulWidget {
 
 class _CollectionsListPageState extends State<CollectionsListPage> {
   bool addingNewBookmark = false;
+  var bookmarkCountMap = <int, int>{};
 
   Widget bottomSheetBuilder(BuildContext context) {
     final titleTextFieldController = TextEditingController(
@@ -53,6 +55,11 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
       title: Text(collection.name),
       onTap: () => navigateToCollection(collection.id),
       onLongPress: () => onEditCollection(collection),
+      leading: const Icon(Icons.list_rounded),
+      trailing: Text(
+        bookmarkCountMap[collection.id]?.toString() ?? '0',
+        style: Theme.of(context).textTheme.bodyMedium,
+      ),
     );
   }
 
@@ -77,18 +84,20 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
   @override
   Widget build(BuildContext context) {
     final collections = Storage.loadCollections();
-    final provider = context.watch<SharedLinkProvider>();
-    addingNewBookmark = provider.currentMapsLinkMetadata != null;
+    bookmarkCountMap = Storage.loadPerCollectionBookmarkCount();
+    addingNewBookmark =
+        context.watch<SharedLinkProvider>().currentMapsLinkMetadata != null;
     return Scaffold(
       appBar: AppBar(
         title: addingNewBookmark
-            ? Text('Choose Collection')
-            : Text('Collections'),
+            ? Text(AppLocalizations.of(context)!.chooseCollection)
+            : Text(AppLocalizations.of(context)!.collections),
         actions: [
           if (addingNewBookmark)
             TextButton(
-              onPressed: () => provider.removeCurrentMapsLink(),
-              child: Text('Cancel'),
+              onPressed: () =>
+                  context.read<SharedLinkProvider>().removeCurrentMapsLink(),
+              child: Text(AppLocalizations.of(context)!.cancel),
             )
           else
             IconButton(
@@ -103,14 +112,22 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
         child: Icon(Icons.add),
       ),
       body: collections.isNotEmpty
-          ? ListView.builder(
-              itemBuilder: (context, index) => collectionsListItemBuilder(
-                context,
-                collections.elementAt(index),
+          ? 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),
+                ),
               ),
-              itemCount: collections.length,
             )
-          : Center(child: Text('Create your first Collection to get started!')),
+          : Center(
+              child: Text(AppLocalizations.of(context)!.tipCreateCollections),
+            ),
     );
   }
 }

lib/pages/search_page.dart

@@ -1,42 +1,34 @@
 import 'package:flutter/material.dart';
-
-import '../model/bookmark.dart';
-import '../service/storage.dart';
+import 'package:provider/provider.dart';
+import '../l10n/app_localizations.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 StatefulWidget {
+class SearchPage extends StatelessWidget {
   const SearchPage({super.key});
 
   static const String routeName = '/search';
 
-  @override
-  State<SearchPage> createState() => _SearchPageState();
-}
-
-class _SearchPageState extends State<SearchPage> {
-  final List<Bookmark> allBookmarks = Storage.loadBookmarks();
-  String searchString = '';
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text('Search')),
-      body: Column(
-        children: [
-          SearchBarWidget(
-            onEditingComplete: (searchString) => setState(() {
-              this.searchString = searchString;
-            }),
-          ),
-          Expanded(
-            child: SearchResultsWidget(
-              bookmarks: allBookmarks.where(
-                (bookmark) => bookmark.name.contains(searchString),
+      appBar: AppBar(title: Text(AppLocalizations.of(context)!.search)),
+      body: Center(
+        child: SizedBox(
+          width: MediaQuery.of(context).size.width * 0.9,
+          child: Column(
+            children: [
+              Padding(padding: EdgeInsetsGeometry.only(top: 10)),
+              SearchBarWidget(
+                onEditingComplete: context.read<SearchProvider>().setSearchText,
+                onResetSearch: context.read<SearchProvider>().removeSearchText,
               ),
-            ),
+              Padding(padding: EdgeInsetsGeometry.only(top: 10)),
+              Expanded(child: SearchResultsWidget()),
+            ],
           ),
-        ],
+        ),
       ),
     );
   }

lib/service/notifying.dart

@@ -8,13 +8,31 @@ class Notifying {
     required String text,
     bool isError = false,
   }) {
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
-        content: Text(
-          text,
-          style: isError
-              ? TextStyle(color: Theme.of(context).colorScheme.error)
-              : null,
+        backgroundColor: Theme.of(context).colorScheme.error,
+        content: SizedBox(
+          height: 30,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text(
+                text,
+                style: isError
+                    ? TextStyle(color: Theme.of(context).colorScheme.onError)
+                    : null,
+              ),
+              IconButton(
+                onPressed: () =>
+                    ScaffoldMessenger.of(context).hideCurrentSnackBar(),
+                icon: Icon(
+                  Icons.close_rounded,
+                  color: Theme.of(context).colorScheme.onError,
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );

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

@@ -50,6 +50,14 @@ class Storage {
     return allBookmarks.where((b) => b.collectionId == collectionId).toList();
   }
 
+  static Map<int, int> loadPerCollectionBookmarkCount() {
+    return loadBookmarks().fold(<int, int>{}, (map, bookmark) {
+      map[bookmark.collectionId] ??= 0;
+      map[bookmark.collectionId] = map[bookmark.collectionId]! + 1;
+      return map;
+    });
+  }
+
   static Future<void> addBookmark(Bookmark bookmark) async {
     final bookmarks = loadBookmarks();
     bookmarks.add(bookmark);

lib/theme.dart

@@ -1,15 +1,26 @@
 import 'package:flutter/material.dart';
 
-ThemeData get lightTheme => ThemeData.from(colorScheme: _lightColorScheme);
+const _seed = Colors.deepPurple;
 
-ThemeData get darkTheme => ThemeData.from(colorScheme: _darkColorScheme);
+ColorScheme get _lightColorScheme =>
+    ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.light);
 
-ColorScheme get _darkColorScheme => ColorScheme.fromSeed(
-  seedColor: Colors.deepPurple,
-  brightness: Brightness.dark,
-);
+ColorScheme get _darkColorScheme =>
+    ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.dark);
 
-ColorScheme get _lightColorScheme => ColorScheme.fromSeed(
-  seedColor: Colors.deepPurple,
-  brightness: Brightness.light,
-);
+ThemeData get lightTheme => _baseTheme(_lightColorScheme);
+
+ThemeData get darkTheme => _baseTheme(_darkColorScheme);
+
+ThemeData _baseTheme(ColorScheme scheme) =>
+    ThemeData.from(colorScheme: scheme, useMaterial3: true).copyWith(
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
+      ),
+      listTileTheme: ListTileThemeData(
+        tileColor: scheme.surfaceContainer,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadiusGeometry.circular(12),
+        ),
+      ),
+    );

lib/widgets/create_bookmark_collection_dialog.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import '../l10n/app_localizations.dart';
 import '../model/collection.dart';
 import 'edit_dialog_widgets/edit_dialog_actions.dart' show EditDialogActions;
 import 'edit_dialog_widgets/edit_dialog_title.dart';
@@ -40,9 +41,7 @@ class CreateBookmarkCollectionDialog extends StatelessWidget {
           FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
         ],
         decoration: InputDecoration(
-          // TODO: Localize
-          labelText: 'Collection Name',
-          border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)),
+          labelText: AppLocalizations.of(context)!.collectionName,
         ),
       ),
       actions: [

lib/widgets/create_bookmark_dialog.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
+import '../l10n/app_localizations.dart';
 import '../model/bookmark.dart';
 import '../model/maps_link_metadata.dart';
 import 'edit_dialog_widgets/edit_dialog_actions.dart';
@@ -59,10 +60,7 @@ class CreateBookmarkDialog extends StatelessWidget {
                 FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
               ],
               decoration: InputDecoration(
-                labelText: 'Bookmark Title',
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(10),
-                ),
+                labelText: AppLocalizations.of(context)!.bookmarkTitle,
               ),
             ),
             TextField(
@@ -76,10 +74,7 @@ class CreateBookmarkDialog extends StatelessWidget {
                 FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
               ],
               decoration: InputDecoration(
-                labelText: 'Url',
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(10),
-                ),
+                labelText: AppLocalizations.of(context)!.url,
               ),
             ),
             TextField(
@@ -93,10 +88,7 @@ class CreateBookmarkDialog extends StatelessWidget {
                 FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
               ],
               decoration: InputDecoration(
-                labelText: 'Description',
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(10),
-                ),
+                labelText: AppLocalizations.of(context)!.description,
               ),
             ),
           ],

lib/widgets/edit_dialog_widgets/edit_dialog_actions.dart

@@ -2,6 +2,8 @@ import 'package:flutter/material.dart'
     show TextButton, FloatingActionButton, Icons;
 import 'package:flutter/widgets.dart';
 
+import '../../l10n/app_localizations.dart';
+
 class EditDialogActions extends StatelessWidget {
   const EditDialogActions({super.key, required this.onSavePressed});
   final VoidCallback onSavePressed;
@@ -13,7 +15,7 @@ class EditDialogActions extends StatelessWidget {
       children: [
         TextButton(
           onPressed: () => Navigator.of(context).pop(),
-          child: Text('Cancel'),
+          child: Text(AppLocalizations.of(context)!.cancel),
         ),
         FloatingActionButton(onPressed: onSavePressed, child: Icon(Icons.save)),
       ],

lib/widgets/search_widgets/search_bar_widget.dart

@@ -1,16 +1,37 @@
 import 'package:flutter/material.dart';
 
+import '../../l10n/app_localizations.dart';
+
 class SearchBarWidget extends StatelessWidget {
-  const SearchBarWidget({super.key, required this.onEditingComplete});
+  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) {
-    TextEditingController searchBarController = TextEditingController();
+    final searchTextController = TextEditingController();
     return TextField(
-      controller: searchBarController,
-      onEditingComplete: () => onEditingComplete(searchBarController.text),
+      controller: searchTextController,
+      onChanged: (text) => onChanged(text, context),
+      decoration: InputDecoration(
+        suffixIcon: IconButton(
+          onPressed: () {
+            searchTextController.clear();
+            onResetSearch();
+          },
+          icon: Icon(Icons.delete_outline_outlined),
+        ),
+        labelText: AppLocalizations.of(context)!.search,
+      ),
     );
   }
 }

lib/widgets/search_widgets/search_results_widget.dart

@@ -1,16 +1,31 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 
+import '../../l10n/app_localizations.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 StatelessWidget {
-  const SearchResultsWidget({super.key, required this.bookmarks});
+class SearchResultsWidget extends StatefulWidget {
+  const SearchResultsWidget({super.key});
 
-  final Iterable<Bookmark> bookmarks;
+  @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 = bookmarks.elementAt(index);
+    final bookmark = filteredBookmarks.elementAt(index);
     return ListTile(
       title: Text(bookmark.name),
       onTap: () => launchUrlFromString(bookmark.link).then((errorCode) {
@@ -23,14 +38,21 @@ class SearchResultsWidget extends StatelessWidget {
     );
   }
 
+  Iterable<Bookmark> get filteredBookmarks => allBookmarks.where(
+    (bookmark) => bookmark.name.toLowerCase().contains(
+      context.watch<SearchProvider>().searchText.toLowerCase(),
+    ),
+  );
+
   @override
   Widget build(BuildContext context) {
-    if (bookmarks.isNotEmpty) {
-      return ListView.builder(
+    if (filteredBookmarks.isNotEmpty) {
+      return ListView.separated(
         itemBuilder: bookmarkListItemBuilder,
-        itemCount: bookmarks.length,
+        itemCount: filteredBookmarks.length,
+        separatorBuilder: (context, index) => SizedBox(height: 10),
       );
     }
-    return Center(child: Text('Start searching'));
+    return Center(child: Text(AppLocalizations.of(context)!.tipNoResults));
   }
 }

pubspec.lock

@@ -102,6 +102,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -136,6 +141,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.1.2"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.20.2"
   leak_tracker:
     dependency: transitive
     description:

pubspec.yaml

@@ -3,7 +3,7 @@ description: "A new way to save google maps bookmarks"
 
 publish_to: 'none'
 
-version: 1.0.0+1
+version: 0.0.18
 
 environment:
   sdk: ^3.9.2
@@ -18,6 +18,9 @@ dependencies:
   provider: ^6.1.5+1
   metadata_fetch: ^0.4.2
   url_launcher: ^6.3.2
+  flutter_localizations:
+    sdk: flutter
+  intl: any
 
 dev_dependencies:
   flutter_test:
@@ -26,5 +29,5 @@ dev_dependencies:
   flutter_lints: ^6.0.0
 
 flutter:
-
+  generate: true
   uses-material-design: true