From 357cf7282e323cbf2579c01c266ff89799f9c1b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Chiotti?=
 <44336112+maelchiotti@users.noreply.github.com>
Date: Sun, 2 Feb 2025 18:19:37 +0100
Subject: [PATCH] [372] feat: add checklist note

---
 lib/app.dart                                  |   6 +-
 lib/common/actions/notes/add.dart             |   2 +
 lib/common/constants/paddings.dart            |   6 +-
 .../navigation/app_bars/editor_app_bar.dart   |   2 +-
 lib/common/preferences/preference_key.dart    |   2 +-
 .../preferences/watched_preferences.dart      |   2 +-
 lib/common/system/quick_actions_utils.dart    |   4 +-
 lib/common/system/share_utils.dart            |   4 +-
 lib/l10n/translations/app_en.arb              |   8 ++
 lib/models/note/note.dart                     |  12 +-
 lib/models/note/types/checklist_note.dart     | 125 ++++++++++++++++++
 .../note_type.dart}                           |  10 +-
 .../plain_text_note.dart                      |   9 +-
 .../{rich_text => types}/rich_text_note.dart  |   7 +-
 lib/pages/editor/editor_page.dart             |  34 ++---
 .../checklist_editor/checklist_editor.dart    |  47 +++++++
 .../widgets/plain_text/plain_text_editor.dart |  30 +++--
 .../widgets/rich_text/rich_text_editor.dart   |  69 +++++-----
 lib/pages/editor/widgets/title_editor.dart    |  40 +++---
 lib/pages/notes/widgets/add_note_fab.dart     |  14 +-
 .../settings_notes_types_page.dart            |   2 +-
 .../settings_notes_types_rich_text_page.dart  |   2 +-
 lib/services/backup/backup_service.dart       |  42 +++++-
 lib/services/database_service.dart            |   1 +
 lib/services/notes/notes_service.dart         |  24 +++-
 pubspec.lock                                  |  16 +++
 pubspec.yaml                                  |   1 +
 27 files changed, 408 insertions(+), 113 deletions(-)
 create mode 100644 lib/models/note/types/checklist_note.dart
 rename lib/models/note/{notes_types.dart => types/note_type.dart} (88%)
 rename lib/models/note/{plain_text => types}/plain_text_note.dart (92%)
 rename lib/models/note/{rich_text => types}/rich_text_note.dart (97%)
 create mode 100644 lib/pages/editor/widgets/checklist_editor/checklist_editor.dart

diff --git a/lib/app.dart b/lib/app.dart
index e1607247..22afc5dc 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -4,6 +4,7 @@ import 'package:after_layout/after_layout.dart';
 import 'package:back_button_interceptor/back_button_interceptor.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_checklist/checklist.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import 'common/actions/labels/select.dart';
@@ -135,7 +136,10 @@ class _AppState extends ConsumerState<App> with AfterLayoutMixin<App> {
             theme: lightTheme,
             darkTheme: darkTheme,
             themeMode: themeMode,
-            localizationsDelegates: AppLocalizations.localizationsDelegates,
+            localizationsDelegates: [
+              ...AppLocalizations.localizationsDelegates,
+              ChecklistLocalizations.delegate,
+            ],
             supportedLocales: SupportedLanguage.locales,
             locale: LocaleUtils().appLocale,
             debugShowCheckedModeBanner: false,
diff --git a/lib/common/actions/notes/add.dart b/lib/common/actions/notes/add.dart
index 2b29cbc3..6942edae 100644
--- a/lib/common/actions/notes/add.dart
+++ b/lib/common/actions/notes/add.dart
@@ -21,6 +21,8 @@ Future<void> addNote<NoteType>(BuildContext context, WidgetRef ref, {String? con
       note = content == null ? PlainTextNote.empty() : PlainTextNote.content(content);
     case == RichTextNote:
       note = content == null ? RichTextNote.empty() : RichTextNote.content(content);
+    case == ChecklistNote:
+      note = ChecklistNote.empty();
     default:
       throw Exception('Unknown note type when creating a new note: $NoteType');
   }
diff --git a/lib/common/constants/paddings.dart b/lib/common/constants/paddings.dart
index 39af31d7..0b6980b8 100644
--- a/lib/common/constants/paddings.dart
+++ b/lib/common/constants/paddings.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+
 import 'constants.dart';
 
 // ignore_for_file: avoid_classes_with_only_static_members
@@ -40,7 +41,10 @@ class Paddings {
   /// Padding for a page.
   static EdgeInsetsDirectional get page => const EdgeInsetsDirectional.all(16);
 
-  /// Padding for a page except the bottom.
+  /// Padding for a page (horizontal).
+  static EdgeInsetsDirectional get pageHorizontal => const EdgeInsetsDirectional.symmetric(horizontal: 16);
+
+  /// Padding for a page (except the bottom).
   static EdgeInsetsDirectional get pageButBottom => const EdgeInsetsDirectional.only(top: 16, start: 16, end: 16);
 
   /// Padding for the end of the app bar.
diff --git a/lib/common/navigation/app_bars/editor_app_bar.dart b/lib/common/navigation/app_bars/editor_app_bar.dart
index 046dfd63..06d4d066 100644
--- a/lib/common/navigation/app_bars/editor_app_bar.dart
+++ b/lib/common/navigation/app_bars/editor_app_bar.dart
@@ -2,7 +2,7 @@ import 'package:fleather/fleather.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-import '../../../models/note/notes_types.dart';
+import '../../../models/note/types/note_type.dart';
 import '../../../pages/editor/sheets/about_sheet.dart';
 import '../../../providers/notifiers/notifiers.dart';
 import '../../actions/notes/copy.dart';
diff --git a/lib/common/preferences/preference_key.dart b/lib/common/preferences/preference_key.dart
index d50a7e3e..df35ca2d 100644
--- a/lib/common/preferences/preference_key.dart
+++ b/lib/common/preferences/preference_key.dart
@@ -13,7 +13,7 @@ enum PreferenceKey<T extends Object> {
   editorFont<String>('systemDefault'),
 
   // Notes types
-  availableNotesTypes<List<String>>(['plainText', 'richText']),
+  availableNotesTypes<List<String>>(['plainText', 'richText', 'checklist']),
   defaultShortcutNoteType<String>('plainText'),
 
   // Rich text notes
diff --git a/lib/common/preferences/watched_preferences.dart b/lib/common/preferences/watched_preferences.dart
index bc8f196c..eb3622f5 100644
--- a/lib/common/preferences/watched_preferences.dart
+++ b/lib/common/preferences/watched_preferences.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../models/note/notes_types.dart';
+import '../../models/note/types/note_type.dart';
 import '../ui/theme_utils.dart';
 import 'enums/bin_swipe_action.dart';
 import 'enums/font.dart';
diff --git a/lib/common/system/quick_actions_utils.dart b/lib/common/system/quick_actions_utils.dart
index b9fd8ced..5084350e 100644
--- a/lib/common/system/quick_actions_utils.dart
+++ b/lib/common/system/quick_actions_utils.dart
@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:quick_actions/quick_actions.dart';
 
 import '../../models/note/note.dart';
-import '../../models/note/notes_types.dart';
+import '../../models/note/types/note_type.dart';
 import '../actions/notes/add.dart';
 import '../localization/localizations_utils.dart';
 
@@ -25,6 +25,8 @@ class QuickActionsUtils {
             addNote<PlainTextNote>(context, ref);
           case NoteType.richText:
             addNote<RichTextNote>(context, ref);
+          default:
+            throw Exception('This note type cannot be created from a shortcut: $defaultShortcutNoteType');
         }
       }
     });
diff --git a/lib/common/system/share_utils.dart b/lib/common/system/share_utils.dart
index e58a7960..438a6f8c 100644
--- a/lib/common/system/share_utils.dart
+++ b/lib/common/system/share_utils.dart
@@ -6,7 +6,7 @@ import 'package:parchment_delta/parchment_delta.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 
 import '../../models/note/note.dart';
-import '../../models/note/notes_types.dart';
+import '../../models/note/types/note_type.dart';
 import '../actions/notes/add.dart';
 import '../constants/constants.dart';
 
@@ -49,5 +49,7 @@ void _processSharedData(WidgetRef ref, List<SharedMediaFile> data) {
       addNote<PlainTextNote>(context, ref, content: content);
     case NoteType.richText:
       addNote<RichTextNote>(context, ref, content: content);
+    default:
+      throw Exception('This note type cannot be created from a shortcut: $defaultShortcutNoteType');
   }
 }
