Merge pull request 'Json export and import feature' (#5) from json-export-feature into development

Reviewed-on: #5

.gitea/workflows/android_build.yml

@@ -23,13 +23,6 @@ jobs:
       - 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:
@@ -66,7 +59,6 @@ jobs:
         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"

.gitignore

@@ -1,16 +1,23 @@
+# Do not remove or rename entries in this file, only add new ones
+# See https://github.com/flutter/flutter/issues/128635 for more context.
+
 # Miscellaneous
 *.class
+*.lock
 *.log
 *.pyc
 *.swp
 .DS_Store
 .atom/
-.build/
 .buildlog/
 .history
 .svn/
-.swiftpm/
-migrate_working_dir/
+lib/l10n/app_localizations*
+
+# As packages are no longer pinned, we use a lockfile for testing locally.
+# When unpinning packages, Using lockfiles ensures that failures in PRs are
+# actually due to those PRs, not due to a package being updated.
+!/pubspec.lock
 
 # IntelliJ related
 *.iml
@@ -18,28 +25,142 @@ migrate_working_dir/
 *.iws
 .idea/
 
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
+# Visual Studio Code related
+.classpath
+.project
+.settings/
+.vscode/*
+.ccls-cache
+
+# This file, on the master branch, should never exist or be checked-in.
+#
+# On a *final* release branch, that is, what will ship to stable or beta, the
+# file can be force added (git add --force) and checked-in in order to effectively
+# "pin" the engine artifact version so the flutter tool does not need to use git
+# to determine the engine artifacts.
+#
+# See https://github.com/flutter/flutter/blob/main/docs/tool/Engine-artifacts.md.
+/bin/internal/engine.version
+
+# Flutter repo-specific
+/bin/cache/
+/bin/internal/bootstrap.bat
+/bin/internal/bootstrap.sh
+/bin/internal/engine.realm
+/bin/mingit/
+/dev/benchmarks/mega_gallery/
+/dev/bots/.recipe_deps
+/dev/bots/android_tools/
+/dev/devicelab/ABresults*.json
+/dev/docs/doc/
+/dev/docs/api_docs.zip
+/dev/docs/flutter.docs.zip
+/dev/docs/lib/
+/dev/docs/pubspec.yaml
+/dev/integration_tests/**/xcuserdata
+/dev/integration_tests/**/Pods
+/packages/flutter/coverage/
+version
+analysis_benchmark.json
+
+# packages file containing multi-root paths
+.packages.generated
 
 # Flutter/Dart/Pub related
 **/doc/api/
-**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins-dependencies
+**/generated_plugin_registrant.dart
+.packages
+.pub-preload-cache/
 .pub-cache/
 .pub/
-/build/
-/coverage/
+build/
+flutter_*.png
+linked_*.ds
+unlinked.ds
+unlinked_spec.ds
 
-# Symbolication related
+# Android related
+**/android/**/gradle-wrapper.jar
+.gradle/
+**/android/captures/
+**/android/gradlew
+**/android/gradlew.bat
+**/android/**/GeneratedPluginRegistrant.java
+**/android/key.properties
+*.jks
+local.properties
+**/.cxx/
+
+# iOS/XCode related
+**/ios/**/*.mode1v3
+**/ios/**/*.mode2v3
+**/ios/**/*.moved-aside
+**/ios/**/*.pbxuser
+**/ios/**/*.perspectivev3
+**/ios/**/*sync/
+**/ios/**/.sconsign.dblite
+**/ios/**/.tags*
+**/ios/**/.vagrant/
+**/ios/**/DerivedData/
+**/ios/**/Icon?
+**/ios/**/Pods/
+**/ios/**/.symlinks/
+**/ios/**/profile
+**/ios/**/xcuserdata
+**/ios/.generated/
+**/ios/Flutter/.last_build_id
+**/ios/Flutter/App.framework
+**/ios/Flutter/Flutter.framework
+**/ios/Flutter/Flutter.podspec
+**/ios/Flutter/Generated.xcconfig
+**/ios/Flutter/ephemeral
+**/ios/Flutter/app.flx
+**/ios/Flutter/app.zip
+**/ios/Flutter/flutter_assets/
+**/ios/Flutter/flutter_export_environment.sh
+**/ios/ServiceDefinitions.json
+**/ios/Runner/GeneratedPluginRegistrant.*
+
+# macOS
+**/Flutter/ephemeral/
+**/Pods/
+**/macos/Flutter/GeneratedPluginRegistrant.swift
+**/macos/Flutter/ephemeral
+**/xcuserdata/
+
+# Windows
+**/windows/flutter/ephemeral/
+**/windows/flutter/generated_plugin_registrant.cc
+**/windows/flutter/generated_plugin_registrant.h
+**/windows/flutter/generated_plugins.cmake
+
+# Linux
+**/linux/flutter/ephemeral/
+**/linux/flutter/generated_plugin_registrant.cc
+**/linux/flutter/generated_plugin_registrant.h
+**/linux/flutter/generated_plugins.cmake
+
+# Coverage
+coverage/
+
+# Symbols
 app.*.symbols
 
-# Obfuscation related
-app.*.map.json
+# Exceptions to above rules.
+!**/ios/**/default.mode1v3
+!**/ios/**/default.mode2v3
+!**/ios/**/default.pbxuser
+!**/ios/**/default.perspectivev3
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+!/dev/ci/**/Gemfile.lock
+!.vscode/settings.json
 
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
+# Monorepo
+.cipd
+.gclient
+.gclient_entries
+.python-version
+.gclient_previous_custom_vars
+.gclient_previous_sync_commits

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <application
         android:label="maps_bookmarks"
         android:name="${applicationName}"

l10n.yaml

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

lib/assets/constants.dart

@@ -0,0 +1,3 @@
+const String appName = 'Maps Bookmarks';
+const String jsonFileName = 'MapsBookmarksData.json';
+const String defaultAndroidExportDirectory = '/storage/emulated/0/Documents';

lib/l10n/app_de.arb

@@ -0,0 +1,43 @@
+{
+    "@@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",
+    "settings": "Einstellungen",
+    "appData": "App-Daten",
+    "export": "Exportieren",
+    "import": "Importieren",
+    "activateJsonExport": "Immer als JSON speichern",
+
+    "@@comment": "Info",
+    "exportSuccess": "Daten exportiert",
+    "importSuccess": "Daten importiert",
+
+    "@@comment": "Errors",
+    "errorStoragePermisson": "Zugriff auf Speicher verwehrt",
+    "errorCouldNotLaunchUrl": "Konnte Url nicht öffnen",
+    "errorInvalidUrl": "Fehlerhafte Url",
+    "exportFailed": "Export fehlgeschlagen",
+    "importFailed": "Import fehlgeschlagen"
+}

lib/l10n/app_en.arb

@@ -0,0 +1,44 @@
+{
+    "@@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",
+    "settings": "Settings",
+    "appData": "App data",
+    "export": "Export",
+    "import": "Import",
+    "activateJsonExport": "Always save to JSON",
+
+    
+    "@@comment": "Info",
+    "exportSuccess": "Exported data",
+    "importSuccess": "Imported data",
+    
+    "@@comment": "Errors",
+    "errorStoragePermisson": "Storage permissions denied",
+    "errorCouldNotLaunchUrl": "Could not launch Url",
+    "errorInvalidUrl": "Invalid Url",
+    "exportFailed": "Export failed",
+    "importFailed": "Import failed"
+}

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 'pages/settings_page.dart';
 import 'service/search_provider.dart';
 import 'service/shared_link_provider.dart';
 import 'service/storage.dart';
@@ -66,6 +69,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,
@@ -74,6 +84,7 @@ class _MapsBookmarksState extends State<MapsBookmarks>
         CollectionsListPage.routeName: (context) => const CollectionsListPage(),
         CollectionPage.routeName: (context) => const CollectionPage(),
         SearchPage.routeName: (context) => const SearchPage(),
+        SettingsPage.routeName: (context) => const SettingsPage(),
       },
     );
   }

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(
+      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';
@@ -8,6 +9,7 @@ import '../service/storage.dart';
 import '../widgets/create_bookmark_collection_dialog.dart';
 import 'collection_page.dart';
 import 'search_page.dart' show SearchPage;
+import 'settings_page.dart';
 
 class CollectionsListPage extends StatefulWidget {
   const CollectionsListPage({super.key});
@@ -20,6 +22,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 +56,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,24 +85,31 @@ 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(
               onPressed: () =>
                   Navigator.of(context).pushNamed(SearchPage.routeName),
-              icon: Icon(Icons.search),
+              icon: Icon(Icons.search_rounded),
+            ),
+          IconButton(
+            onPressed: () =>
+                Navigator.of(context).pushNamed(SettingsPage.routeName),
+            icon: Icon(Icons.settings_rounded),
           ),
         ],
       ),
