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

NoteEditor: Improve modified check

Browse Source 
If the only modification is the addition of a 'modified' tag, then we
shouldn't count it as modified.

I'm not too fond of this logic.
This commit is contained in:
Vishesh Handa
2020-02-09 17:33:19 +01:00
parent 49192026a7
commit 20f8d7f7fe
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/note.dart
View File

@ -24,7 +24,7 @@ class Note with ChangeNotifier implements Comparable<Note> {
DateTime _created;
DateTime _modified;
NoteData _data = NoteData();
NoteSerializer _noteSerializer = NoteSerializer();
NoteSerializer noteSerializer = NoteSerializer();
DateTime _fileLastModified;
@ -88,13 +88,13 @@ class Note with ChangeNotifier implements Comparable<Note> {
}
NoteData get data {
_noteSerializer.encode(this, _data);
noteSerializer.encode(this, _data);
return _data;
}
set data(NoteData data) {
_data = data;
_noteSerializer.decode(_data, this);
noteSerializer.decode(_data, this);
notifyListeners();
}

5
lib/core/note_data.dart
View File

@ -10,6 +10,11 @@ class NoteData {
props = props ?? LinkedHashMap<String, dynamic>();
}
NoteData.from(NoteData other) {
body = String.fromCharCodes(other.body.codeUnits);
props = LinkedHashMap<String, dynamic>.from(other.props);
}
@override
int get hashCode => body.hashCode ^ props.hashCode;

24
lib/screens/note_editor.dart
View File

@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'package:gitjournal/core/note.dart';
import 'package:gitjournal/core/note_data.dart';
import 'package:gitjournal/core/notes_folder.dart';
import 'package:gitjournal/editors/markdown_editor.dart';
import 'package:gitjournal/editors/raw_editor.dart';
import 'package:gitjournal/editors/todo_editor.dart';
import 'package:gitjournal/state_container.dart';
import 'package:gitjournal/core/note_data_serializers.dart';
import 'package:gitjournal/widgets/folder_selection_dialog.dart';
import 'package:gitjournal/widgets/rename_dialog.dart';
@ -36,7 +36,7 @@ enum EditorType { Markdown, Raw, Todo }
class NoteEditorState extends State<NoteEditor> {
Note note;
EditorType editorType = EditorType.Markdown;
String noteSerialized = "";
NoteData originalNoteData = NoteData();
final _rawEditorKey = GlobalKey<RawEditorState>();
final _markdownEditorKey = GlobalKey<MarkdownEditorState>();
@ -51,8 +51,7 @@ class NoteEditorState extends State<NoteEditor> {
}
NoteEditorState.fromNote(this.note) {
var serializer = MarkdownYAMLSerializer();
noteSerialized = serializer.encode(note.data);
originalNoteData = NoteData.from(note.data);
}
@override
@ -224,14 +223,14 @@ class NoteEditorState extends State<NoteEditor> {
if (_isNewNote) {
return note.title.isNotEmpty || note.body.isNotEmpty;
}
var serializer = MarkdownYAMLSerializer();
var finalNoteSerialized = serializer.encode(note.data);
bool modified = finalNoteSerialized != noteSerialized;
if (modified) {
print("Original Serialization: " + noteSerialized);
print("New Serialization: " + finalNoteSerialized);
if (note.data != originalNoteData) {
var newWithoutModified = NoteData.from(note.data);
newWithoutModified.props.remove(note.noteSerializer.settings.modifiedKey);
return newWithoutModified != originalNoteData;
}
return modified;
return false;
}
void _saveNote(Note note) {
@ -291,8 +290,7 @@ class NoteEditorState extends State<NoteEditor> {
FlatButton(
onPressed: () {
// FIXME: This shouldn't be required. Why is the original note modified?
var serializer = MarkdownYAMLSerializer();
note.data = serializer.decode(noteSerialized);
note.data = originalNoteData;
Navigator.pop(context); // Alert box
Navigator.pop(context); // Note Editor