From 406a72088b690b777b544c0b40dfb32bb6bf83d0 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Mon, 15 Feb 2021 22:31:45 +0100 Subject: [PATCH] Use context.read instead of Provider.of with listen false Shorter --- lib/folder_views/common.dart | 2 +- lib/folder_views/list_view.dart | 3 +-- lib/screens/filesystem_screen.dart | 2 +- lib/screens/folder_listing.dart | 11 ++++------- lib/screens/folder_view.dart | 12 ++++++------ lib/screens/note_editor.dart | 11 +++++------ lib/screens/settings_git_remote.dart | 2 +- lib/setup/screens.dart | 4 ++-- 8 files changed, 21 insertions(+), 26 deletions(-) diff --git a/lib/folder_views/common.dart b/lib/folder_views/common.dart index 0ea5055e..46c9dab3 100644 --- a/lib/folder_views/common.dart +++ b/lib/folder_views/common.dart @@ -94,7 +94,7 @@ void openNoteEditor( if (showUndoSnackBar != null) { Log.d("Showing an undo snackbar"); - var stateContainer = Provider.of(context, listen: false); + var stateContainer = context.read(); var snackBar = buildUndoDeleteSnackbar(stateContainer, note); Scaffold.of(context) ..removeCurrentSnackBar() diff --git a/lib/folder_views/list_view.dart b/lib/folder_views/list_view.dart index 970bc9f1..bed2dc1a 100644 --- a/lib/folder_views/list_view.dart +++ b/lib/folder_views/list_view.dart @@ -155,8 +155,7 @@ class _FolderListViewState extends State { onDismissed: (direction) { deletedViaDismissed.add(note.filePath); - var stateContainer = - Provider.of(context, listen: false); + var stateContainer = context.read(); stateContainer.removeNote(note); var snackBar = buildUndoDeleteSnackbar(stateContainer, note); diff --git a/lib/screens/filesystem_screen.dart b/lib/screens/filesystem_screen.dart index c4d00460..93f88edc 100644 --- a/lib/screens/filesystem_screen.dart +++ b/lib/screens/filesystem_screen.dart @@ -74,7 +74,7 @@ class _FileSystemScreenState extends State { ), ); if (newFileName is String) { - var container = Provider.of(context, listen: false); + var container = context.read(); container.renameFile(oldPath, newFileName); } } diff --git a/lib/screens/folder_listing.dart b/lib/screens/folder_listing.dart index e965af9e..c83e2d12 100644 --- a/lib/screens/folder_listing.dart +++ b/lib/screens/folder_listing.dart @@ -86,8 +86,7 @@ class _FolderListingScreenState extends State { ), ); if (folderName is String) { - var container = - Provider.of(context, listen: false); + var container = context.read(); container.renameFolder(selectedFolder, folderName); } } else if (value == "Create") { @@ -96,8 +95,7 @@ class _FolderListingScreenState extends State { builder: (_) => CreateFolderAlertDialog(), ); if (folderName is String) { - var container = - Provider.of(context, listen: false); + var container = context.read(); container.createFolder(selectedFolder, folderName); } } else if (value == "Delete") { @@ -107,8 +105,7 @@ class _FolderListingScreenState extends State { builder: (_) => DeleteFolderErrorDialog(), ); } else { - var container = - Provider.of(context, listen: false); + var container = context.read(); container.removeFolder(selectedFolder); } } @@ -156,7 +153,7 @@ class CreateFolderButton extends StatelessWidget { builder: (_) => CreateFolderAlertDialog(), ); if (folderName is String) { - var container = Provider.of(context, listen: false); + var container = context.read(); final notesFolder = Provider.of(context, listen: false); diff --git a/lib/screens/folder_view.dart b/lib/screens/folder_view.dart index 291e266a..d4fbcaff 100644 --- a/lib/screens/folder_view.dart +++ b/lib/screens/folder_view.dart @@ -160,7 +160,7 @@ class _FolderViewState extends State { void _syncRepo(BuildContext context) async { try { - var container = Provider.of(context, listen: false); + var container = context.read(); await container.syncNotes(); } on GitException catch (e) { showSnackbar( @@ -234,7 +234,7 @@ class _FolderViewState extends State { var settings = Provider.of(context, listen: false); config.saveToSettings(settings); - var container = Provider.of(context, listen: false); + var container = context.read(); container.saveFolderConfig(sortedNotesFolder.config); setState(() { @@ -259,7 +259,7 @@ class _FolderViewState extends State { var settings = Provider.of(context, listen: false); config.saveToSettings(settings); - var container = Provider.of(context, listen: false); + var container = context.read(); container.saveFolderConfig(sortedNotesFolder.config); }; @@ -275,7 +275,7 @@ class _FolderViewState extends State { var settings = Provider.of(context, listen: false); config.saveToSettings(settings); - var container = Provider.of(context, listen: false); + var container = context.read(); container.saveFolderConfig(sortedNotesFolder.config); }; @@ -407,7 +407,7 @@ class _FolderViewState extends State { var settings = Provider.of(context, listen: false); config.saveToSettings(settings); - var container = Provider.of(context, listen: false); + var container = context.read(); container.saveFolderConfig(widget.notesFolder.config); } } @@ -494,7 +494,7 @@ class _FolderViewState extends State { ); } if (shouldDelete == true) { - var stateContainer = Provider.of(context, listen: false); + var stateContainer = context.read(); stateContainer.removeNote(note); } diff --git a/lib/screens/note_editor.dart b/lib/screens/note_editor.dart index 7f5a823e..61e3e7e8 100644 --- a/lib/screens/note_editor.dart +++ b/lib/screens/note_editor.dart @@ -283,7 +283,7 @@ class NoteEditorState extends State with WidgetsBindingObserver { }); return; } - var container = Provider.of(context, listen: false); + var container = context.read(); container.renameNote(note, fileName); } } @@ -318,7 +318,7 @@ class NoteEditorState extends State with WidgetsBindingObserver { return; } - var stateContainer = Provider.of(context, listen: false); + var stateContainer = context.read(); stateContainer.removeNote(note); } @@ -353,7 +353,7 @@ class NoteEditorState extends State with WidgetsBindingObserver { Log.d("Note modified - saving"); try { - var stateContainer = Provider.of(context, listen: false); + var stateContainer = context.read(); _isNewNote ? await stateContainer.addNote(note) : await stateContainer.updateNote(note); @@ -396,15 +396,14 @@ class NoteEditorState extends State with WidgetsBindingObserver { note.parent = destFolder; setState(() {}); } else { - var stateContainer = - Provider.of(context, listen: false); + var stateContainer = context.read(); stateContainer.moveNote(note, destFolder); } } } void _discardChangesSelected(Note note) async { - var stateContainer = Provider.of(context, listen: false); + var stateContainer = context.read(); stateContainer.discardChanges(note); Navigator.pop(context); diff --git a/lib/screens/settings_git_remote.dart b/lib/screens/settings_git_remote.dart index 122b7b3a..9320b351 100644 --- a/lib/screens/settings_git_remote.dart +++ b/lib/screens/settings_git_remote.dart @@ -186,7 +186,7 @@ class _GitRemoteSettingsScreenState extends State { return; } - var repo = Provider.of(context, listen: false); + var repo = context.read(); var gitDir = repo.gitBaseDirectory; // Figure out the next available folder diff --git a/lib/setup/screens.dart b/lib/setup/screens.dart index 29df740c..b3a96e8b 100644 --- a/lib/setup/screens.dart +++ b/lib/setup/screens.dart @@ -421,7 +421,7 @@ class GitHostSetupScreenState extends State { } Future _removeRemote() async { - var repo = Provider.of(context, listen: false); + var repo = context.read(); var basePath = repo.gitBaseDirectory; var repoPath = p.join(basePath, widget.repoFolderName); @@ -527,7 +527,7 @@ class GitHostSetupScreenState extends State { return; } - var repo = Provider.of(context, listen: false); + var repo = context.read(); var basePath = repo.gitBaseDirectory; var settings = Provider.of(context, listen: false);