@@ -103,14 +118,22 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
         child: Icon(Icons.add),
       ),
       body: collections.isNotEmpty
-          ? ListView.builder(
+          ? 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('Create your first Collection to get started!')),
+          : Center(
+              child: Text(AppLocalizations.of(context)!.tipCreateCollections),
+            ),
     );
   }
 }

lib/pages/search_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.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';
@@ -12,15 +13,23 @@ class SearchPage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(title: Text('Search')),
-      body: Column(
+      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/pages/settings_page.dart

@@ -0,0 +1,86 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:permission_handler/permission_handler.dart';
+
+import '../l10n/app_localizations.dart';
+import '../service/notifying.dart';
+import '../service/permission_service.dart';
+import '../service/storage.dart';
+
+class SettingsPage extends StatefulWidget {
+  static const routeName = '/settings';
+  const SettingsPage({super.key});
+
+  @override
+  State<SettingsPage> createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
+      body: SizedBox(
+        width: MediaQuery.of(context).size.width * 0.9,
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            Text(
+              AppLocalizations.of(context)!.appData,
+              style: Theme.of(context).textTheme.titleLarge,
+            ),
+            ElevatedButton(
+              onPressed: () => onActivateJsonImportPressed(),
+              child: Text(AppLocalizations.of(context)!.import),
+            ),
+            ElevatedButton(
+              onPressed: () => onActivateJsonExportPressed(),
+              child: Text(AppLocalizations.of(context)!.export),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void onActivateJsonExportPressed() async {
+    if (!await checkStoragePermission) return;
+
+    Storage.exportToJsonFile().then(showExportInfo);
+  }
+
+  void onActivateJsonImportPressed() async {
+    if (!await checkStoragePermission) return;
+    Storage.importFromJsonFile().then(showImportInfo);
+  }
+
+  Future<bool> get checkStoragePermission async {
+    if (!(await PermissionService.requestStoragePermission).isGranted) {
+      if (mounted) {
+        Notifying.showErrorSnackbar(
+          context,
+          AppLocalizations.of(context)!.errorStoragePermisson,
+        );
+        return false;
+      }
+    }
+    return true;
+  }
+
+  void showExportInfo(bool success) => Notifying.showSnackbar(
+    context,
+    text: success
+        ? AppLocalizations.of(context)!.exportSuccess
+        : AppLocalizations.of(context)!.exportFailed,
+    isError: success,
+  );
+
+  void showImportInfo(bool success) => Notifying.showSnackbar(
+    context,
+    text: success
+        ? AppLocalizations.of(context)!.importSuccess
+        : AppLocalizations.of(context)!.importFailed,
+    isError: success,
+  );
+}

lib/service/json_file_service.dart

@@ -0,0 +1,77 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:file_selector/file_selector.dart';
+import 'package:flutter/services.dart';
+
+import '../model/bookmark.dart';
+import '../model/collection.dart';
+import '../assets/constants.dart' as constants;
+
+class JsonFileService {
+  static Future<bool> exportToJson({
+    required List<Collection> collections,
+    required List<Bookmark> bookmarks,
+  }) async {
+    try {
+      final dir = await _directoryPath;
+      if (dir.isEmpty) return false;
+
+      final data = {
+        'collections': collections.map((c) => c.toJson()).toList(),
+        'bookmarks': bookmarks.map((b) => b.toJson()).toList(),
+      };
+      final json = jsonEncode(data).codeUnits;
+      final file = XFile.fromData(
+        Uint8List.fromList(json),
+        mimeType: 'application/json',
+        name: constants.jsonFileName,
+      );
+
+      file.saveTo('$dir/${constants.jsonFileName}');
+    } catch (e) {
+      return false;
+    }
+    return false;
+  }
+
+  static Future<({List<Collection> collections, List<Bookmark> bookmarks})>
+  importFromJson() async {
+    try {
+      const typeGroup = XTypeGroup(label: 'json', extensions: <String>['json']);
+      final XFile? file = await openFile(
+        acceptedTypeGroups: <XTypeGroup>[typeGroup],
+      );
+
+      if (file == null) {
+        return (collections: <Collection>[], bookmarks: <Bookmark>[]);
+      }
+
+      final jsonString = await file.readAsString();
+
+      final data = jsonDecode(jsonString) as Map<String, dynamic>;
+
+      final collections = (data['collections'] as List<dynamic>? ?? [])
+          .map((json) => Collection.fromJson(json as Map<String, dynamic>))
+          .toList();
+
+      final bookmarks = (data['bookmarks'] as List<dynamic>? ?? [])
+          .map((json) => Bookmark.fromJson(json as Map<String, dynamic>))
+          .toList();
+
+      return (collections: collections, bookmarks: bookmarks);
+    } catch (e) {
+      return (collections: <Collection>[], bookmarks: <Bookmark>[]);
+    }
+  }
+
+  static Future<String> get _directoryPath async {
+    if (Platform.isAndroid) {
+      return await getDirectoryPath(
+            initialDirectory: constants.defaultAndroidExportDirectory,
+          ) ??
+          '';
+    }
+    return await getDirectoryPath() ?? '';
+  }
+}

lib/service/notifying.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+import '../l10n/app_localizations.dart';
 import 'url_launcher.dart' show UrlLaunchErrorCode;
 
 class Notifying {
@@ -8,14 +9,32 @@ class Notifying {
     required String text,
     bool isError = false,
   }) {
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
-        content: Text(
+        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.error)
+                    ? 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,
+                ),
+              ),
+            ],
+          ),
+        ),
       ),
     );
   }
