FlattenedNotesFolder: Make title non optional

Also translate the title string.
This commit is contained in:
Vishesh Handa
2020-09-13 20:51:04 +02:00
parent da459c65e3
commit a599be89fe
5 changed files with 17 additions and 8 deletions

View File

@ -159,6 +159,8 @@ actions:
newJournal: New Journal Entry
newChecklist: New Checklist
screens:
home:
allNotes: All Notes
folders:
title: Folders
selected: Folder Selected

View File

@ -1,3 +1,5 @@
import 'package:meta/meta.dart';
import 'package:gitjournal/core/note.dart';
import 'package:gitjournal/core/notes_folder.dart';
import 'package:gitjournal/core/notes_folder_notifier.dart';
@ -12,7 +14,8 @@ class FlattenedNotesFolder with NotesFolderNotifier implements NotesFolder {
var _notes = <Note>[];
var _folders = <NotesFolder>[];
FlattenedNotesFolder(this._parentFolder, {this.filter, this.title = ""}) {
FlattenedNotesFolder(this._parentFolder,
{@required this.title, this.filter}) {
_addFolder(_parentFolder);
}
@ -130,10 +133,10 @@ class FlattenedNotesFolder with NotesFolderNotifier implements NotesFolder {
}
@override
String get name => title.isEmpty ? "All Notes" : title;
String get name => title;
@override
String get publicName => title.isEmpty ? "All Notes" : title;
String get publicName => title;
@override
NotesFolderConfig get config {

View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:provider/provider.dart';
@ -29,7 +30,10 @@ class _HomeScreenState extends State<HomeScreen> {
final rootFolder = Provider.of<NotesFolderFS>(context);
setState(() {
notesFolder = FlattenedNotesFolder(rootFolder);
notesFolder = FlattenedNotesFolder(
rootFolder,
title: tr('screens.home.allNotes'),
);
});
}

View File

@ -33,7 +33,7 @@ void main() {
});
test('Should load all the notes flattened', () async {
var f = FlattenedNotesFolder(rootFolder);
var f = FlattenedNotesFolder(rootFolder, title: "");
expect(f.notes.length, 300);
var tempDir = await Directory.systemTemp.createTemp('_test_');

View File

@ -85,10 +85,10 @@ void main() {
});
test('Should load the notes flattened', () async {
var f = FlattenedNotesFolder(rootFolder);
var f = FlattenedNotesFolder(rootFolder, title: "foo");
expect(f.hasNotes, true);
expect(f.isEmpty, false);
expect(f.name, "All Notes");
expect(f.name, "foo");
expect(f.subFolders.length, 0);
expect(f.notes.length, 9);
@ -107,7 +107,7 @@ void main() {
});
test('Should add a note properly', () async {
var f = FlattenedNotesFolder(rootFolder);
var f = FlattenedNotesFolder(rootFolder, title: "");
var p1 = (f.fsFolder as NotesFolderFS).getFolderWithSpec("sub1/p1");
var note = Note(p1, p.join(p1.folderPath, "new.md"));