flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-28 18:03:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

FolderView: Refactor NewNoteNavBar into its own widget

Browse Source
This commit is contained in:
Vishesh Handa
2020-07-31 20:47:18 +02:00
parent b85f9028fe
commit 8e8c11c5ef
4 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/main_graph.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:touchable/touchable.dart';
class MyExampleWidget extends StatefulWidget {

41
lib/screens/folder_view.dart
View File

@ -1,10 +1,9 @@
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:git_bindings/git_bindings.dart';
import 'package:gitjournal/core/note.dart';
import 'package:provider/provider.dart';
import 'package:gitjournal/core/note.dart';
import 'package:gitjournal/core/notes_folder.dart';
import 'package:gitjournal/core/notes_folder_fs.dart';
import 'package:gitjournal/core/sorted_notes_folder.dart';
@ -18,6 +17,7 @@ import 'package:gitjournal/state_container.dart';
import 'package:gitjournal/utils.dart';
import 'package:gitjournal/widgets/app_bar_menu_button.dart';
import 'package:gitjournal/widgets/app_drawer.dart';
import 'package:gitjournal/widgets/new_note_nav_bar.dart';
import 'package:gitjournal/widgets/note_search_delegate.dart';
import 'package:gitjournal/widgets/sync_button.dart';
@ -68,8 +68,7 @@ class _FolderViewState extends State<FolderView> {
Widget build(BuildContext context) {
var createButton = FloatingActionButton(
key: const ValueKey("FAB"),
onPressed: () =>
_newPost(context, widget.notesFolder.config.defaultEditor),
onPressed: () => _newPost(widget.notesFolder.config.defaultEditor),
child: const Icon(Icons.add),
);
@ -148,37 +147,7 @@ class _FolderViewState extends State<FolderView> {
drawer: AppDrawer(),
floatingActionButton: createButton,
floatingActionButtonLocation: FloatingActionButtonLocation.endDocked,
bottomNavigationBar: BottomAppBar(
color: Theme.of(context).bottomAppBarColor,
shape: const CircularNotchedRectangle(),
child: Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(4.0),
child: IconButton(
icon: const FaIcon(FontAwesomeIcons.tasks),
onPressed: () => _newPost(context, EditorType.Checklist),
),
),
Padding(
padding: const EdgeInsets.all(4.0),
child: IconButton(
icon: const FaIcon(FontAwesomeIcons.markdown),
onPressed: () => _newPost(context, EditorType.Markdown),
),
),
Padding(
padding: const EdgeInsets.all(4.0),
child: IconButton(
icon: const FaIcon(FontAwesomeIcons.book),
onPressed: () => _newPost(context, EditorType.Journal),
),
),
],
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
),
),
bottomNavigationBar: NewNoteNavBar(onPressed: _newPost),
);
}
@ -193,7 +162,7 @@ class _FolderViewState extends State<FolderView> {
}
}
void _newPost(BuildContext context, EditorType editorType) async {
void _newPost(EditorType editorType) async {
var folder = widget.notesFolder;
NotesFolderFS fsFolder = folder.fsFolder;
var isVirtualFolder = folder.name != folder.fsFolder.name;

2
lib/screens/settings_note_metadata.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:gitjournal/core/md_yaml_doc.dart';
import 'package:gitjournal/core/md_yaml_doc.dart';
import 'package:gitjournal/core/md_yaml_doc_codec.dart';
import 'package:gitjournal/core/note.dart';
import 'package:gitjournal/core/note_serializer.dart';

47
lib/widgets/new_note_nav_bar.dart Normal file
View File

@ -0,0 +1,47 @@
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:function_types/function_types.dart';
import 'package:gitjournal/screens/note_editor.dart';
class NewNoteNavBar extends StatelessWidget {
final Func1<EditorType, void> onPressed;
NewNoteNavBar({@required this.onPressed});
@override
Widget build(BuildContext context) {
return BottomAppBar(
color: Theme.of(context).bottomAppBarColor,
shape: const CircularNotchedRectangle(),
child: Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.all(4.0),
child: IconButton(
icon: const FaIcon(FontAwesomeIcons.tasks),
onPressed: () => onPressed(EditorType.Checklist),
),
),
Padding(
padding: const EdgeInsets.all(4.0),
child: IconButton(
icon: const FaIcon(FontAwesomeIcons.markdown),
onPressed: () => onPressed(EditorType.Markdown),
),
),
Padding(
padding: const EdgeInsets.all(4.0),
child: IconButton(
icon: const FaIcon(FontAwesomeIcons.book),
onPressed: () => onPressed(EditorType.Journal),
),
),
],
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
),
);
}
}