diff --git a/lib/state_container.dart b/lib/state_container.dart index b50e40f7..b612f8f6 100644 --- a/lib/state_container.dart +++ b/lib/state_container.dart @@ -10,7 +10,6 @@ import 'package:journal/appstate.dart'; import 'package:journal/note.dart'; import 'package:journal/note_fileName.dart'; import 'package:journal/storage/git_storage.dart'; -import 'package:journal/storage/notes_repository.dart'; import 'package:path/path.dart' as p; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/lib/storage/git_storage.dart b/lib/storage/git_storage.dart index 800a0ae9..872b4f8d 100644 --- a/lib/storage/git_storage.dart +++ b/lib/storage/git_storage.dart @@ -6,10 +6,19 @@ import 'package:flutter/foundation.dart'; import 'package:journal/apis/git.dart'; import 'package:journal/note.dart'; import 'package:journal/settings.dart'; -import 'package:journal/storage/notes_repository.dart'; import 'package:path/path.dart' as p; -class GitNoteRepository implements NoteRepository { +class NoteRepoResult { + bool error; + String noteFilePath; + + NoteRepoResult({ + @required this.error, + this.noteFilePath, + }); +} + +class GitNoteRepository { final String dirName; final String subDirName; final String baseDirectory; @@ -33,7 +42,6 @@ class GitNoteRepository implements NoteRepository { notesBasePath = p.join(baseDirectory, dirName, subDirName); } - @override Future addNote(Note note) async { return _addNote(note, "Added Journal Entry"); } @@ -48,7 +56,6 @@ class GitNoteRepository implements NoteRepository { return NoteRepoResult(noteFilePath: note.filePath, error: false); } - @override Future removeNote(Note note) async { var gitDir = p.join(baseDirectory, dirName); var pathSpec = note.filePath.replaceFirst(gitDir, "").substring(1); @@ -67,12 +74,10 @@ class GitNoteRepository implements NoteRepository { return NoteRepoResult(error: false); } - @override Future updateNote(Note note) async { return _addNote(note, "Edited Journal Entry"); } - @override Future> listNotes() async { final dir = Directory(notesBasePath); @@ -91,7 +96,6 @@ class GitNoteRepository implements NoteRepository { return notes; } - @override Future sync() async { try { await _gitRepo.pull(); diff --git a/lib/storage/notes_repository.dart b/lib/storage/notes_repository.dart deleted file mode 100644 index 9acc2765..00000000 --- a/lib/storage/notes_repository.dart +++ /dev/null @@ -1,25 +0,0 @@ -import 'dart:async'; - -import 'package:flutter/foundation.dart'; -import 'package:journal/note.dart'; - -class NoteRepoResult { - bool error; - String noteFilePath; - - NoteRepoResult({ - @required this.error, - this.noteFilePath, - }); -} - -abstract class NoteRepository { - // TODO: Better error message! - Future sync(); - - Future addNote(Note note); - Future updateNote(Note note); - Future removeNote(Note note); - - Future> listNotes(); -}