diff --git a/lib/l10n/translations/app_en.arb b/lib/l10n/translations/app_en.arb
index ccb56a3d..9b4389ef 100644
--- a/lib/l10n/translations/app_en.arb
+++ b/lib/l10n/translations/app_en.arb
@@ -731,6 +731,10 @@
   "@tooltip_fab_add_rich_text_note": {
     "description": "Floating action button in the notes page to add a new rich text note."
   },
+  "tooltip_fab_add_checklist_note": "Add a checklist note",
+  "@tooltip_fab_add_checklist_note": {
+    "description": "Floating action button in the notes page to add a new checklist note."
+  },
   "tooltip_fab_add_label": "Add a label",
   "@tooltip_fab_add_label": {
     "description": "Floating action button in the labels page to add a new label."
@@ -1068,5 +1072,9 @@
   "note_type_rich_text": "Rich text",
   "@note_type_rich_text": {
     "description": "Note with rich text."
+  },
+  "note_type_checklist": "Checklist",
+  "@note_type_checklist": {
+    "description": "Note with a checklist."
   }
 }
\ No newline at end of file
diff --git a/lib/models/note/note.dart b/lib/models/note/note.dart
index 5340169b..791c8512 100644
--- a/lib/models/note/note.dart
+++ b/lib/models/note/note.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:collection/collection.dart';
 import 'package:fleather/fleather.dart';
+import 'package:flutter_checklist/checklist.dart';
 import 'package:isar/isar.dart';
 import 'package:json_annotation/json_annotation.dart';
 
@@ -10,13 +11,15 @@ import '../../common/files/encryption_utils.dart';
 import '../../common/preferences/enums/sort_method.dart';
 import '../../common/preferences/preference_key.dart';
 import '../label/label.dart';
-import 'notes_types.dart';
+import 'types/note_type.dart';
 
 part 'note.g.dart';
 
-part 'plain_text/plain_text_note.dart';
+part 'types/checklist_note.dart';
 
-part 'rich_text/rich_text_note.dart';
+part 'types/plain_text_note.dart';
+
+part 'types/rich_text_note.dart';
 
 /// Converts the [labels] to a JSON-compatible list of strings.
 List<String> labelToJson(IsarLinks<Label> labels) => labels.map((label) => label.name).toList();
@@ -68,6 +71,7 @@ sealed class Note implements Comparable<Note> {
     required this.createdTime,
     required this.editedTime,
     required this.title,
+    required this.type,
   });
 
   /// Returns this note with the [title] and the content encrypted using the [password].
