[303] New notes types (#393)

* [303] fix: snack bar with expandable fab * [303] feat: add back hint in the editors * [303] feat: add an item by default in a new checklist note and focus it * [303] style: note type icon * [303] feat: move per note type settings into the notes types settings page
maelchiotti · Feb 12, 2025 · 5b4ef9a · 5b4ef9a
1 parent 3fd7ee8
commit 5b4ef9a
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 119 deletions.
diff --git a/lib/common/preferences/preference_key.dart b/lib/common/preferences/preference_key.dart
@@ -22,10 +22,10 @@ enum PreferenceKey<T extends Object> {
   // Notes tiles
   showTilesBackground<bool>(false),
   showSeparators<bool>(false),
-  showNoteTypeIcon<bool>(true),
   showTitlesOnly<bool>(false),
   showTitlesOnlyDisableInSearchView<bool>(true),
   maximumContentPreviewLines<int>(3),
+  showNoteTypeIcon<bool>(true),
 
   // Behavior
   flagSecure<bool>(false),

diff --git a/lib/common/preferences/watched_preferences.dart b/lib/common/preferences/watched_preferences.dart
@@ -24,9 +24,9 @@ class WatchedPreferences {
   // Notes tiles
   late bool showTilesBackground;
   late bool showSeparators;
-  late bool showNoteTypeIcon;
   late bool showTitlesOnly;
   late int maximumContentPreviewLines;
+  late bool showNoteTypeIcon;
 
   // Behavior
   late ({SwipeAction right, SwipeAction left}) swipeActions;
@@ -51,9 +51,9 @@ class WatchedPreferences {
     List<NoteType>? availableNotesTypes,
     bool? showTitlesOnly,
     bool? showTilesBackground,
-    bool? showNoteTypeIcon,
     bool? showSeparators,
     int? maximumContentPreviewLines,
+    bool? showNoteTypeIcon,
     SwipeAction? rightSwipeAction,
     SwipeAction? leftSwipeAction,
     BinSwipeAction? binRightSwipeAction,
@@ -73,10 +73,10 @@ class WatchedPreferences {
 
     this.showTitlesOnly = showTitlesOnly ?? PreferenceKey.showTitlesOnly.getPreferenceOrDefault();
     this.showTilesBackground = showTilesBackground ?? PreferenceKey.showTilesBackground.getPreferenceOrDefault();
-    this.showNoteTypeIcon = showNoteTypeIcon ?? PreferenceKey.showNoteTypeIcon.getPreferenceOrDefault();
     this.showSeparators = showSeparators ?? PreferenceKey.showSeparators.getPreferenceOrDefault();
     this.maximumContentPreviewLines =
         maximumContentPreviewLines ?? PreferenceKey.maximumContentPreviewLines.getPreferenceOrDefault();
+    this.showNoteTypeIcon = showNoteTypeIcon ?? PreferenceKey.showNoteTypeIcon.getPreferenceOrDefault();
 
     swipeActions = (
       right: rightSwipeAction ?? SwipeAction.rightFromPreference(),

diff --git a/lib/common/ui/snack_bar_utils.dart b/lib/common/ui/snack_bar_utils.dart
@@ -28,7 +28,6 @@ class SnackBarUtils {
   void show({BuildContext? context}) {
     ScaffoldMessenger.of(context ?? rootNavigatorKey.currentContext!).showSnackBar(
       SnackBar(
-        behavior: SnackBarBehavior.floating,
         duration: duration,
         content: Text(text),
       ),

diff --git a/lib/l10n/translations/app_en.arb b/lib/l10n/translations/app_en.arb
@@ -329,18 +329,14 @@
   "@settings_page_notes_types": {
     "description": "Title of the settings page regarding the notes types."
   },
-  "settings_page_notes_types_description": "Types to use, per-type settings",
+  "settings_page_notes_types_description": "Types to use, rich text",
   "@settings_page_notes_types_description": {
     "description": "Description of the settings page regarding the notes types."
   },
   "settings_section_types_to_use": "Types to use",
   "@settings_section_types_to_use": {
     "description": "Title of the settings section regarding the notes types to use."
   },
-  "settings_section_per_type_settings": "Per-type settings",
-  "@settings_section_per_type_settings": {
-    "description": "Title of the settings section regarding the per-type settings."
-  },
   "settings_available_notes_types": "Available notes types",
   "@settings_available_notes_types": {
     "description": "Title of the setting tile to choose the available notes types."
@@ -357,14 +353,6 @@
   "@settings_available_default_shortcut_type_description": {
     "description": "Description of the setting tile to choose the default note type to use when creating a note from a shortcut."
   },
-  "settings_page_rich_text_notes_description": "Appearance",
-  "@settings_page_rich_text_notes_description": {
-    "description": "Description of the settings page regarding the rich text notes."
-  },
-  "settings_section_rich_text_notes_appearance": "Appearance",
-  "@settings_section_rich_text_notes_appearance": {
-    "description": "Description of the settings page regarding the rich text notes."
-  },
   "settings_editor": "Editor",
   "@settings_editor": {
     "description": "Title of the settings page regarding the notes content editor."
@@ -683,6 +671,10 @@
   "@hint_title": {
     "description": "Hint for the text field of the title of the notes."
   },
+  "hint_content": "Note",
+  "@hint_content": {
+    "description": "Hint for the text field of the content of the notes."
+  },
   "hint_link": "Link",
   "@hint_link": {
     "description": "Hint for the link text field in the dialog to add a link in the editor."

diff --git a/lib/models/note/types/checklist_note.dart b/lib/models/note/types/checklist_note.dart
@@ -25,15 +25,15 @@ class ChecklistNote extends Note {
           'The lists of checkboxes and texts of a checklist note are different: ${checkboxes.length} and ${texts.length}',
         );
 
-  /// Checklist note with empty title and content.
+  /// Checklist note with empty title and 1 empty checklist item.
   factory ChecklistNote.empty() => ChecklistNote(
         deleted: false,
         pinned: false,
         createdTime: DateTime.now(),
         editedTime: DateTime.now(),
         title: '',
-        checkboxes: [],
-        texts: [],
+        checkboxes: [false],
+        texts: [''],
       );
 
   /// Checklist note with the provided [content].

diff --git a/lib/navigation/navigation_routes.dart b/lib/navigation/navigation_routes.dart
@@ -23,7 +23,6 @@ enum NavigationRoute {
   settingsNotesTiles,
   settingsBehavior,
   settingsNotesTypes,
-  settingsNotesTypesRichText,
   settingsEditor,
   settingsLabels,
   settingsBackup,

diff --git a/lib/pages/editor/editor_page.dart b/lib/pages/editor/editor_page.dart
@@ -98,6 +98,7 @@ class _EditorState extends ConsumerState<NotesEditorPage> {
               case ChecklistNote note:
                 contentEditor = ChecklistEditor(
                   note: note,
+                  isNewNote: widget.isNewNote,
                   readOnly: readOnly,
                 );
             }

diff --git a/lib/pages/editor/widgets/checklist/checklist_editor.dart b/lib/pages/editor/widgets/checklist/checklist_editor.dart
@@ -12,12 +12,16 @@ class ChecklistEditor extends ConsumerWidget {
   const ChecklistEditor({
     super.key,
     required this.note,
+    required this.isNewNote,
     required this.readOnly,
   });
 
   /// The note to display.
   final ChecklistNote note;
 
+  /// Whether the note was just created.
+  final bool isNewNote;
+
   /// Whether the text fields are read only.
   final bool readOnly;
 
@@ -38,6 +42,7 @@ class ChecklistEditor extends ConsumerWidget {
           child: Checklist(
             lines: note.checklistLines,
             enabled: !readOnly,
+            autofocusFirstLine: isNewNote,
             onChanged: (checklistLines) => onChecklistChanged(ref, checklistLines),
           ),
         ),

diff --git a/lib/pages/editor/widgets/markdown/markdown_editor.dart b/lib/pages/editor/widgets/markdown/markdown_editor.dart
@@ -63,7 +63,7 @@ class _MarkdownEditorState extends ConsumerState<MarkdownEditor> {
 
     return Padding(
       padding: Paddings.pageHorizontal,
-      child: widget.readOnly
+      child: widget.readOnly && !widget.note.isContentEmpty
           ? Markdown(
               data: widget.note.content,
               padding: EdgeInsets.zero,
@@ -85,11 +85,11 @@ class _MarkdownEditorState extends ConsumerState<MarkdownEditor> {
               child: TextField(
                 controller: contentTextController,
                 focusNode: editorFocusNode,
-                readOnly: widget.readOnly,
+                readOnly: widget.readOnly && widget.note.isContentEmpty,
                 autofocus: widget.autofocus,
                 maxLines: null,
                 expands: true,
-                decoration: InputDecoration.collapsed(hintText: ''),
+                decoration: InputDecoration.collapsed(hintText: l.hint_content),
                 spellCheckConfiguration: SpellCheckConfiguration(
                   spellCheckService: DefaultSpellCheckService(),
                 ),

diff --git a/lib/pages/editor/widgets/plain_text/plain_text_editor.dart b/lib/pages/editor/widgets/plain_text/plain_text_editor.dart
@@ -68,7 +68,7 @@ class _PlainTextEditorState extends ConsumerState<PlainTextEditor> {
           autofocus: widget.autofocus,
           maxLines: null,
           expands: true,
-          decoration: InputDecoration.collapsed(hintText: ''),
+          decoration: InputDecoration.collapsed(hintText: l.hint_content),
           spellCheckConfiguration: SpellCheckConfiguration(
             spellCheckService: DefaultSpellCheckService(),
           ),

diff --git a/lib/pages/editor/widgets/rich_text/rich_text_editor.dart b/lib/pages/editor/widgets/rich_text/rich_text_editor.dart
@@ -106,13 +106,14 @@ class _RichTextEditorState extends ConsumerState<RichTextEditor> {
 
             return FleatherTheme(
               data: fleatherTheme,
-              child: FleatherEditor(
+              child: FleatherField(
                 controller: widget.fleatherController,
                 focusNode: editorFocusNode,
                 autofocus: widget.autofocus,
                 readOnly: widget.readOnly,
                 expands: true,
                 onLaunchUrl: onLaunchUrl,
+                decoration: InputDecoration.collapsed(hintText: l.hint_content),
                 spellCheckConfiguration: SpellCheckConfiguration(
                   spellCheckService: DefaultSpellCheckService(),
                 ),

diff --git a/lib/pages/notes/widgets/add_note_fab.dart b/lib/pages/notes/widgets/add_note_fab.dart
@@ -59,7 +59,7 @@ class _AddNoteFabState extends ConsumerState<AddNoteFab> {
               key: fabKey,
               type: ExpandableFabType.up,
               childrenAnimation: ExpandableFabAnimation.none,
-              distance: 75,
+              distance: 64,
               openButtonBuilder: RotateFloatingActionButtonBuilder(
                 heroTag: '<open add note FAB hero tag>',
                 child: const Icon(Icons.add),

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
@@ -10,9 +10,7 @@ import '../../../../common/preferences/preference_key.dart';
 import '../../../../common/preferences/watched_preferences.dart';
 import '../../../../common/widgets/keys.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';
 
 /// Notes types settings.
 class SettingsNotesTypesPage extends ConsumerStatefulWidget {
@@ -38,6 +36,13 @@ class _SettingsNotesTypesPageState extends ConsumerState<SettingsNotesTypesPage>
     });
   }
 
+  /// Toggles the setting to use spacing between the paragraphs.
+  void _toggleUseParagraphSpacing(bool toggled) {
+    setState(() {
+      PreferenceKey.useParagraphsSpacing.set(toggled);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     final notesTypes = NoteType.values.map((type) {
@@ -53,6 +58,8 @@ class _SettingsNotesTypesPageState extends ConsumerState<SettingsNotesTypesPage>
     }).toList();
     final defaultShortcutNoteType = NoteType.defaultShortcutType;
 
+    final useParagraphsSpacing = PreferenceKey.useParagraphsSpacing.getPreferenceOrDefault();
+
     return Scaffold(
       appBar: TopNavigation(
         key: Keys.appBarSettingsMainSubpage,
@@ -91,16 +98,14 @@ class _SettingsNotesTypesPageState extends ConsumerState<SettingsNotesTypesPage>
                 ],
               ),
               SettingSection(
-                title: l.settings_section_per_type_settings,
+                title: NoteType.richText.title,
                 tiles: [
-                  SettingActionTile(
-                    icon: NoteType.richText.icon,
-                    title: NoteType.richText.title,
-                    description: l.settings_page_rich_text_notes_description,
-                    onTap: () => NavigationRoute.settingsNotesTypesRichText.push(
-                      context,
-                      SettingsNotesTypesRichTextPage(),
-                    ),
+                  SettingSwitchTile(
+                    icon: Icons.format_line_spacing,
+                    title: l.settings_use_paragraph_spacing,
+                    description: l.settings_use_paragraph_spacing_description,
+                    toggled: useParagraphsSpacing,
+                    onChanged: _toggleUseParagraphSpacing,
                   ),
                 ],
               ),

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