mirror of
https://github.com/GitJournal/GitJournal.git
synced 2025-06-28 18:03:14 +08:00
Renamed NoteEditor -> JournalEditor
This commit is contained in:
@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:gitjournal/note.dart';
|
import 'package:gitjournal/note.dart';
|
||||||
import 'package:gitjournal/utils.dart';
|
import 'package:gitjournal/utils.dart';
|
||||||
import 'package:gitjournal/apis/git.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/screens/journal_browsing.dart';
|
||||||
import 'package:gitjournal/state_container.dart';
|
import 'package:gitjournal/state_container.dart';
|
||||||
import 'package:gitjournal/widgets/app_drawer.dart';
|
import 'package:gitjournal/widgets/app_drawer.dart';
|
||||||
@ -83,7 +83,7 @@ class HomeScreen extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _newPost(BuildContext context) {
|
void _newPost(BuildContext context) {
|
||||||
var route = MaterialPageRoute(builder: (context) => NoteEditor());
|
var route = MaterialPageRoute(builder: (context) => JournalEditor());
|
||||||
Navigator.of(context).push(route);
|
Navigator.of(context).push(route);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -6,10 +6,10 @@ import 'package:gitjournal/note.dart';
|
|||||||
import 'package:gitjournal/state_container.dart';
|
import 'package:gitjournal/state_container.dart';
|
||||||
import 'package:gitjournal/utils.dart';
|
import 'package:gitjournal/utils.dart';
|
||||||
import 'package:gitjournal/settings.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 'package:share/share.dart';
|
||||||
|
|
||||||
import 'note_editor.dart';
|
import 'journal_editor.dart';
|
||||||
|
|
||||||
class JournalBrowsingScreen extends StatefulWidget {
|
class JournalBrowsingScreen extends StatefulWidget {
|
||||||
final List<Note> notes;
|
final List<Note> notes;
|
||||||
@ -72,7 +72,7 @@ class JournalBrowsingScreenState extends State<JournalBrowsingScreen> {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
var route = MaterialPageRoute(builder: (context) {
|
var route = MaterialPageRoute(builder: (context) {
|
||||||
Note note = widget.notes[_currentIndex()];
|
Note note = widget.notes[_currentIndex()];
|
||||||
return NoteEditor.fromNote(note);
|
return JournalEditor.fromNote(note);
|
||||||
});
|
});
|
||||||
Navigator.of(context).push(route);
|
Navigator.of(context).push(route);
|
||||||
},
|
},
|
||||||
@ -137,7 +137,7 @@ class NoteViewer extends StatelessWidget {
|
|||||||
var view = SingleChildScrollView(
|
var view = SingleChildScrollView(
|
||||||
child: Column(
|
child: Column(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
note.hasValidDate() ? NoteHeader(note) : Container(),
|
note.hasValidDate() ? JournalEditorHeader(note) : Container(),
|
||||||
MarkdownBody(
|
MarkdownBody(
|
||||||
data: note.body,
|
data: note.body,
|
||||||
styleSheet: MarkdownStyleSheet.fromTheme(theme),
|
styleSheet: MarkdownStyleSheet.fromTheme(theme),
|
||||||
|
@ -1,39 +1,39 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:gitjournal/note.dart';
|
import 'package:gitjournal/note.dart';
|
||||||
import 'package:gitjournal/state_container.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';
|
import 'package:gitjournal/storage/serializers.dart';
|
||||||
|
|
||||||
enum NoteEditorDropDownChoices { Discard, SwitchEditor }
|
enum NoteEditorDropDownChoices { Discard, SwitchEditor }
|
||||||
|
|
||||||
class NoteEditor extends StatefulWidget {
|
class JournalEditor extends StatefulWidget {
|
||||||
final Note note;
|
final Note note;
|
||||||
|
|
||||||
NoteEditor() : note = null;
|
JournalEditor() : note = null;
|
||||||
NoteEditor.fromNote(this.note);
|
JournalEditor.fromNote(this.note);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
NoteEditorState createState() {
|
JournalEditorState createState() {
|
||||||
if (note == null) {
|
if (note == null) {
|
||||||
return NoteEditorState();
|
return JournalEditorState();
|
||||||
} else {
|
} else {
|
||||||
return NoteEditorState.fromNote(note);
|
return JournalEditorState.fromNote(note);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class NoteEditorState extends State<NoteEditor> {
|
class JournalEditorState extends State<JournalEditor> {
|
||||||
Note note = Note();
|
Note note = Note();
|
||||||
final bool newNote;
|
final bool newNote;
|
||||||
TextEditingController _textController = TextEditingController();
|
TextEditingController _textController = TextEditingController();
|
||||||
bool rawEditor = false;
|
bool rawEditor = false;
|
||||||
final serializer = MarkdownYAMLSerializer();
|
final serializer = MarkdownYAMLSerializer();
|
||||||
|
|
||||||
NoteEditorState() : newNote = true {
|
JournalEditorState() : newNote = true {
|
||||||
note.created = DateTime.now();
|
note.created = DateTime.now();
|
||||||
}
|
}
|
||||||
|
|
||||||
NoteEditorState.fromNote(this.note) : newNote = false {
|
JournalEditorState.fromNote(this.note) : newNote = false {
|
||||||
_textController = TextEditingController(text: note.body);
|
_textController = TextEditingController(text: note.body);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ class NoteEditorState extends State<NoteEditor> {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
Widget editor = Column(
|
Widget editor = Column(
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
NoteHeader(note),
|
JournalEditorHeader(note),
|
||||||
NoteMarkdownEditor(_textController, false),
|
NoteMarkdownEditor(_textController, false),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@ -102,7 +102,9 @@ class NoteEditorState extends State<NoteEditor> {
|
|||||||
),
|
),
|
||||||
PopupMenuItem<NoteEditorDropDownChoices>(
|
PopupMenuItem<NoteEditorDropDownChoices>(
|
||||||
value: NoteEditorDropDownChoices.SwitchEditor,
|
value: NoteEditorDropDownChoices.SwitchEditor,
|
||||||
child: rawEditor ? const Text('Rich Editor') : const Text('Raw Editor'),
|
child: rawEditor
|
||||||
|
? const Text('Rich Editor')
|
||||||
|
: const Text('Raw Editor'),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
@ -2,10 +2,10 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
import 'package:gitjournal/note.dart';
|
import 'package:gitjournal/note.dart';
|
||||||
|
|
||||||
class NoteHeader extends StatelessWidget {
|
class JournalEditorHeader extends StatelessWidget {
|
||||||
final Note note;
|
final Note note;
|
||||||
|
|
||||||
NoteHeader(this.note);
|
JournalEditorHeader(this.note);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
Reference in New Issue
Block a user