v2.1.6

.github/workflows/release.yaml

@@ -98,6 +98,7 @@ jobs:
         run: |
           export PUB_CACHE=$HOME/.pub-cache
           flutter pub get
+          sed -i -e 's/-Wl,/-Wl,--build-id=none,/' ${PUB_CACHE}/hosted/*/jni-*/src/CMakeLists.txt
       - name: Setup Isar
         run: |
           sudo apt-get install -y tofrodos

.run/Generate files.run.xml

@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
     <configuration default="false" name="Generate files" type="ShConfigurationType">
-        <option name="SCRIPT_TEXT"
-                value="fvm dart run build_runner build --delete-conflicting-outputs" />
+        <option name="SCRIPT_TEXT" value="fvm dart run build_runner build" />
         <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
         <option name="SCRIPT_PATH" value="" />
         <option name="SCRIPT_OPTIONS" value="" />

lib/common/actions/backup.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import '../../services/backup/auto_backup_service.dart';
@@ -7,6 +8,10 @@ import '../preferences/preference_key.dart';
 
 /// Requires the user to select a backup directory.
 Future<void> requireBackupDirectory(BuildContext context) async {
+  if (!kReleaseMode) {
+    return;
+  }
+
   final select = await showAdaptiveDialog<bool>(
     context: context,
     useRootNavigator: false,

lib/common/actions/notes/archive.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../models/note/note.dart';
-import '../../../models/note/note_status.dart';
 import '../../../providers/notes/notes_provider.dart';
 import '../../../providers/notifiers/notifiers.dart';
 import '../../constants/constants.dart';
@@ -38,15 +37,16 @@ Future<bool> archiveNote(
 
   currentNoteNotifier.value = null;
 
-  final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
-      .setArchived([note], true);
+  final succeeded = await ref.read(notesProvider(status: note.status, label: currentLabelFilter).notifier).setArchived([
+    note,
+  ], true);
 
   if (succeeded && cancel && context.mounted) {
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_archived(1),
-      onCancel: (globalRef) async => await unarchiveNote(context, globalRef, note: note, cancel: false),
+      onCancel: (globalRef) async =>
+          await unarchiveNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -67,18 +67,19 @@ Future<bool> archiveNotes(BuildContext context, WidgetRef ref, {required List<No
   }
 
   final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
+      .read(notesProvider(status: notes.first.status, label: currentLabelFilter).notifier)
       .setArchived(notes, true);
 
   if (context.mounted) {
-    exitNotesSelectionMode(context, ref, notesStatus: NoteStatus.available);
+    exitNotesSelectionMode(context, ref, notesStatus: notes.first.status);
   }
 
   if (succeeded && cancel && context.mounted) {
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_archived(notes.length),
-      onCancel: (globalRef) async => await unarchiveNotes(context, globalRef, notes: notes, cancel: false),
+      onCancel: (globalRef) async =>
+          await unarchiveNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 

lib/common/actions/notes/delete.dart

@@ -41,17 +41,17 @@ Future<bool> deleteNote(
 
   final wasArchived = note.archived;
 
-  final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
-      .setDeleted([note], true);
+  final succeeded = await ref.read(notesProvider(status: note.status, label: currentLabelFilter).notifier).setDeleted([
+    note,
+  ], true);
 
   if (succeeded && cancel && context.mounted) {
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_deleted(1),
       onCancel: (globalRef) async => wasArchived
-          ? await archiveNote(context, globalRef, note: note, cancel: false)
-          : await restoreNote(context, globalRef, note: note, cancel: false),
+          ? await archiveNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false)
+          : await restoreNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -74,20 +74,20 @@ Future<bool> deleteNotes(BuildContext context, WidgetRef ref, {required List<Not
   final wereArchived = notes.first.archived;
 
   final succeeded = await ref
-      .read(notesProvider(status: NoteStatus.available, label: currentLabelFilter).notifier)
+      .read(notesProvider(status: notes.first.status, label: currentLabelFilter).notifier)
       .setDeleted(notes, true);
 
   if (context.mounted) {
-    exitNotesSelectionMode(context, ref, notesStatus: NoteStatus.available);
+    exitNotesSelectionMode(context, ref, notesStatus: notes.first.status);
   }
 
   if (succeeded && cancel && context.mounted) {
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_deleted(notes.length),
       onCancel: (globalRef) async => wereArchived
-          ? await archiveNotes(context, ref, notes: notes)
-          : await restoreNotes(context, globalRef, notes: notes, cancel: false),
+          ? await archiveNotes(rootNavigatorKey.currentContext!, ref, notes: notes)
+          : await restoreNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 

lib/common/actions/notes/restore.dart

@@ -44,7 +44,8 @@ Future<bool> restoreNote(
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_restored(1),
-      onCancel: (globalRef) async => await deleteNote(context, globalRef, note: note, cancel: false),
+      onCancel: (globalRef) async =>
+          await deleteNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -74,7 +75,8 @@ Future<bool> restoreNotes(BuildContext context, WidgetRef ref, {required List<No
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_restored(notes.length),
-      onCancel: (globalRef) async => await deleteNotes(context, globalRef, notes: notes, cancel: false),
+      onCancel: (globalRef) async =>
+          await deleteNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 

lib/common/actions/notes/unarchive.dart

@@ -46,7 +46,8 @@ Future<bool> unarchiveNote(
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_unarchived(1),
-      onCancel: (globalRef) async => await archiveNote(context, globalRef, note: note, cancel: false),
+      onCancel: (globalRef) async =>
+          await archiveNote(rootNavigatorKey.currentContext!, globalRef, note: note, cancel: false),
     );
   }
 
@@ -83,7 +84,8 @@ Future<bool> unarchiveNotes(
     SnackBarUtils().show(
       context,
       text: context.l.snack_bar_unarchived(notes.length),
-      onCancel: (globalRef) async => await archiveNotes(context, globalRef, notes: notes, cancel: false),
+      onCancel: (globalRef) async =>
+          await archiveNotes(rootNavigatorKey.currentContext!, globalRef, notes: notes, cancel: false),
     );
   }
 

lib/models/note/index/note_index.dart

@@ -42,7 +42,7 @@ class NoteIndex {
     deleted: note.deleted,
     archived: note.archived,
     title: note.title,
-    content: note.plainText,
+    content: note.contentAsText,
     labels: note.labelsNamesVisibleSorted,
   );
 

lib/models/note/note.dart

@@ -115,7 +115,7 @@ sealed class Note implements Comparable<Note> {
 
   /// The content as plain text.
   @ignore
-  String get plainText;
+  String get contentAsText;
 
   /// The content as markdown.
   @ignore
@@ -131,11 +131,11 @@ sealed class Note implements Comparable<Note> {
 
   /// The number of words in the content.
   @ignore
-  int get wordsCount => _wordsCountRegex.allMatches(plainText).length;
+  int get wordsCount => _wordsCountRegex.allMatches(contentAsText).length;
 
   /// The number of characters in the content.
   @ignore
-  int get charactersCount => plainText.length;
+  int get charactersCount => contentAsText.length;
 
   /// Whether the title is empty.
   @ignore
@@ -185,6 +185,14 @@ sealed class Note implements Comparable<Note> {
   @ignore
   String get labelsAsMarkdown => '> ${labelsNamesVisibleSorted.join(', ')}';
 
+  /// The [title] indexed for full-text search.
+  @Index(type: IndexType.value, caseSensitive: false)
+  List<String> get titleIndexed => Isar.splitWords(title.toLowerCase());
+
+  /// The [contentAsText] indexed for full-text search.
+  @Index(type: IndexType.value, caseSensitive: false)
+  List<String> get contentIndexed => Isar.splitWords(contentAsText.toLowerCase());
+
   /// Notes are sorted according to:
   ///   1. Their pin state.
   ///   2. The sort method chosen by the user.

lib/models/note/types/checklist_note.dart

@@ -79,7 +79,7 @@ class ChecklistNote extends Note {
 
   @ignore
   @override
-  String get plainText {
+  String get contentAsText {
     StringBuffer plainText = StringBuffer();
 
     for (int index = 0; index < checkboxes.length; index++) {
@@ -109,7 +109,7 @@ class ChecklistNote extends Note {
 
   @ignore
   @override
-  String get contentPreview => plainText.trim();
+  String get contentPreview => contentAsText.trim();
 
   @ignore
   @override

lib/models/note/types/markdown_note.dart

@@ -62,15 +62,15 @@ class MarkdownNote extends Note {
 
   @ignore
   @override
-  String get plainText => content.removeMarkdown();
+  String get contentAsText => content.removeMarkdown();
 
   @ignore
   @override
   String get contentAsMarkdown => content;
 
   @ignore
   @override
-  String get contentPreview => plainText.trim();
+  String get contentPreview => contentAsText.trim();
 
   @ignore
   @override

lib/models/note/types/plain_text_note.dart

@@ -62,15 +62,15 @@ class PlainTextNote extends Note {
 
   @ignore
   @override
-  String get plainText => content;
+  String get contentAsText => content;
 
   @ignore
   @override
   String get contentAsMarkdown => content;
 
   @ignore
   @override
-  String get contentPreview => plainText.trim();
+  String get contentPreview => contentAsText.trim();
 
   @ignore
   @override

lib/models/note/types/rich_text_note.dart

@@ -95,7 +95,7 @@ class RichTextNote extends Note {
 
   @ignore
   @override
-  String get plainText => document.toPlainText();
+  String get contentAsText => document.toPlainText();
 
   @ignore
   @override

lib/providers/notes/notes_provider.dart

@@ -210,21 +210,19 @@ class Notes extends _$Notes {
       return false;
     }
 
-    final notes = (state.value ?? [])..removeWhere((note) => notesToSet.contains(note));
-
-    state = AsyncData(notes);
+    state = AsyncData(await get());
 
     _updateUnlabeledProvider();
-    _updateStatusProvider(archived ? NoteStatus.archived : NoteStatus.available);
+    _updateStatusProvider(NoteStatus.available);
+    _updateStatusProvider(NoteStatus.archived);
+    _updateStatusProvider(NoteStatus.deleted);
 
     return true;
   }
 
   /// Sets whether the [notesToSet] are deleted to [deleted] in the database.
   Future<bool> setDeleted(List<Note> notesToSet, bool deleted) async {
-    _checkStatus([NoteStatus.available, NoteStatus.deleted]);
-
-    final wereArchived = notesToSet.first.archived;
+    _checkStatus([NoteStatus.available, NoteStatus.archived, NoteStatus.deleted]);
 
     for (final note in notesToSet) {
       note.pinned = false;
@@ -241,16 +239,12 @@ class Notes extends _$Notes {
       return false;
     }
 
-    final notes = (state.value ?? [])..removeWhere((note) => notesToSet.contains(note));
-
-    state = AsyncData(notes);
+    state = AsyncData(await get());
 
     _updateUnlabeledProvider();
-    if (deleted) {
-      _updateStatusProvider(NoteStatus.deleted);
-    } else {
-      _updateStatusProvider(wereArchived ? NoteStatus.archived : NoteStatus.available);
-    }
+    _updateStatusProvider(NoteStatus.available);
+    _updateStatusProvider(NoteStatus.archived);
+    _updateStatusProvider(NoteStatus.deleted);
 
     return true;
   }
@@ -350,6 +344,10 @@ class Notes extends _$Notes {
 
   /// Updates the notes provider with the [status].
   void _updateStatusProvider(NoteStatus status) {
+    if (this.status == status) {
+      return;
+    }
+
     ref.read(notesProvider(status: status).notifier).get();
   }
 }

lib/services/database_service.dart

@@ -1,6 +1,4 @@
-import 'package:flutter_mimir/flutter_mimir.dart';
 import 'package:isar_community/isar.dart';
-import 'package:mimir/mimir.dart';
 import 'package:path_provider/path_provider.dart';
 
 import '../models/deprecated/note.dart';
@@ -9,7 +7,6 @@ import '../models/note/note.dart';
 import 'bin/bin_service.dart';
 import 'labels/labels_service.dart';
 import 'migration/migration_service.dart';
-import 'notes/notes_index_service.dart';
 import 'notes/notes_service.dart';
 
 /// Abstract service for the database.
@@ -26,9 +23,6 @@ class DatabaseService {
   /// Isar database instance.
   late final Isar database;
 
-  /// Mimir index instance.
-  late final MimirInstance mimir;
-
   /// Ensures the service is initialized.
   Future<void> ensureInitialized() async {
     final databaseName = 'materialnotes';
@@ -41,12 +35,6 @@ class DatabaseService {
       directory: databaseDirectory,
     );
 
-    // Initialize mimir
-    mimir = await Mimir.defaultInstance;
-
-    // Initialize the indexes service
-    await NotesIndexService().ensureInitialized();
-
     // Initialize the models services
     await LabelsService().ensureInitialized();
     await NotesService().ensureInitialized();