From abd5f09453279d74d6d062792530267551810248 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Mon, 2 Dec 2019 13:56:38 +0100 Subject: [PATCH] Renamed NoteEditor -> JournalEditor --- lib/screens/home_screen.dart | 4 +-- lib/screens/journal_browsing.dart | 8 +++--- .../{note_editor.dart => journal_editor.dart} | 26 ++++++++++--------- ...header.dart => journal_editor_header.dart} | 4 +-- 4 files changed, 22 insertions(+), 20 deletions(-) rename lib/screens/{note_editor.dart => journal_editor.dart} (89%) rename lib/widgets/{note_header.dart => journal_editor_header.dart} (92%) diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 725c6031..e347aa36 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:gitjournal/note.dart'; import 'package:gitjournal/utils.dart'; import 'package:gitjournal/apis/git.dart'; -import 'package:gitjournal/screens/note_editor.dart'; +import 'package:gitjournal/screens/journal_editor.dart'; import 'package:gitjournal/screens/journal_browsing.dart'; import 'package:gitjournal/state_container.dart'; import 'package:gitjournal/widgets/app_drawer.dart'; @@ -83,7 +83,7 @@ class HomeScreen extends StatelessWidget { } void _newPost(BuildContext context) { - var route = MaterialPageRoute(builder: (context) => NoteEditor()); + var route = MaterialPageRoute(builder: (context) => JournalEditor()); Navigator.of(context).push(route); } } diff --git a/lib/screens/journal_browsing.dart b/lib/screens/journal_browsing.dart index c1a6bd0b..f907c136 100644 --- a/lib/screens/journal_browsing.dart +++ b/lib/screens/journal_browsing.dart @@ -6,10 +6,10 @@ import 'package:gitjournal/note.dart'; import 'package:gitjournal/state_container.dart'; import 'package:gitjournal/utils.dart'; import 'package:gitjournal/settings.dart'; -import 'package:gitjournal/widgets/note_header.dart'; +import 'package:gitjournal/widgets/journal_editor_header.dart'; import 'package:share/share.dart'; -import 'note_editor.dart'; +import 'journal_editor.dart'; class JournalBrowsingScreen extends StatefulWidget { final List notes; @@ -72,7 +72,7 @@ class JournalBrowsingScreenState extends State { onPressed: () { var route = MaterialPageRoute(builder: (context) { Note note = widget.notes[_currentIndex()]; - return NoteEditor.fromNote(note); + return JournalEditor.fromNote(note); }); Navigator.of(context).push(route); }, @@ -137,7 +137,7 @@ class NoteViewer extends StatelessWidget { var view = SingleChildScrollView( child: Column( children: [ - note.hasValidDate() ? NoteHeader(note) : Container(), + note.hasValidDate() ? JournalEditorHeader(note) : Container(), MarkdownBody( data: note.body, styleSheet: MarkdownStyleSheet.fromTheme(theme), diff --git a/lib/screens/note_editor.dart b/lib/screens/journal_editor.dart similarity index 89% rename from lib/screens/note_editor.dart rename to lib/screens/journal_editor.dart index b7b32aab..a8c8f7e1 100644 --- a/lib/screens/note_editor.dart +++ b/lib/screens/journal_editor.dart @@ -1,39 +1,39 @@ import 'package:flutter/material.dart'; import 'package:gitjournal/note.dart'; import 'package:gitjournal/state_container.dart'; -import 'package:gitjournal/widgets/note_header.dart'; +import 'package:gitjournal/widgets/journal_editor_header.dart'; import 'package:gitjournal/storage/serializers.dart'; enum NoteEditorDropDownChoices { Discard, SwitchEditor } -class NoteEditor extends StatefulWidget { +class JournalEditor extends StatefulWidget { final Note note; - NoteEditor() : note = null; - NoteEditor.fromNote(this.note); + JournalEditor() : note = null; + JournalEditor.fromNote(this.note); @override - NoteEditorState createState() { + JournalEditorState createState() { if (note == null) { - return NoteEditorState(); + return JournalEditorState(); } else { - return NoteEditorState.fromNote(note); + return JournalEditorState.fromNote(note); } } } -class NoteEditorState extends State { +class JournalEditorState extends State { Note note = Note(); final bool newNote; TextEditingController _textController = TextEditingController(); bool rawEditor = false; final serializer = MarkdownYAMLSerializer(); - NoteEditorState() : newNote = true { + JournalEditorState() : newNote = true { note.created = DateTime.now(); } - NoteEditorState.fromNote(this.note) : newNote = false { + JournalEditorState.fromNote(this.note) : newNote = false { _textController = TextEditingController(text: note.body); } @@ -47,7 +47,7 @@ class NoteEditorState extends State { Widget build(BuildContext context) { Widget editor = Column( children: [ - NoteHeader(note), + JournalEditorHeader(note), NoteMarkdownEditor(_textController, false), ], ); @@ -102,7 +102,9 @@ class NoteEditorState extends State { ), PopupMenuItem( value: NoteEditorDropDownChoices.SwitchEditor, - child: rawEditor ? const Text('Rich Editor') : const Text('Raw Editor'), + child: rawEditor + ? const Text('Rich Editor') + : const Text('Raw Editor'), ), ], ), diff --git a/lib/widgets/note_header.dart b/lib/widgets/journal_editor_header.dart similarity index 92% rename from lib/widgets/note_header.dart rename to lib/widgets/journal_editor_header.dart index 6038252a..9bc986f8 100644 --- a/lib/widgets/note_header.dart +++ b/lib/widgets/journal_editor_header.dart @@ -2,10 +2,10 @@ import 'package:flutter/material.dart'; import 'package:intl/intl.dart'; import 'package:gitjournal/note.dart'; -class NoteHeader extends StatelessWidget { +class JournalEditorHeader extends StatelessWidget { final Note note; - NoteHeader(this.note); + JournalEditorHeader(this.note); @override Widget build(BuildContext context) {