1
0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-07-08 00:45:13 +08:00

Editors: Rename autofocus to isNewNote

It's more descriptive, and lets each edit decide how it wants to handle
new notes vs existing.
This commit is contained in:
Vishesh Handa
2020-04-25 21:33:42 +02:00
parent a0247e7c9e
commit bc32e5bbb3
5 changed files with 20 additions and 21 deletions

@ -24,7 +24,7 @@ class ChecklistEditor extends StatefulWidget implements Editor {
@override
final NoteCallback discardChangesSelected;
final bool autofocusOnEditor;
final bool isNewNote;
ChecklistEditor({
Key key,
@ -35,7 +35,7 @@ class ChecklistEditor extends StatefulWidget implements Editor {
@required this.renameNoteSelected,
@required this.moveNoteToFolderSelected,
@required this.discardChangesSelected,
@required this.autofocusOnEditor,
@required this.isNewNote,
}) : super(key: key);
@override
@ -79,8 +79,7 @@ class ChecklistEditorState extends State<ChecklistEditor>
var itemTiles = <Widget>[];
for (var i = 0; i < checklist.items.length; i++) {
var item = checklist.items[i];
var autofocus =
widget.autofocusOnEditor && (i == checklist.items.length - 1);
var autofocus = widget.isNewNote && (i == checklist.items.length - 1);
itemTiles.add(_buildTile(item, i, autofocus));
}
itemTiles.add(AddItemButton(
@ -144,7 +143,7 @@ class ChecklistEditorState extends State<ChecklistEditor>
key: UniqueKey(),
item: item,
focusNode: focusNodes[item],
autofocus: autofocus,
isNewNote: autofocus,
statusChanged: (bool newVal) {
setState(() {
item.checked = newVal;
@ -208,7 +207,7 @@ class ChecklistItemTile extends StatefulWidget {
final Function itemRemoved;
final Function itemFinished;
final FocusNode focusNode;
final bool autofocus;
final bool isNewNote;
ChecklistItemTile({
Key key,
@ -218,7 +217,7 @@ class ChecklistItemTile extends StatefulWidget {
@required this.itemRemoved,
@required this.itemFinished,
@required this.focusNode,
this.autofocus = false,
this.isNewNote = false,
}) : super(key: key);
@override
@ -263,7 +262,7 @@ class _ChecklistItemTileState extends State<ChecklistItemTile> {
}
var editor = TextField(
autofocus: widget.autofocus,
autofocus: widget.isNewNote,
focusNode: widget.focusNode,
keyboardType: TextInputType.text,
maxLines: null,

@ -20,7 +20,7 @@ class JournalEditor extends StatefulWidget implements Editor {
@override
final NoteCallback discardChangesSelected;
final bool autofocusOnEditor;
final bool isNewNote;
JournalEditor({
Key key,
@ -31,7 +31,7 @@ class JournalEditor extends StatefulWidget implements Editor {
@required this.renameNoteSelected,
@required this.moveNoteToFolderSelected,
@required this.discardChangesSelected,
this.autofocusOnEditor = false,
this.isNewNote = false,
}) : super(key: key);
@override
@ -64,7 +64,7 @@ class JournalEditorState extends State<JournalEditor> implements EditorState {
JournalEditorHeader(note),
_NoteBodyEditor(
_textController,
autofocus: widget.autofocusOnEditor,
autofocus: widget.isNewNote,
),
],
),

@ -22,7 +22,7 @@ class MarkdownEditor extends StatefulWidget implements Editor {
@override
final NoteCallback discardChangesSelected;
final bool autofocusOnEditor;
final bool isNewNote;
MarkdownEditor({
Key key,
@ -33,7 +33,7 @@ class MarkdownEditor extends StatefulWidget implements Editor {
@required this.renameNoteSelected,
@required this.moveNoteToFolderSelected,
@required this.discardChangesSelected,
@required this.autofocusOnEditor,
@required this.isNewNote,
}) : super(key: key);
@override
@ -74,7 +74,7 @@ class MarkdownEditorState extends State<MarkdownEditor> implements EditorState {
if (note.canHaveMetadata) NoteTitleEditor(_titleTextController),
_NoteBodyEditor(
_textController,
autofocus: widget.autofocusOnEditor,
autofocus: widget.isNewNote,
),
],
),

@ -20,7 +20,7 @@ class RawEditor extends StatefulWidget implements Editor {
@override
final NoteCallback discardChangesSelected;
final bool autofocusOnEditor;
final bool isNewNote;
RawEditor({
Key key,
@ -31,7 +31,7 @@ class RawEditor extends StatefulWidget implements Editor {
@required this.renameNoteSelected,
@required this.moveNoteToFolderSelected,
@required this.discardChangesSelected,
@required this.autofocusOnEditor,
@required this.isNewNote,
}) : super(key: key);
@override
@ -63,7 +63,7 @@ class RawEditorState extends State<RawEditor> implements EditorState {
child: SingleChildScrollView(
child: _NoteEditor(
_textController,
autofocus: widget.autofocusOnEditor,
autofocus: widget.isNewNote,
),
),
);

@ -102,7 +102,7 @@ class NoteEditorState extends State<NoteEditor> {
renameNoteSelected: _renameNoteSelected,
moveNoteToFolderSelected: _moveNoteToFolderSelected,
discardChangesSelected: _discardChangesSelected,
autofocusOnEditor: _isNewNote,
isNewNote: _isNewNote,
);
case EditorType.Raw:
return RawEditor(
@ -114,7 +114,7 @@ class NoteEditorState extends State<NoteEditor> {
renameNoteSelected: _renameNoteSelected,
moveNoteToFolderSelected: _moveNoteToFolderSelected,
discardChangesSelected: _discardChangesSelected,
autofocusOnEditor: _isNewNote,
isNewNote: _isNewNote,
);
case EditorType.Checklist:
return ChecklistEditor(
@ -126,7 +126,7 @@ class NoteEditorState extends State<NoteEditor> {
renameNoteSelected: _renameNoteSelected,
moveNoteToFolderSelected: _moveNoteToFolderSelected,
discardChangesSelected: _discardChangesSelected,
autofocusOnEditor: _isNewNote,
isNewNote: _isNewNote,
);
case EditorType.Journal:
return JournalEditor(
@ -138,7 +138,7 @@ class NoteEditorState extends State<NoteEditor> {
renameNoteSelected: _renameNoteSelected,
moveNoteToFolderSelected: _moveNoteToFolderSelected,
discardChangesSelected: _discardChangesSelected,
autofocusOnEditor: _isNewNote,
isNewNote: _isNewNote,
);
}
return null;