flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-08-26 21:00:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify code

Browse Source
This commit is contained in:
Vishesh Handa
2020-02-06 01:46:46 +01:00
parent 1c8c17fb47
commit 4bfd04fa2d
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/screens/journal_listing.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:fimber/fimber.dart';
import 'package:gitjournal/core/note.dart';
import 'package:gitjournal/core/notes_folder.dart';
import 'package:gitjournal/screens/note_editor.dart';
import 'package:gitjournal/state_container.dart';
@ -74,8 +75,7 @@ class JournalListingScreen extends StatelessWidget {
return JournalList(
folder: folder,
notes: folder.notes,
noteSelectedFunction: (noteIndex) async {
var note = folder.notes[noteIndex];
noteSelectedFunction: (Note note) async {
var route = MaterialPageRoute(
builder: (context) => NoteEditor.fromNote(note),
);

14
lib/widgets/journal_list.dart
View File

@ -8,7 +8,7 @@ import 'package:gitjournal/utils.dart';
import 'package:gitjournal/utils/markdown.dart';
import 'package:gitjournal/widgets/icon_dismissable.dart';
typedef void NoteSelectedFunction(int noteIndex);
typedef void NoteSelectedFunction(Note note);
class JournalList extends StatefulWidget {
final NoteSelectedFunction noteSelectedFunction;
@ -65,7 +65,7 @@ class _JournalListState extends State<JournalList> {
_listKey.currentState.removeItem(index, (context, animation) {
var i = deletedViaDismissed.indexWhere((path) => path == note.filePath);
if (i == -1) {
return _buildItem(context, 0, animation);
return _buildNote(context, note, animation);
} else {
deletedViaDismissed.removeAt(i);
return Container();
@ -98,16 +98,16 @@ class _JournalListState extends State<JournalList> {
Widget _buildItem(BuildContext context, int i, Animation<double> animation) {
var note = widget.notes[i];
return _buildNote(context, note, i, animation);
return _buildNote(context, note, animation);
}
Widget _buildNote(
BuildContext context, Note note, int i, Animation<double> animation) {
BuildContext context, Note note, Animation<double> animation) {
var viewItem = IconDismissable(
key: ValueKey("JournalList_" + note.filePath),
child: Hero(
tag: note.filePath,
child: _buildRow(context, note, i),
child: _buildRow(context, note),
flightShuttleBuilder: (BuildContext flightContext,
Animation<double> animation,
HeroFlightDirection flightDirection,
@ -136,7 +136,7 @@ class _JournalListState extends State<JournalList> {
);
}
Widget _buildRow(BuildContext context, Note note, int noteIndex) {
Widget _buildRow(BuildContext context, Note note) {
var textTheme = Theme.of(context).textTheme;
var title = note.title;
Widget titleWidget = Text(title, style: textTheme.title);
@ -183,7 +183,7 @@ class _JournalListState extends State<JournalList> {
children: children,
crossAxisAlignment: CrossAxisAlignment.start,
),
onTap: () => widget.noteSelectedFunction(noteIndex),
onTap: () => widget.noteSelectedFunction(note),
);
var dc = Theme.of(context).dividerColor;

3
lib/widgets/note_search_delegate.dart
View File

@ -67,8 +67,7 @@ class NoteSearchDelegate extends SearchDelegate<Note> {
Widget journalList = JournalList(
notes: filteredNotes,
folder: null,
noteSelectedFunction: (noteIndex) async {
var note = filteredNotes[noteIndex];
noteSelectedFunction: (Note note) async {
var route = MaterialPageRoute(
builder: (context) => NoteEditor.fromNote(note),
);