@@ -28,10 +47,18 @@ class Notifying {
     if (errorCode == UrlLaunchErrorCode.none) {
       return;
     } else if (errorCode == UrlLaunchErrorCode.couldNotLaunch) {
-      errorText = 'Could not launch Url';
+      errorText = AppLocalizations.of(context)!.errorCouldNotLaunchUrl;
     } else {
-      errorText = 'Invalid Url';
+      errorText = AppLocalizations.of(context)!.errorInvalidUrl;
     }
     showSnackbar(context, text: errorText, isError: true);
   }
+
+  static void showErrorSnackbar(BuildContext context, String message) {
+    showSnackbar(context, text: message, isError: true);
+  }
+
+  static void showMessageSnackbar(BuildContext context, String message) {
+    showSnackbar(context, text: message, isError: false);
+  }
 }

lib/service/permission_service.dart

@@ -0,0 +1,9 @@
+import 'package:permission_handler/permission_handler.dart';
+
+class PermissionService {
+  static Future<PermissionStatus> get storagePermissionStatus =>
+      Permission.manageExternalStorage.status;
+
+  static Future<PermissionStatus> get requestStoragePermission =>
+      Permission.manageExternalStorage.request();
+}

lib/service/search_provider.dart

@@ -8,5 +8,10 @@ class SearchProvider extends ChangeNotifier {
     if (!silent) notifyListeners();
   }
 