@@ -75,7 +79,7 @@ sealed class Note implements Comparable<Note> {
 
   /// The type of the note.
   @ignore
-  NoteType get type;
+  NoteType type;
 
   /// The content as plain text.
   @ignore
diff --git a/lib/models/note/types/checklist_note.dart b/lib/models/note/types/checklist_note.dart
new file mode 100644
index 00000000..b17291dd
--- /dev/null
+++ b/lib/models/note/types/checklist_note.dart
@@ -0,0 +1,125 @@
+part of '../note.dart';
+
+/// Checklist note.
+@JsonSerializable()
+@Collection()
+class ChecklistNote extends Note {
+  /// The list of checkboxes of this checklist.
+  List<bool> checkboxes;
+
+  /// The list of texts of this checklist.
+  List<String> texts;
+
+  /// A note with checklist content.
+  ChecklistNote({
+    required super.deleted,
+    required super.pinned,
+    required super.createdTime,
+    required super.editedTime,
+    required super.title,
+    super.type = NoteType.checklist,
+    required this.checkboxes,
+    required this.texts,
+  }) : assert(
+          checkboxes.length == texts.length,
+          'The lists of checkboxes and texts of a checklist note are different: ${checkboxes.length} and ${texts.length}',
+        );
+
+  /// Checklist note with empty title and content.
+  factory ChecklistNote.empty() => ChecklistNote(
+        deleted: false,
+        pinned: false,
+        createdTime: DateTime.now(),
+        editedTime: DateTime.now(),
+        title: '',
+        checkboxes: [],
+        texts: [],
+      );
+
+  /// Checklist note with the provided [content].
+  factory ChecklistNote.content(List<ChecklistLine> content) => ChecklistNote(
+        deleted: false,
+        pinned: false,
+        createdTime: DateTime.now(),
+        editedTime: DateTime.now(),
+        title: '',
+        checkboxes: content.map((checklistLine) => checklistLine.toggled).toList(),
+        texts: content.map((checklistLine) => checklistLine.text).toList(),
+      );
+
+  /// Checklist note from [json] data.
+  factory ChecklistNote.fromJson(Map<String, dynamic> json) => _$ChecklistNoteFromJson(json);
+
+  /// Checklist note from [json] data, encrypted with [password].
+  factory ChecklistNote.fromJsonEncrypted(Map<String, dynamic> json, String password) {
+    String title = json['title'];
+    List texts = json['texts'];
+
+    return _$ChecklistNoteFromJson(json)
+      ..title = title.isEmpty ? '' : EncryptionUtils().decrypt(password, title)
+      ..texts = texts.isEmpty ? [] : texts.map((text) => EncryptionUtils().decrypt(password, text)).toList();
+  }
+
+  /// Checklist note to JSON.
+  Map<String, dynamic> toJson() => _$ChecklistNoteToJson(this);
+
+  @override
+  Note encrypted(String password) {
+    return this
+      ..title = isTitleEmpty ? '' : EncryptionUtils().encrypt(password, title)
+      ..texts = texts.map((text) => EncryptionUtils().encrypt(password, text)).toList();
+  }
+
+  @ignore
+  @override
+  String get plainText {
+    StringBuffer plainText = StringBuffer();
+
+    for (int index = 0; index < checkboxes.length; index++) {
+      final checked = checkboxes[index];
+      final text = texts[index];
+
+      plainText.writeln('${checked ? '✅' : '⬜'} $text');
+    }
+
+    return plainText.toString();
+  }
+
+  @ignore
+  @override
+  String get markdown {
+    StringBuffer plainText = StringBuffer();
+
+    for (int index = 0; index < checkboxes.length; index++) {
+      final checked = checkboxes[index];
+      final text = texts[index];
+
+      plainText.writeln('${checked ? '[x]' : '[ ]'} $text');
+    }
+
+    return plainText.toString();
+  }
+
+  @ignore
+  @override
+  String get contentPreview => plainText.trim();
+
+  @ignore
+  @override
+  bool get isContentEmpty => checkboxes.isEmpty;
+
+  /// The list of [ChecklistLine] of this checklist.
+  @ignore
+  List<ChecklistLine> get checklistLines {
+    final checklistLines = <ChecklistLine>[];
+
+    for (int index = 0; index < checkboxes.length; index++) {
+      final checked = checkboxes[index];
+      final text = texts[index];
+
+      checklistLines.add((toggled: checked, text: text));
+    }
+
+    return checklistLines;
+  }
+}
diff --git a/lib/models/note/notes_types.dart b/lib/models/note/types/note_type.dart
similarity index 88%
rename from lib/models/note/notes_types.dart
rename to lib/models/note/types/note_type.dart
index 8bc3a288..b044111f 100644
--- a/lib/models/note/notes_types.dart
+++ b/lib/models/note/types/note_type.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_helper_utils/flutter_helper_utils.dart';
 
-import '../../common/constants/constants.dart';
-import '../../common/preferences/preference_key.dart';
-import 'note.dart';
+import '../../../common/constants/constants.dart';
+import '../../../common/preferences/preference_key.dart';
+import '../note.dart';
 
 /// The types of notes.
 enum NoteType<T extends Note> {
@@ -12,6 +12,9 @@ enum NoteType<T extends Note> {
 
   /// Rich text note.
   richText<RichTextNote>(Icons.format_paint),
+
+  /// Checklist note.
+  checklist<ChecklistNote>(Icons.checklist),
   ;
 
   /// Icon representing this note type.
@@ -24,6 +27,7 @@ enum NoteType<T extends Note> {
     return switch (T) {
       == PlainTextNote => l.note_type_plain_text,
       == RichTextNote => l.note_type_rich_text,
+      == ChecklistNote => l.note_type_checklist,
       _ => throw Exception('Unknown note type: $T'),
     };
   }
diff --git a/lib/models/note/plain_text/plain_text_note.dart b/lib/models/note/types/plain_text_note.dart
similarity index 92%
rename from lib/models/note/plain_text/plain_text_note.dart
rename to lib/models/note/types/plain_text_note.dart
index 1c89ac3b..aa394bb6 100644
--- a/lib/models/note/plain_text/plain_text_note.dart
+++ b/lib/models/note/types/plain_text_note.dart
@@ -7,13 +7,14 @@ class PlainTextNote extends Note {
   /// The content of the note.
   String content;
 
-  /// Note with plain text content.
+  /// A note with plain text content.
   PlainTextNote({
     required super.deleted,
     required super.pinned,
     required super.createdTime,
     required super.editedTime,
     required super.title,
+    super.type = NoteType.plainText,
     required this.content,
   });
 
@@ -53,10 +54,6 @@ class PlainTextNote extends Note {
     ..title = isTitleEmpty ? '' : EncryptionUtils().encrypt(password, title)
     ..content = EncryptionUtils().encrypt(password, content);
 
-  @ignore
-  @override
-  NoteType get type => NoteType.plainText;
-
   @ignore
   @override
   String get plainText => content;
@@ -67,7 +64,7 @@ class PlainTextNote extends Note {
 
   @ignore
   @override
-  String get contentPreview => content.trim();
+  String get contentPreview => plainText.trim();
 
   @ignore
   @override
diff --git a/lib/models/note/rich_text/rich_text_note.dart b/lib/models/note/types/rich_text_note.dart
similarity index 97%
rename from lib/models/note/rich_text/rich_text_note.dart
rename to lib/models/note/types/rich_text_note.dart
index 3f3397fb..415a8e19 100644
--- a/lib/models/note/rich_text/rich_text_note.dart
+++ b/lib/models/note/types/rich_text_note.dart
@@ -10,13 +10,14 @@ class RichTextNote extends Note {
   /// The content of the note, as rich text in the fleather representation.
   String content;
 
-  /// Note with rich text content.
+  /// A note with rich text content.
   RichTextNote({
     required super.deleted,
     required super.pinned,
     required super.createdTime,
     required super.editedTime,
     required super.title,
+    super.type = NoteType.richText,
     required this.content,
   });
 
@@ -60,10 +61,6 @@ class RichTextNote extends Note {
   @ignore
   ParchmentDocument get document => ParchmentDocument.fromJson(jsonDecode(content) as List);
 
-  @ignore
-  @override
-  NoteType get type => NoteType.richText;
-
   @ignore
   @override
   String get plainText => document.toPlainText();
diff --git a/lib/pages/editor/editor_page.dart b/lib/pages/editor/editor_page.dart
index ec51469f..0a2b58e1 100644
--- a/lib/pages/editor/editor_page.dart
+++ b/lib/pages/editor/editor_page.dart
@@ -4,7 +4,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:gap/gap.dart';
 
 import '../../common/constants/constants.dart';
-import '../../common/constants/paddings.dart';
 import '../../common/navigation/app_bars/editor_app_bar.dart';
 import '../../common/navigation/top_navigation.dart';
 import '../../common/preferences/preference_key.dart';
@@ -12,6 +11,7 @@ import '../../common/widgets/keys.dart';
 import '../../common/widgets/placeholders/loading_placeholder.dart';
 import '../../models/note/note.dart';
 import '../../providers/notifiers/notifiers.dart';
+import 'widgets/checklist_editor/checklist_editor.dart';
 import 'widgets/editor_labels_list.dart';
 import 'widgets/plain_text/plain_text_editor.dart';
 import 'widgets/rich_text/rich_text_editor.dart';
@@ -87,6 +87,11 @@ class _EditorState extends ConsumerState<NotesEditorPage> {
                 toolbar = RichTextEditorToolbar(
                   fleatherController: fleatherController,
                 );
+              case ChecklistNote note:
+                contentEditor = ChecklistEditor(
+                  note: note,
+                  readOnly: readOnly,
+                );
             }
 
             return Scaffold(
@@ -98,21 +103,18 @@ class _EditorState extends ConsumerState<NotesEditorPage> {
               body: Column(
                 children: [
                   Expanded(
-                    child: Padding(
-                      padding: Paddings.pageButBottom,
-                      child: Column(
-                        children: [
-                          TitleEditor(
-                            readOnly: widget.readOnly,
-                            isNewNote: widget.isNewNote,
-                            onSubmitted: requestEditorFocus,
-                          ),
-                          Gap(8.0),
-                          Expanded(
-                            child: contentEditor,
-                          ),
-                        ],
-                      ),
+                    child: Column(
+                      children: [
+                        TitleEditor(
+                          readOnly: widget.readOnly,
+                          isNewNote: widget.isNewNote,
+                          onSubmitted: requestEditorFocus,
+                        ),
+                        Gap(8.0),
+                        Expanded(
+                          child: contentEditor,
+                        ),
+                      ],
                     ),
                   ),
                   SafeArea(
diff --git a/lib/pages/editor/widgets/checklist_editor/checklist_editor.dart b/lib/pages/editor/widgets/checklist_editor/checklist_editor.dart
new file mode 100644
index 00000000..ca6cc1ad
--- /dev/null
+++ b/lib/pages/editor/widgets/checklist_editor/checklist_editor.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_checklist/checklist.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../models/note/note.dart';
+import '../../../../providers/notes/notes_provider.dart';
+import '../../../../providers/notifiers/notifiers.dart';
+
+/// Checklist editor.
+class ChecklistEditor extends ConsumerWidget {
+  /// Editor allowing to edit the checklist content of a [ChecklistNote].
+  const ChecklistEditor({
+    super.key,
+    required this.note,
+    required this.readOnly,
+  });
+
+  /// The note to display.
+  final ChecklistNote note;
+
+  /// Whether the text fields are read only.
+  final bool readOnly;
+
+  /// Called when an item of the checklist changes with the new [checklistLines].
+  void onChecklistChanged(WidgetRef ref, List<ChecklistLine> checklistLines) {
+    ChecklistNote newNote = note
+      ..checkboxes = checklistLines.map((checklistLine) => checklistLine.toggled).toList()
+      ..texts = checklistLines.map((checklistLine) => checklistLine.text).toList();
+
+    ref.read(notesProvider(label: currentLabelFilter).notifier).edit(newNote);
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return Column(
+      children: [
+        Expanded(
+          child: Checklist(
+            lines: note.checklistLines,
+            enabled: !readOnly,
+            onChanged: (checklistLines) => onChecklistChanged(ref, checklistLines),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/editor/widgets/plain_text/plain_text_editor.dart b/lib/pages/editor/widgets/plain_text/plain_text_editor.dart
index b6d680c6..984b82e7 100644
--- a/lib/pages/editor/widgets/plain_text/plain_text_editor.dart
+++ b/lib/pages/editor/widgets/plain_text/plain_text_editor.dart
@@ -3,6 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../../common/constants/constants.dart';
+import '../../../../common/constants/paddings.dart';
 import '../../../../models/note/note.dart';
 import '../../../../providers/notes/notes_provider.dart';
 import '../../../../providers/notifiers/notifiers.dart';
@@ -56,20 +57,23 @@ class _PlainTextEditorState extends ConsumerState<PlainTextEditor> {
 
   @override
   Widget build(BuildContext context) {
-    return Focus(
-      onFocusChange: onFocusChange,
-      child: TextField(
-        controller: contentTextController,
-        focusNode: editorFocusNode,
-        readOnly: widget.readOnly,
-        autofocus: widget.autofocus,
-        maxLines: null,
-        expands: true,
-        decoration: InputDecoration.collapsed(hintText: ''),
-        spellCheckConfiguration: SpellCheckConfiguration(
-          spellCheckService: DefaultSpellCheckService(),
+    return Padding(
+      padding: Paddings.pageHorizontal,
+      child: Focus(
+        onFocusChange: onFocusChange,
+        child: TextField(
+          controller: contentTextController,
+          focusNode: editorFocusNode,
+          readOnly: widget.readOnly,
+          autofocus: widget.autofocus,
+          maxLines: null,
+          expands: true,
+          decoration: InputDecoration.collapsed(hintText: ''),
+          spellCheckConfiguration: SpellCheckConfiguration(
+            spellCheckService: DefaultSpellCheckService(),
+          ),
+          onChanged: onChanged,
         ),
-        onChanged: onChanged,
       ),
     );
   }
diff --git a/lib/pages/editor/widgets/rich_text/rich_text_editor.dart b/lib/pages/editor/widgets/rich_text/rich_text_editor.dart
index 72542524..a76cf917 100644
--- a/lib/pages/editor/widgets/rich_text/rich_text_editor.dart
+++ b/lib/pages/editor/widgets/rich_text/rich_text_editor.dart
@@ -83,41 +83,44 @@ class _RichTextEditorState extends ConsumerState<RichTextEditor> {
 
     widget.fleatherController.addListener(() => onChanged());
 
-    return DefaultTextStyle.merge(
-      style: TextStyle(
-        fontFamily: editorFont.familyName,
-      ),
-      child: Builder(
-        builder: (context) {
-          final fleatherThemeFallback = FleatherThemeData.fallback(context);
-          final FleatherThemeData fleatherTheme;
-          if (useParagraphsSpacing) {
-            fleatherTheme = fleatherThemeFallback;
-          } else {
-            fleatherTheme = fleatherThemeFallback.copyWith(
-              paragraph: TextBlockTheme(
-                style: fleatherThemeFallback.paragraph.style,
-                spacing: const VerticalSpacing.zero(),
+    return Padding(
+      padding: Paddings.pageHorizontal,
+      child: DefaultTextStyle.merge(
+        style: TextStyle(
+          fontFamily: editorFont.familyName,
+        ),
+        child: Builder(
+          builder: (context) {
+            final fleatherThemeFallback = FleatherThemeData.fallback(context);
+            final FleatherThemeData fleatherTheme;
+            if (useParagraphsSpacing) {
+              fleatherTheme = fleatherThemeFallback;
+            } else {
+              fleatherTheme = fleatherThemeFallback.copyWith(
+                paragraph: TextBlockTheme(
+                  style: fleatherThemeFallback.paragraph.style,
+                  spacing: const VerticalSpacing.zero(),
+                ),
+              );
+            }
+
+            return FleatherTheme(
+              data: fleatherTheme,
+              child: FleatherEditor(
+                controller: widget.fleatherController,
+                focusNode: editorFocusNode,
+                autofocus: widget.autofocus,
+                readOnly: widget.readOnly,
+                expands: true,
+                onLaunchUrl: onLaunchUrl,
+                spellCheckConfiguration: SpellCheckConfiguration(
+                  spellCheckService: DefaultSpellCheckService(),
+                ),
+                padding: Paddings.bottomSystemUi,
               ),
             );
-          }
-
-          return FleatherTheme(
-            data: fleatherTheme,
-            child: FleatherEditor(
-              controller: widget.fleatherController,
-              focusNode: editorFocusNode,
-              autofocus: widget.autofocus,
-              readOnly: widget.readOnly,
-              expands: true,
-              onLaunchUrl: onLaunchUrl,
-              spellCheckConfiguration: SpellCheckConfiguration(
-                spellCheckService: DefaultSpellCheckService(),
-              ),
-              padding: Paddings.bottomSystemUi,
-            ),
-          );
-        },
+          },
+        ),
       ),
     );
   }
diff --git a/lib/pages/editor/widgets/title_editor.dart b/lib/pages/editor/widgets/title_editor.dart
index 1fb24130..b79c914e 100644
--- a/lib/pages/editor/widgets/title_editor.dart
+++ b/lib/pages/editor/widgets/title_editor.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../common/constants/constants.dart';
+import '../../../common/constants/paddings.dart';
 import '../../../common/preferences/preference_key.dart';
 import '../../../models/note/note.dart';
 import '../../../providers/notes/notes_provider.dart';
@@ -49,25 +50,28 @@ class _TitleEditorState extends ConsumerState<TitleEditor> {
   Widget build(BuildContext context) {
     final focusTitleOnNewNote = PreferenceKey.focusTitleOnNewNote.getPreferenceOrDefault();
 
-    return ValueListenableBuilder(
-      valueListenable: currentNoteNotifier,
-      builder: (context, currentNote, child) {
-        titleController = TextEditingController(text: currentNote?.title);
+    return Padding(
+      padding: Paddings.pageHorizontal,
+      child: ValueListenableBuilder(
+        valueListenable: currentNoteNotifier,
+        builder: (context, currentNote, child) {
+          titleController = TextEditingController(text: currentNote?.title);
 
-        return TextField(
-          readOnly: widget.readOnly,
-          autofocus: widget.isNewNote && focusTitleOnNewNote,
-          textCapitalization: TextCapitalization.sentences,
-          textInputAction: TextInputAction.next,
-          style: Theme.of(context).textTheme.titleLarge,
-          decoration: InputDecoration.collapsed(
-            hintText: l.hint_title,
-          ),
-          controller: titleController,
-          onChanged: (text) => onChanged(currentNote, text),
-          onSubmitted: (_) => widget.onSubmitted,
-        );
-      },
+          return TextField(
+            readOnly: widget.readOnly,
+            autofocus: widget.isNewNote && focusTitleOnNewNote,
+            textCapitalization: TextCapitalization.sentences,
+            textInputAction: TextInputAction.next,
+            style: Theme.of(context).textTheme.titleLarge,
+            decoration: InputDecoration.collapsed(
+              hintText: l.hint_title,
+            ),
+            controller: titleController,
+            onChanged: (text) => onChanged(currentNote, text),
+            onSubmitted: (_) => widget.onSubmitted,
+          );
+        },
+      ),
     );
   }
 }
diff --git a/lib/pages/notes/widgets/add_note_fab.dart b/lib/pages/notes/widgets/add_note_fab.dart
index 83558fb1..b6c7d80e 100644
--- a/lib/pages/notes/widgets/add_note_fab.dart
+++ b/lib/pages/notes/widgets/add_note_fab.dart
@@ -4,8 +4,9 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../../../common/actions/notes/add.dart';
 import '../../../common/constants/constants.dart';
+import '../../../common/ui/snack_bar_utils.dart';
 import '../../../models/note/note.dart';
-import '../../../models/note/notes_types.dart';
+import '../../../models/note/types/note_type.dart';
 import '../../../providers/preferences/preferences_provider.dart';
 
 /// Floating action button to add a note.
@@ -35,6 +36,8 @@ class _AddNoteFabState extends ConsumerState<AddNoteFab> {
   }
 
   void onPressed<NoteType>() {
+    SnackBarUtils.info('message').show();
+
     addNote<NoteType>(context, ref);
 
     if (fabKey.currentState != null && fabKey.currentState!.isOpen) {
@@ -54,6 +57,7 @@ class _AddNoteFabState extends ConsumerState<AddNoteFab> {
             onPressed: switch (availableNotesTypes.first) {
               NoteType.plainText => onPressed<PlainTextNote>,
               NoteType.richText => onPressed<RichTextNote>,
+              NoteType.checklist => onPressed<ChecklistNote>
             },
             child: const Icon(Icons.add),
           )
@@ -89,6 +93,14 @@ class _AddNoteFabState extends ConsumerState<AddNoteFab> {
                     icon: Icon(NoteType.richText.icon),
                     label: Text(NoteType.richText.title),
                   ),
+                if (availableNotesTypes.contains(NoteType.checklist))
+                  FloatingActionButton.extended(
+                    heroTag: '<add checklist note hero tag>',
+                    tooltip: l.tooltip_fab_add_checklist_note,
+                    onPressed: onPressed<ChecklistNote>,
+                    icon: Icon(NoteType.checklist.icon),
+                    label: Text(NoteType.checklist.title),
+                  ),
               ],
             ),
           );
diff --git a/lib/pages/settings/pages/notes_types/settings_notes_types_page.dart b/lib/pages/settings/pages/notes_types/settings_notes_types_page.dart
index 70ee43b2..65282627 100644
--- a/lib/pages/settings/pages/notes_types/settings_notes_types_page.dart
+++ b/lib/pages/settings/pages/notes_types/settings_notes_types_page.dart
@@ -9,7 +9,7 @@ import '../../../../common/navigation/top_navigation.dart';
 import '../../../../common/preferences/preference_key.dart';
 import '../../../../common/preferences/watched_preferences.dart';
 import '../../../../common/widgets/keys.dart';
-import '../../../../models/note/notes_types.dart';
+import '../../../../models/note/types/note_type.dart';
 import '../../../../navigation/navigation_routes.dart';
 import '../../../../providers/preferences/preferences_provider.dart';
 import 'settings_notes_types_rich_text_page.dart';
diff --git a/lib/pages/settings/pages/notes_types/settings_notes_types_rich_text_page.dart b/lib/pages/settings/pages/notes_types/settings_notes_types_rich_text_page.dart
index f5af79ca..ca5cc375 100644
--- a/lib/pages/settings/pages/notes_types/settings_notes_types_rich_text_page.dart
+++ b/lib/pages/settings/pages/notes_types/settings_notes_types_rich_text_page.dart
@@ -7,7 +7,7 @@ import '../../../../common/constants/paddings.dart';
 import '../../../../common/navigation/app_bars/basic_app_bar.dart';
 import '../../../../common/navigation/top_navigation.dart';
 import '../../../../common/preferences/preference_key.dart';
-import '../../../../models/note/notes_types.dart';
+import '../../../../models/note/types/note_type.dart';
 
 /// Rich text notes settings.
 class SettingsNotesTypesRichTextPage extends ConsumerStatefulWidget {
diff --git a/lib/services/backup/backup_service.dart b/lib/services/backup/backup_service.dart
index 771b342a..88c06d4e 100644
--- a/lib/services/backup/backup_service.dart
+++ b/lib/services/backup/backup_service.dart
@@ -17,6 +17,7 @@ import '../../common/system/info_utils.dart';
 import '../../common/ui/snack_bar_utils.dart';
 import '../../models/label/label.dart';
 import '../../models/note/note.dart';
+import '../../models/note/types/note_type.dart';
 import '../../pages/settings/dialogs/auto_export_password_dialog.dart';
 import '../labels/labels_service.dart';
 import '../notes/notes_service.dart';
@@ -44,7 +45,7 @@ class ManualBackupService {
 
     var importedJson = jsonDecode(utf8.decode(importedFile));
 
-    // If the imported JSON is just a list, then it's the old export format that just contains the notes list
+    // If the imported JSON is just a list, it's an export from before v1. that just contains the notes list
     if (importedJson is List) {
       logger.w('The imported JSON file uses the old discontinued format with just the list of notes');
 
@@ -120,7 +121,21 @@ class ManualBackupService {
 
       try {
         for (final noteAsJsonEncrypted in notesAsJson) {
-          notes.add(RichTextNote.fromJsonEncrypted(noteAsJsonEncrypted, password));
+          final noteType = NoteType.values.byNameOrNull(noteAsJsonEncrypted['type']);
+
+          // If the note type is null, it's an export from before v2.0.0 when only rich text notes were available
+          if (noteType == null) {
+            notes.add(RichTextNote.fromJsonEncrypted(noteAsJsonEncrypted, password));
+          } else {
+            switch (noteType) {
+              case NoteType.plainText:
+                notes.add(PlainTextNote.fromJsonEncrypted(noteAsJsonEncrypted, password));
+              case NoteType.richText:
+                notes.add(RichTextNote.fromJsonEncrypted(noteAsJsonEncrypted, password));
+              case NoteType.checklist:
+                notes.add(ChecklistNote.fromJsonEncrypted(noteAsJsonEncrypted, password));
+            }
+          }
         }
       } catch (exception, stackTrace) {
         logger.e(exception.toString(), exception, stackTrace);
@@ -134,7 +149,21 @@ class ManualBackupService {
       }
     } else {
       for (final noteAsJson in notesAsJson) {
-        notes.add(RichTextNote.fromJson(noteAsJson));
+        final noteType = NoteType.values.byNameOrNull(noteAsJson['type']);
+
+        // If the note type is null, it's an export from before v2.0.0 when only rich text notes were available
+        if (noteType == null) {
+          notes.add(RichTextNote.fromJson(noteAsJson));
+        } else {
+          switch (noteType) {
+            case NoteType.plainText:
+              notes.add(PlainTextNote.fromJson(noteAsJson));
+            case NoteType.richText:
+              notes.add(RichTextNote.fromJson(noteAsJson));
+            case NoteType.checklist:
+              notes.add(ChecklistNote.fromJson(noteAsJson));
+          }
+        }
       }
     }
 
@@ -169,7 +198,12 @@ class ManualBackupService {
         throw Exception("While restoring the preferences from JSON, the preference '$preference' doesn't exist");
       }
 
-      preferenceKey.set(value);
+      // If the preference value is a list, the it's a list of String (the only type of list that can be stored in the preferences)
+      if (value is List) {
+        preferenceKey.set(value.cast<String>());
+      } else {
+        preferenceKey.set(value);
+      }
     });
 
     return true;
diff --git a/lib/services/database_service.dart b/lib/services/database_service.dart
index be33cf2d..48f96974 100644
--- a/lib/services/database_service.dart
+++ b/lib/services/database_service.dart
@@ -37,6 +37,7 @@ class DatabaseService {
         NoteSchema,
         PlainTextNoteSchema,
         RichTextNoteSchema,
+        ChecklistNoteSchema,
         LabelSchema,
       ],
       name: databaseName,
diff --git a/lib/services/notes/notes_service.dart b/lib/services/notes/notes_service.dart
index 5e553948..3da5a39e 100644
--- a/lib/services/notes/notes_service.dart
+++ b/lib/services/notes/notes_service.dart
@@ -26,6 +26,7 @@ class NotesService {
 
   late final IsarCollection<PlainTextNote> _plainTextNotes;
   late final IsarCollection<RichTextNote> _richTextNotes;
+  late final IsarCollection<ChecklistNote> _checklistNotes;
 
   late final MimirIndex _index;
 
@@ -35,6 +36,7 @@ class NotesService {
 
     _plainTextNotes = DatabaseService().database.plainTextNotes;
     _richTextNotes = DatabaseService().database.richTextNotes;
+    _checklistNotes = DatabaseService().database.checklistNotes;
 
     _index = await DatabaseService().mimir.openIndex(
       'notes',
@@ -94,25 +96,28 @@ class NotesService {
 
   /// Returns the total number of notes.
   Future<int> get count async {
-    return await _plainTextNotes.count() + await _richTextNotes.count();
+    return await _plainTextNotes.count() + await _richTextNotes.count() + await _checklistNotes.count();
   }
 
   /// Returns all the notes.
   Future<List<Note>> getAll() async => [
         ...await (_plainTextNotes.where().findAll()),
         ...await (_richTextNotes.where().findAll()),
+        ...await (_checklistNotes.where().findAll()),
       ];
 
   /// Returns all the notes with the [ids].
   Future<List<Note>> getAllByIds(List<int> ids) async => [
         ...(await (_plainTextNotes.getAll(ids))).nonNulls,
         ...(await (_richTextNotes.getAll(ids))).nonNulls,
+        ...(await (_checklistNotes.getAll(ids))).nonNulls,
       ];
 
   /// Returns all the notes that are not deleted.
   Future<List<Note>> getAllNotDeleted() async => [
         ...await (_plainTextNotes.where().deletedEqualTo(false).findAll()),
         ...await (_richTextNotes.where().deletedEqualTo(false).findAll()),
+        ...await (_checklistNotes.where().deletedEqualTo(false).findAll()),
       ];
 
   /// Returns all the notes that are not deleted filtered by the [label].
@@ -129,12 +134,19 @@ class NotesService {
             .filter()
             .labels((q) => q.nameEqualTo(label.name))
             .findAll()),
+        ...await (_checklistNotes
+            .where()
+            .deletedEqualTo(false)
+            .filter()
+            .labels((q) => q.nameEqualTo(label.name))
+            .findAll()),
       ];
 
   /// Returns all the notes that are deleted.
   Future<List<Note>> getAllDeleted() async => [
         ...await (_plainTextNotes.where().deletedEqualTo(true).findAll()),
         ...await (_richTextNotes.where().deletedEqualTo(true).findAll()),
+        ...await (_checklistNotes.where().deletedEqualTo(true).findAll()),
       ];
 
   /// Returns all the notes that match the [search].
@@ -174,6 +186,8 @@ class NotesService {
           await _plainTextNotes.put(note);
         case final RichTextNote _:
           await _richTextNotes.put(note);
+        case final ChecklistNote _:
+          await _checklistNotes.put(note);
       }
     });
 
@@ -184,10 +198,12 @@ class NotesService {
   Future<void> putAll(List<Note> notes) async {
     final plainTextNotes = notes.whereType<PlainTextNote>().toList();
     final richTextNotes = notes.whereType<RichTextNote>().toList();
+    final checklistNotes = notes.whereType<ChecklistNote>().toList();
 
     await _database.writeTxn(() async {
       await _plainTextNotes.putAll(plainTextNotes);
       await _richTextNotes.putAll(richTextNotes);
+      await _checklistNotes.putAll(checklistNotes);
     });
 
     await _updateAllIndexes(notes);
@@ -245,6 +261,8 @@ class NotesService {
           await _plainTextNotes.delete(note.isarId);
         case final RichTextNote _:
           await _richTextNotes.delete(note.isarId);
+        case final ChecklistNote _:
+          await _checklistNotes.delete(note.isarId);
       }
     });
 
@@ -255,10 +273,12 @@ class NotesService {
   Future<void> deleteAll(List<Note> notes) async {
     final plainTextNotesIds = notes.whereType<PlainTextNote>().map((note) => note.isarId).toList();
     final richTextNotesIds = notes.whereType<RichTextNote>().map((note) => note.isarId).toList();
+    final checklistNotesIds = notes.whereType<ChecklistNote>().map((note) => note.isarId).toList();
 
     await _database.writeTxn(() async {
       await _plainTextNotes.deleteAll(plainTextNotesIds);
       await _richTextNotes.deleteAll(richTextNotesIds);
+      await _checklistNotes.deleteAll(checklistNotesIds);
     });
 
     await _deleteAllIndexes(notes);
@@ -271,6 +291,7 @@ class NotesService {
     await _database.writeTxn(() async {
       await _plainTextNotes.where().deletedEqualTo(true).deleteAll();
       await _richTextNotes.where().deletedEqualTo(true).deleteAll();
+      await _checklistNotes.where().deletedEqualTo(true).deleteAll();
     });
 
     _deleteAllIndexes(notes);
@@ -281,6 +302,7 @@ class NotesService {
     await _database.writeTxn(() async {
       await _plainTextNotes.clear();
       await _richTextNotes.clear();
+      await _checklistNotes.clear();
     });
 
     _index.deleteAllDocuments();
diff --git a/pubspec.lock b/pubspec.lock
index 59252b4b..117b48de 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -38,6 +38,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.11.3"
+  animated_reorderable_list:
+    dependency: transitive
+    description:
+      name: animated_reorderable_list
+      sha256: "12c6d498a6a33a6341d5c1184b3616ddf6b9d3823f1501e3b0a2af8ebfc9548b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.5"
   ansicolor:
     dependency: transitive
     description:
@@ -451,6 +459,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_checklist:
+    dependency: "direct main"
+    description:
+      name: flutter_checklist
+      sha256: "1cbeddff0feb58b742435351cbdd64fd7069fd666a3e5cdff886ac0635bcae06"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
   flutter_displaymode:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 13d33501..05f84132 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -24,6 +24,7 @@ dependencies:
   flex_color_picker: ^3.7.0
   flutter:
     sdk: flutter
+  flutter_checklist: ^1.2.0
   flutter_displaymode: ^0.6.0
   flutter_expandable_fab: ^2.3.0
   flutter_helper_utils: ^6.10.0