mirror of
https://github.com/GitJournal/GitJournal.git
synced 2025-06-27 09:06:43 +08:00
FlattenedNotesFolder: Make title non optional
Also translate the title string.
This commit is contained in:
@ -159,6 +159,8 @@ actions:
|
|||||||
newJournal: New Journal Entry
|
newJournal: New Journal Entry
|
||||||
newChecklist: New Checklist
|
newChecklist: New Checklist
|
||||||
screens:
|
screens:
|
||||||
|
home:
|
||||||
|
allNotes: All Notes
|
||||||
folders:
|
folders:
|
||||||
title: Folders
|
title: Folders
|
||||||
selected: Folder Selected
|
selected: Folder Selected
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import 'package:meta/meta.dart';
|
||||||
|
|
||||||
import 'package:gitjournal/core/note.dart';
|
import 'package:gitjournal/core/note.dart';
|
||||||
import 'package:gitjournal/core/notes_folder.dart';
|
import 'package:gitjournal/core/notes_folder.dart';
|
||||||
import 'package:gitjournal/core/notes_folder_notifier.dart';
|
import 'package:gitjournal/core/notes_folder_notifier.dart';
|
||||||
@ -12,7 +14,8 @@ class FlattenedNotesFolder with NotesFolderNotifier implements NotesFolder {
|
|||||||
var _notes = <Note>[];
|
var _notes = <Note>[];
|
||||||
var _folders = <NotesFolder>[];
|
var _folders = <NotesFolder>[];
|
||||||
|
|
||||||
FlattenedNotesFolder(this._parentFolder, {this.filter, this.title = ""}) {
|
FlattenedNotesFolder(this._parentFolder,
|
||||||
|
{@required this.title, this.filter}) {
|
||||||
_addFolder(_parentFolder);
|
_addFolder(_parentFolder);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,10 +133,10 @@ class FlattenedNotesFolder with NotesFolderNotifier implements NotesFolder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get name => title.isEmpty ? "All Notes" : title;
|
String get name => title;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get publicName => title.isEmpty ? "All Notes" : title;
|
String get publicName => title;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
NotesFolderConfig get config {
|
NotesFolderConfig get config {
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:intl/date_symbol_data_local.dart';
|
import 'package:intl/date_symbol_data_local.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
@ -29,7 +30,10 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
|
|
||||||
final rootFolder = Provider.of<NotesFolderFS>(context);
|
final rootFolder = Provider.of<NotesFolderFS>(context);
|
||||||
setState(() {
|
setState(() {
|
||||||
notesFolder = FlattenedNotesFolder(rootFolder);
|
notesFolder = FlattenedNotesFolder(
|
||||||
|
rootFolder,
|
||||||
|
title: tr('screens.home.allNotes'),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ void main() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Should load all the notes flattened', () async {
|
test('Should load all the notes flattened', () async {
|
||||||
var f = FlattenedNotesFolder(rootFolder);
|
var f = FlattenedNotesFolder(rootFolder, title: "");
|
||||||
expect(f.notes.length, 300);
|
expect(f.notes.length, 300);
|
||||||
|
|
||||||
var tempDir = await Directory.systemTemp.createTemp('_test_');
|
var tempDir = await Directory.systemTemp.createTemp('_test_');
|
||||||
|
@ -85,10 +85,10 @@ void main() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Should load the notes flattened', () async {
|
test('Should load the notes flattened', () async {
|
||||||
var f = FlattenedNotesFolder(rootFolder);
|
var f = FlattenedNotesFolder(rootFolder, title: "foo");
|
||||||
expect(f.hasNotes, true);
|
expect(f.hasNotes, true);
|
||||||
expect(f.isEmpty, false);
|
expect(f.isEmpty, false);
|
||||||
expect(f.name, "All Notes");
|
expect(f.name, "foo");
|
||||||
expect(f.subFolders.length, 0);
|
expect(f.subFolders.length, 0);
|
||||||
expect(f.notes.length, 9);
|
expect(f.notes.length, 9);
|
||||||
|
|
||||||
@ -107,7 +107,7 @@ void main() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test('Should add a note properly', () async {
|
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 p1 = (f.fsFolder as NotesFolderFS).getFolderWithSpec("sub1/p1");
|
||||||
var note = Note(p1, p.join(p1.folderPath, "new.md"));
|
var note = Note(p1, p.join(p1.folderPath, "new.md"));
|
||||||
|
Reference in New Issue
Block a user