+  void removeSearchText({bool silent = false}) {
+    _searchText = '';
+    if (!silent) notifyListeners();
+  }
+
   String get searchText => _searchText;
 }

lib/service/storage.dart

@@ -4,6 +4,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 
 import '../model/bookmark.dart';
 import '../model/collection.dart';
+import 'json_file_service.dart';
 
 class Storage {
   static const String _bookmarksKey = 'bookmarks';
@@ -50,6 +51,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);
@@ -155,4 +164,20 @@ class Storage {
     }
     return _prefsWithCache!;
   }
+
+  static Future<bool> exportToJsonFile() => JsonFileService.exportToJson(
+    collections: loadCollections(),
+    bookmarks: loadBookmarks(),
+  );
+
+  static Future<bool> importFromJsonFile() async {
+    final import = await JsonFileService.importFromJson();
+
+    if (import.bookmarks.isNotEmpty || import.collections.isNotEmpty) {
+      saveBookmarks(import.bookmarks);
+      saveCollections(import.collections);
+      return true;
+    }
+    return false;
+  }
 }

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 _lightColorScheme => ColorScheme.fromSeed(
-  seedColor: Colors.deepPurple,
-  brightness: Brightness.light,
+ColorScheme get _darkColorScheme =>
+    ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.dark);
+
+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;
-
-  @override
-  Widget build(BuildContext context) {
-    return TextField(onChanged: (text) => onChanged(text, context));
-  }
+  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),
+        ),
+        labelText: AppLocalizations.of(context)!.search,
+      ),
+    );
+  }
 }

