Improvements (#10)

* fix: "import" strings in french

* fix: small improvements to routes

* refactor: clean app/build.gradle

* fix: Kotlin plugin import

* feat: use floating snack bars

* fix: decode imported file as UTF-8

* fix: use launchUrl instead of launchUrlString whenever possible

* fix: padding at bottom of editor

* chore: upgrade fleather version

* fix: remove drawer on editor page

* feat: use radio buttons where appropriate in settings dialogs

* chore: bump app version

* docs: remake screenshots

* docs: add screenshots to README

README.md

@@ -20,6 +20,13 @@ Simple, local, material design notes.
   <img alt="Screenshot of the settings" src="assets/screenshots/latest_settings_1.jpg" width="24%">
 </div>
 
+<div align="center">
+  <img alt="Screenshot of the notes list" src="assets/screenshots/latest_notes_selection.jpg" width="24%">
+  <img alt="Screenshots of the note editor" src="assets/screenshots/latest_search.jpg" width="24%">
+  <img alt="Screenshot of the bin" src="assets/screenshots/latest_theme_dynamic_dark.jpg" width="24%">
+  <img alt="Screenshot of the settings" src="assets/screenshots/latest_theme_dynamic_light.jpg" width="24%">
+</div>
+
 ## Features
 
 ### Take notes

android/build.gradle

@@ -1,15 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

android/settings.gradle

@@ -24,6 +24,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.23" apply false
 }
 
 include ":app"

lib/common/navigation/side_navigation.dart

