Editors: Do not use BottomAppBar in the scaffold property

The BottomAppBar when given in the Scaffold gets hidden when the
keyboard is visible. We had hacked around that by translating its
position, however that resulted in the cursor at the bottom being hidden
when we were typing a long note.

It is not just part of the body of the scaffold.

Also converted many functions into widgets.

lib/editors/checklist_editor.dart

@@ -152,18 +152,17 @@ class ChecklistEditorState extends State<ChecklistEditor>
       child: NoteTitleEditor(_titleTextController, _noteTextChanged),
     );
 
-    return Scaffold(
+    return EditorScaffold(
-      appBar: buildEditorAppBar(widget, this, noteModified: _noteModified),
+      editor: widget,
+      editorState: this,
+      noteModified: _noteModified,
+      parentFolder: widget.note.parent,
       body: Column(
         children: <Widget>[
           if (widget.note.canHaveMetadata) titleEditor,
           Expanded(child: FocusScope(child: checklistWidget)),
         ],
       ),
-      bottomNavigationBar: Builder(
-        builder: (context) =>
-            buildEditorBottonBar(context, widget, this, widget.note.parent),
-      ),
     );
   }
 

lib/editors/common.dart

@@ -26,12 +26,26 @@ abstract class EditorState {
 
 enum DropDownChoices { Rename, DiscardChanges, Share }
 
-AppBar buildEditorAppBar(
+class EditorAppBar extends StatelessWidget implements PreferredSizeWidget {
-  Editor editor,
+  final Editor editor;
-  EditorState editorState, {
+  final EditorState editorState;
-  @required bool noteModified,
+  final bool noteModified;
-  List<IconButton> extraButtons,
+  final IconButton extraButton;
-}) {
+
+  EditorAppBar({
+    Key key,
+    @required this.editor,
+    @required this.editorState,
+    @required this.noteModified,
+    this.extraButton,
+  })  : preferredSize = Size.fromHeight(kToolbarHeight),
+        super(key: key);
+
+  @override
+  final Size preferredSize;
+
+  @override
+  Widget build(BuildContext context) {
     return AppBar(
       leading: IconButton(
         key: const ValueKey("NewEntry"),
@@ -41,7 +55,7 @@ AppBar buildEditorAppBar(
         },
       ),
       actions: <Widget>[
-      ...?extraButtons,
+        if (extraButton != null) extraButton,
         IconButton(
           key: const ValueKey("EditorSelector"),
           icon: const Icon(Icons.library_books),
@@ -94,28 +108,30 @@ AppBar buildEditorAppBar(
         ),
       ],
     );
+  }
 }
 
-Widget buildEditorBottonBar(
+class EditorBottomBar extends StatelessWidget {
-  BuildContext context,
+  final Editor editor;
-  Editor editor,
+  final EditorState editorState;
-  EditorState editorState,
+  final NotesFolderFS parentFolder;
-  NotesFolderFS parentFolder,
+  final bool allowEdits;
-) {
+
+  EditorBottomBar({
+    @required this.editor,
+    @required this.editorState,
+    @required this.parentFolder,
+    @required this.allowEdits,
+  });
+
+  @override
+  Widget build(BuildContext context) {
     var folderName = parentFolder.pathSpec();
     if (folderName.isEmpty) {
       folderName = "Root Folder";
     }
 
-  var s = Scaffold.of(context);
+    var addIcon = IconButton(
-  print("s $s");
-  return StickyBottomAppBar(
-    child: BottomAppBar(
-      elevation: 0.0,
-      color: Theme.of(context).scaffoldBackgroundColor,
-      child: Row(
-        children: <Widget>[
-          IconButton(
       icon: Icon(Icons.add),
       onPressed: () {
         showModalBottomSheet(
@@ -124,6 +140,20 @@ Widget buildEditorBottonBar(
           elevation: 0,
         );
       },
+    );
+
+    return BottomAppBar(
+      elevation: 0.0,
+      color: Theme.of(context).scaffoldBackgroundColor,
+      child: Row(
+        children: <Widget>[
+          Visibility(
+            child: addIcon,
+            visible: allowEdits,
+            maintainSize: true,
+            maintainAnimation: true,
+            maintainState: true,
+            maintainInteractivity: false,
           ),
           Expanded(
             child: FlatButton.icon(
@@ -135,26 +165,18 @@ Widget buildEditorBottonBar(
               },
             ),
           ),
-          const SizedBox(
+          // Just so there is equal padding on the right side
-            height: 32.0,
+          Visibility(
-            width: 32.0,
+            child: addIcon,
+            visible: false,
+            maintainSize: true,
+            maintainAnimation: true,
+            maintainState: true,
+            maintainInteractivity: false,
           ),
         ],
         mainAxisAlignment: MainAxisAlignment.center,
       ),
-    ),
-  );
-}
-
-class StickyBottomAppBar extends StatelessWidget {
-  final BottomAppBar child;
-  StickyBottomAppBar({@required this.child});
-
-  @override
-  Widget build(BuildContext context) {
-    return Transform.translate(
-      offset: Offset(0.0, -1 * MediaQuery.of(context).viewInsets.bottom),
-      child: child,
     );
   }
 }
@@ -208,3 +230,46 @@ Widget _buildAddBottomSheet(
     ),
   );
 }
+
+class EditorScaffold extends StatelessWidget {
+  final Editor editor;
+  final EditorState editorState;
+  final bool noteModified;
+  final IconButton extraButton;
+  final Widget body;
+  final NotesFolderFS parentFolder;
+  final bool allowEdits;
+
+  EditorScaffold({
+    @required this.editor,
+    @required this.editorState,
+    @required this.noteModified,
+    @required this.body,
+    @required this.parentFolder,
+    this.extraButton,
+    this.allowEdits = true,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: EditorAppBar(
+        editor: editor,
+        editorState: editorState,
+        noteModified: noteModified,
+        extraButton: extraButton,
+      ),
+      body: Column(
+        children: <Widget>[
+          Expanded(child: body),
+          EditorBottomBar(
+            editor: editor,
+            editorState: editorState,
+            parentFolder: parentFolder,
+            allowEdits: allowEdits,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/editors/journal_editor.dart

@@ -80,13 +80,12 @@ class JournalEditorState extends State<JournalEditor> implements EditorState {
       ),
     );
 
-    return Scaffold(
+    return EditorScaffold(
-      appBar: buildEditorAppBar(widget, this, noteModified: _noteModified),
+      editor: widget,
+      editorState: this,
+      noteModified: _noteModified,
+      parentFolder: note.parent,
       body: editor,
-      bottomNavigationBar: Builder(
-        builder: (context) =>
-            buildEditorBottonBar(context, widget, this, note.parent),
-      ),
     );
   }
 

lib/editors/markdown_editor.dart

@@ -106,18 +106,14 @@ class MarkdownEditorState extends State<MarkdownEditor> implements EditorState {
       onPressed: _switchMode,
     );
 
-    return Scaffold(
+    return EditorScaffold(
-      appBar: buildEditorAppBar(
+      editor: widget,
-        widget,
+      editorState: this,
-        this,
+      extraButton: extraButton,
       noteModified: _noteModified,
-        extraButtons: [extraButton],
+      parentFolder: note.parent,
-      ),
+      allowEdits: editingMode,
       body: body,
-      bottomNavigationBar: Builder(
-        builder: (context) =>
-            buildEditorBottonBar(context, widget, this, note.parent),
-      ),
     );
   }
 

lib/editors/raw_editor.dart

@@ -77,13 +77,12 @@ class RawEditorState extends State<RawEditor> implements EditorState {
       ),
     );
 
-    return Scaffold(
+    return EditorScaffold(
-      appBar: buildEditorAppBar(widget, this, noteModified: _noteModified),
+      editor: widget,
+      editorState: this,
+      noteModified: _noteModified,
+      parentFolder: note.parent,
       body: editor,
-      bottomNavigationBar: Builder(
-        builder: (context) =>
-            buildEditorBottonBar(context, widget, this, note.parent),
-      ),
     );
   }