lib/widgets/search_widgets/search_results_widget.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 '../../service/notifying.dart';
 import '../../service/search_provider.dart';
@@ -17,6 +18,12 @@ class SearchResultsWidget extends StatefulWidget {
 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(
@@ -31,20 +38,21 @@ class _SearchResultsWidgetState extends State<SearchResultsWidget> {
     );
   }
 
-  @override
-  Widget build(BuildContext context) {
-    if (filteredBookmarks.isNotEmpty) {
-      return ListView.builder(
-        itemBuilder: bookmarkListItemBuilder,
-        itemCount: filteredBookmarks.length,
-      );
-    }
-    return Center(child: Text('Start searching'));
-  }
-
   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.separated(
+        itemBuilder: bookmarkListItemBuilder,
+        itemCount: filteredBookmarks.length,
+        separatorBuilder: (context, index) => SizedBox(height: 10),
+      );
+    }
+    return Center(child: Text(AppLocalizations.of(context)!.tipNoResults));
+  }
 }

pubspec.lock

@@ -49,6 +49,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.19.1"
+  cross_file:
+    dependency: transitive
+    description:
+      name: cross_file
+      sha256: "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.5+1"
   csslib:
     dependency: transitive
     description:
@@ -89,6 +97,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.1"
+  file_selector:
+    dependency: "direct main"
+    description:
+      name: file_selector
+      sha256: bd15e43e9268db636b53eeaca9f56324d1622af30e5c34d6e267649758c84d9a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
+  file_selector_android:
+    dependency: transitive
+    description:
+      name: file_selector_android
+      sha256: "51e8fd0446de75e4b62c065b76db2210c704562d072339d333bd89c57a7f8a7c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.2+4"
+  file_selector_ios:
+    dependency: transitive
+    description:
+      name: file_selector_ios
+      sha256: e2ecf2885c121691ce13b60db3508f53c01f869fb6e8dc5c1cfa771e4c46aeca
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.3+5"
+  file_selector_linux:
+    dependency: transitive
+    description:
+      name: file_selector_linux
+      sha256: "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4"
+  file_selector_macos:
+    dependency: transitive
+    description:
+      name: file_selector_macos
+      sha256: "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.5"
+  file_selector_platform_interface:
+    dependency: transitive
+    description:
+      name: file_selector_platform_interface
+      sha256: "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  file_selector_web:
+    dependency: transitive
+    description:
+      name: file_selector_web
+      sha256: c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.4+2"
+  file_selector_windows:
+    dependency: transitive
+    description:
+      name: file_selector_windows
+      sha256: "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3+5"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -102,6 +174,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 +213,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:
@@ -240,6 +325,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
+  permission_handler:
+    dependency: "direct main"
+    description:
+      name: permission_handler
+      sha256: bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.0.1"
+  permission_handler_android:
+    dependency: transitive
+    description:
+      name: permission_handler_android
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.1"
+  permission_handler_apple:
+    dependency: transitive
+    description:
+      name: permission_handler_apple
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.4.7"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3+5"
+  permission_handler_platform_interface:
+    dependency: transitive
+    description:
+      name: permission_handler_platform_interface
+      sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.3.0"
+  permission_handler_windows:
+    dependency: transitive
+    description:
+      name: permission_handler_windows
+      sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   platform:
     dependency: transitive
     description:
@@ -486,5 +619,5 @@ packages:
     source: hosted
     version: "1.1.0"
 sdks:
-  dart: ">=3.9.2 <4.0.0"
-  flutter: ">=3.35.0"
+  dart: ">=3.10.0 <4.0.0"
+  flutter: ">=3.38.0"

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,11 @@ dependencies:
   provider: ^6.1.5+1
   metadata_fetch: ^0.4.2
   url_launcher: ^6.3.2
+  flutter_localizations:
+    sdk: flutter
+  intl: any
+  permission_handler: ^12.0.1
+  file_selector: ^1.1.0
 
 dev_dependencies:
   flutter_test:
@@ -26,5 +31,5 @@ dev_dependencies:
   flutter_lints: ^6.0.0
 
 flutter:
-
+  generate: true
   uses-material-design: true