@@ -14,22 +14,22 @@ class SideNavigation extends StatefulWidget {
 }
 
 class _SideNavigationState extends State<SideNavigation> {
-  int index = RouterRoute.currentDrawerIndex;
+  int _index = RouterRoute.currentDrawerIndex;
 
   void _navigate(int newIndex) {
     setState(() {
-      index = newIndex;
+      _index = newIndex;
     });
 
-    context.go(RouterRoute.getRouteFromIndex(index).path);
+    context.go(RouterRoute.getRouteFromIndex(_index).path);
     context.pop();
   }
 
   @override
   Widget build(BuildContext context) {
     return NavigationDrawer(
       onDestinationSelected: _navigate,
-      selectedIndex: index,
+      selectedIndex: _index,
       children: <Widget>[
         DrawerHeader(
           child: Column(

lib/common/routing/router.dart

@@ -27,6 +27,12 @@ PreferredSizeWidget? _getAppBar(BuildContext context) {
   }
 }
 
+Widget? _getDrawer() {
+  if (RouterRoute.currentRoute.drawerIndex == null) return null;
+
+  return const SideNavigation();
+}
+
 Widget? _getFloatingActionButton(BuildContext context) {
   switch (RouterRoute.currentRoute) {
     case RouterRoute.notes:
@@ -47,7 +53,7 @@ final router = GoRouter(
         return Scaffold(
           key: drawerKey,
           appBar: _getAppBar(context),
-          drawer: const SideNavigation(),
+          drawer: _getDrawer(),
           body: child,
           floatingActionButton: _getFloatingActionButton(context),
         );

lib/common/routing/router_route.dart

@@ -57,7 +57,7 @@ enum RouterRoute {
     } else if (location == settings.path) {
       return settings;
     } else {
-      return notes;
+      throw Exception('Unexpected route: $location');
     }
   }
 

lib/l10n/app_fr.arb

@@ -29,8 +29,8 @@
   "settings_export_markdown_description": "Exporter les notes dans un fichier Markdown (corbeille incluse)",
   "settings_export_success": "Les notes ont bien été exportées.",
   "settings_export_fail": "L''export a échoué : {error}.",
-  "settings_import": "Import",
-  "settings_import_description": "Importer les notes depuis un fichier",
+  "settings_import": "Importer",
+  "settings_import_description": "Importer les notes depuis un fichier JSON",
   "settings_import_success": "Les notes ont bien été importées.",
   "settings_import_fail": "L''import a échoué : {error}.",
   "settings_about": "À propos",

lib/l10n/app_localizations_fr.g.dart

@@ -103,10 +103,10 @@ class AppLocalizationsFr extends AppLocalizations {
   }
 
   @override
-  String get settings_import => 'Import';
+  String get settings_import => 'Importer';
 
   @override
-  String get settings_import_description => 'Importer les notes depuis un fichier';
+  String get settings_import_description => 'Importer les notes depuis un fichier JSON';
 
   @override
   String get settings_import_success => 'Les notes ont bien été importées.';

lib/pages/editor/editor_page.dart

@@ -89,6 +89,7 @@ class _EditorState extends ConsumerState<EditorPage> {
               spellCheckConfiguration: SpellCheckConfiguration(
                 spellCheckService: DefaultSpellCheckService(),
               ),
+              padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewPadding.bottom),
             ),
           ),
         ],

lib/pages/settings/interactions.dart

@@ -17,9 +17,35 @@ import 'package:localmaterialnotes/utils/preferences/preferences_manager.dart';
 import 'package:localmaterialnotes/utils/snack_bar_manager.dart';
 import 'package:localmaterialnotes/utils/theme_manager.dart';
 import 'package:restart_app/restart_app.dart';
-import 'package:url_launcher/url_launcher_string.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 class Interactions {
+  Future<void> selectLanguage(BuildContext context) async {
+    await showAdaptiveDialog<Locale>(
+      context: context,
+      builder: (context) {
+        return SimpleDialog(
+          clipBehavior: Clip.hardEdge,
+          title: Text(localizations.settings_language),
+          children: AppLocalizations.supportedLocales.map((locale) {
+            return RadioListTile<Locale>(
+              value: locale,
+              groupValue: Localizations.localeOf(context),
+              title: Text(locale.nativeDisplayLanguage.capitalized),
+              selected: Localizations.localeOf(context) == locale,
+              onChanged: (locale) => Navigator.of(context).pop(locale),
+            );
+          }).toList(),
+        );
+      },
+    ).then((locale) async {
+      if (locale == null) return;
+
+      LocaleManager().setLocale(locale);
+      await Restart.restartApp();
+    });
+  }
+
   Future<void> selectTheme(BuildContext context) async {
     await showAdaptiveDialog<ThemeMode>(
       context: context,
@@ -28,23 +54,26 @@ class Interactions {
           clipBehavior: Clip.hardEdge,
           title: Text(localizations.settings_theme),
           children: [
-            ListTile(
-              leading: const Icon(Icons.smartphone),
-              selected: ThemeManager().themeMode == ThemeMode.system,
+            RadioListTile<ThemeMode>(
+              value: ThemeMode.system,
+              groupValue: ThemeManager().themeMode,
               title: Text(localizations.settings_theme_system),
-              onTap: () => Navigator.of(context).pop(ThemeMode.system),
+              selected: ThemeManager().themeMode == ThemeMode.system,
+              onChanged: (locale) => Navigator.of(context).pop(locale),
             ),
-            ListTile(
-              leading: const Icon(Icons.light_mode),
-              selected: ThemeManager().themeMode == ThemeMode.light,
+            RadioListTile<ThemeMode>(
+              value: ThemeMode.light,
+              groupValue: ThemeManager().themeMode,
               title: Text(localizations.settings_theme_light),
-              onTap: () => Navigator.of(context).pop(ThemeMode.light),
+              selected: ThemeManager().themeMode == ThemeMode.light,
+              onChanged: (locale) => Navigator.of(context).pop(locale),
             ),
-            ListTile(
-              leading: const Icon(Icons.dark_mode),
-              selected: ThemeManager().themeMode == ThemeMode.dark,
+            RadioListTile<ThemeMode>(
+              value: ThemeMode.dark,
+              groupValue: ThemeManager().themeMode,
               title: Text(localizations.settings_theme_dark),
-              onTap: () => Navigator.of(context).pop(ThemeMode.dark),
+              selected: ThemeManager().themeMode == ThemeMode.dark,
+              onChanged: (locale) => Navigator.of(context).pop(locale),
             ),
           ],
         );
@@ -66,30 +95,6 @@ class Interactions {
     blackThemingNotifier.value = value;
   }
 
-  Future<void> selectLanguage(BuildContext context) async {
-    await showAdaptiveDialog<Locale>(
-      context: context,
-      builder: (context) {
-        return SimpleDialog(
-          clipBehavior: Clip.hardEdge,
-          title: Text(localizations.settings_language),
-          children: AppLocalizations.supportedLocales.map((locale) {
-            return ListTile(
-              selected: locale == Localizations.localeOf(context),
-              title: Text(locale.nativeDisplayLanguage.capitalized),
-              onTap: () => Navigator.of(context).pop(locale),
-            );
-          }).toList(),
-        );
-      },
-    ).then((locale) async {
-      if (locale == null) return;
-
-      LocaleManager().setLocale(locale);
-      await Restart.restartApp();
-    });
-  }
-
   void toggleSeparator(bool value) {
     PreferencesManager().set<bool>(PreferenceKey.separator.name, value);
   }
@@ -102,10 +107,12 @@ class Interactions {
           clipBehavior: Clip.hardEdge,
           title: Text(localizations.settings_confirmations),
           children: Confirmations.values.map((confirmationsValue) {
-            return ListTile(
+            return RadioListTile<Confirmations>(
+              value: confirmationsValue,
+              groupValue: Confirmations.fromPreferences(),
               title: Text(confirmationsValue.title),
               selected: Confirmations.fromPreferences() == confirmationsValue,
-              onTap: () => Navigator.of(context).pop(confirmationsValue),
+              onChanged: (locale) => Navigator.of(context).pop(locale),
             );
           }).toList(),
         );
@@ -178,14 +185,32 @@ class Interactions {
   }
 
   void openGitHub(_) {
-    launchUrlString('https://github.com/maelchiotti/LocalMaterialNotes');
+    launchUrl(
+      Uri(
+        scheme: 'https',
+        host: 'github.com',
+        path: 'maelchiotti/LocalMaterialNotes',
+      ),
+    );
   }
 
   void openLicense(_) {
-    launchUrlString('https://github.com/maelchiotti/LocalMaterialNotes/blob/main/LICENSE');
+    launchUrl(
+      Uri(
+        scheme: 'https',
+        host: 'github.com',
+        path: 'maelchiotti/LocalMaterialNotes/blob/main/LICENSE',
+      ),
+    );
   }
 
   void openIssues(_) {
-    launchUrlString('https://github.com/maelchiotti/LocalMaterialNotes/issues');
+    launchUrl(
+      Uri(
+        scheme: 'https',
+        host: 'github.com',
+        path: 'maelchiotti/LocalMaterialNotes/issues',
+      ),
+    );
   }
 }

lib/utils/database_manager.dart

@@ -117,7 +117,7 @@ class DatabaseManager {
       exportDirectory,
       mimeType: mimeType,
       displayName: 'materialnotes_export_${timestamp.filename}.$extension',
-      bytes: Uint8List.fromList(utf8.encode(notesAsString)), // Encode as UTF-8 to support checked/unchecked emojis
+      bytes: Uint8List.fromList(utf8.encode(notesAsString)),
     );
   }
 
@@ -129,11 +129,12 @@ class DatabaseManager {
 
     if (importFiles == null || importFiles.isEmpty) throw Exception(localizations.error_permission);
 
-    final importData = await saf.getDocumentContentAsString(importFiles.first);
+    final importedData = await saf.getDocumentContent(importFiles.first);
 
-    if (importData == null) throw Exception(localizations.error_read_file);
+    if (importedData == null) throw Exception(localizations.error_read_file);
 
-    final notesJson = jsonDecode(importData) as List;
+    final importedString = utf8.decode(importedData);
+    final notesJson = jsonDecode(importedString) as List;
     final notes = notesJson.map((e) => Note.fromJson(e as Map<String, dynamic>)).toList();
 
     await addAll(notes);

lib/utils/snack_bar_manager.dart

@@ -11,6 +11,7 @@ class SnackBarManager {
   void show({BuildContext? context}) {
     ScaffoldMessenger.of(context ?? navigatorKey.currentContext!).showSnackBar(
       SnackBar(
+        behavior: SnackBarBehavior.floating,
         content: Text(text),
       ),
     );

pubspec.lock

@@ -341,10 +341,10 @@ packages:
     dependency: "direct main"
     description:
       name: fleather
-      sha256: "4e5260e136c4d371bffd870148a838671599f08b564fd831112a9e664bd909e9"
+      sha256: dbff159100d700a7f27fbcc97ffb5a0bcbf4aed3e6aa932b48133aa4040fb79b
       url: "https://pub.dev"
     source: hosted
-    version: "1.14.1"
+    version: "1.14.2"
   flutter:
     dependency: "direct main"
     description: flutter

pubspec.yaml

@@ -3,7 +3,7 @@ description: Simple, local, material design notes
 repository: https://github.com/maelchiotti/LocalMaterialNotes
 documentation: https://github.com/maelchiotti/LocalMaterialNotes/wiki
 
-version: 1.1.1+4
+version: 1.1.2+5
 publish_to: none
 
 environment:
@@ -15,7 +15,7 @@ dependencies:
   device_info_plus: ^9.1.2
   dynamic_color: ^1.6.9
   equatable: ^2.0.5
-  fleather: ^1.14.1
+  fleather: ^1.14.2
   flutter:
     sdk: flutter
   flutter_hooks: ^0.20.5