mirror of
https://github.com/GitJournal/GitJournal.git
synced 2025-06-30 03:19:11 +08:00
Fix undo not always working
This should hopefully fix it fixes APP-31
This commit is contained in:
@ -6,8 +6,10 @@ import 'package:gitjournal/folder_views/card_view.dart';
|
|||||||
import 'package:gitjournal/folder_views/grid_view.dart';
|
import 'package:gitjournal/folder_views/grid_view.dart';
|
||||||
import 'package:gitjournal/folder_views/journal_view.dart';
|
import 'package:gitjournal/folder_views/journal_view.dart';
|
||||||
import 'package:gitjournal/screens/note_editor.dart';
|
import 'package:gitjournal/screens/note_editor.dart';
|
||||||
|
import 'package:gitjournal/state_container.dart';
|
||||||
import 'package:gitjournal/utils.dart';
|
import 'package:gitjournal/utils.dart';
|
||||||
import 'package:gitjournal/utils/logger.dart';
|
import 'package:gitjournal/utils/logger.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
import 'standard_view.dart';
|
import 'standard_view.dart';
|
||||||
|
|
||||||
@ -70,7 +72,8 @@ void openNoteEditor(BuildContext context, Note note) async {
|
|||||||
if (showUndoSnackBar != null) {
|
if (showUndoSnackBar != null) {
|
||||||
Log.d("Showing an undo snackbar");
|
Log.d("Showing an undo snackbar");
|
||||||
|
|
||||||
var snackBar = buildUndoDeleteSnackbar(context, note);
|
var stateContainer = Provider.of<StateContainer>(context, listen: false);
|
||||||
|
var snackBar = buildUndoDeleteSnackbar(stateContainer, note);
|
||||||
Scaffold.of(context)
|
Scaffold.of(context)
|
||||||
..removeCurrentSnackBar()
|
..removeCurrentSnackBar()
|
||||||
..showSnackBar(snackBar);
|
..showSnackBar(snackBar);
|
||||||
|
@ -150,7 +150,7 @@ class _FolderListViewState extends State<FolderListView> {
|
|||||||
Provider.of<StateContainer>(context, listen: false);
|
Provider.of<StateContainer>(context, listen: false);
|
||||||
stateContainer.removeNote(note);
|
stateContainer.removeNote(note);
|
||||||
|
|
||||||
var snackBar = buildUndoDeleteSnackbar(context, note);
|
var snackBar = buildUndoDeleteSnackbar(stateContainer, note);
|
||||||
Scaffold.of(context)
|
Scaffold.of(context)
|
||||||
..removeCurrentSnackBar()
|
..removeCurrentSnackBar()
|
||||||
..showSnackBar(snackBar);
|
..showSnackBar(snackBar);
|
||||||
|
@ -3,7 +3,6 @@ import 'package:gitjournal/core/notes_folder_fs.dart';
|
|||||||
import 'package:gitjournal/screens/note_editor.dart';
|
import 'package:gitjournal/screens/note_editor.dart';
|
||||||
import 'package:gitjournal/settings.dart';
|
import 'package:gitjournal/settings.dart';
|
||||||
import 'package:package_info/package_info.dart';
|
import 'package:package_info/package_info.dart';
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
|
|
||||||
import 'app.dart';
|
import 'app.dart';
|
||||||
import 'core/note.dart';
|
import 'core/note.dart';
|
||||||
@ -24,16 +23,14 @@ Future<String> getVersionString() async {
|
|||||||
return versionText;
|
return versionText;
|
||||||
}
|
}
|
||||||
|
|
||||||
SnackBar buildUndoDeleteSnackbar(BuildContext context, Note deletedNote) {
|
SnackBar buildUndoDeleteSnackbar(
|
||||||
|
StateContainer stateContainer, Note deletedNote) {
|
||||||
return SnackBar(
|
return SnackBar(
|
||||||
content: const Text('Note Deleted'),
|
content: const Text('Note Deleted'),
|
||||||
action: SnackBarAction(
|
action: SnackBarAction(
|
||||||
label: "Undo",
|
label: "Undo",
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Log.d("Undoing delete");
|
Log.d("Undoing delete");
|
||||||
|
|
||||||
var stateContainer =
|
|
||||||
Provider.of<StateContainer>(context, listen: false);
|
|
||||||
stateContainer.undoRemoveNote(deletedNote);
|
stateContainer.undoRemoveNote(deletedNote);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
Reference in New Issue
Block a user