Fixes for Flutter 3.24.0

Author: Correct-Syntax

lib/ui/views/bibles/bibles_view.dart

@@ -24,7 +24,7 @@ class BiblesView extends StackedView<BiblesViewModel> {
     bool isPortrait = isPortraitOrientation(context);
     return PopScope(
       canPop: false,
-      onPopInvoked: viewModel.onPopInvoked,
+      onPopInvokedWithResult: viewModel.onPopInvoked,
       child: Scaffold(
         backgroundColor: context.theme.appColors.background,
         appBar: AppBar(

lib/ui/views/bibles/bibles_viewmodel.dart

@@ -38,7 +38,7 @@ class BiblesViewModel extends BaseViewModel {
     rebuildUi();
   }
 
-  void onPopInvoked(bool onPopInvoked) async {
+  void onPopInvoked(bool didPop, Object? result) async {
     _navigationService.clearStackAndShow(Routes.readerView);
   }
 }

lib/ui/views/bookmarks/bookmarks_view.dart

@@ -19,7 +19,7 @@ class BookmarksView extends StackedView<BookmarksViewModel> {
     bool isPortrait = isPortraitOrientation(context);
     return PopScope(
       canPop: false,
-      onPopInvoked: viewModel.onPopInvoked,
+      onPopInvokedWithResult: viewModel.onPopInvoked,
       child: Scaffold(
         backgroundColor: context.theme.appColors.background,
         appBar: AppBar(

lib/ui/views/bookmarks/bookmarks_viewmodel.dart

@@ -17,7 +17,7 @@ class BookmarksViewModel extends BaseViewModel {
     await _settingsService.setBookmarks(allBookmarks);
   }
 
-  void onPopInvoked(bool onPopInvoked) async {
+  void onPopInvoked(bool didPop, Object? result) async {
     _navigationService.clearStackAndShow(Routes.readerView);
   }
 }

lib/ui/views/navigation_bible_divisions/navigation_bible_divisions_view.dart

@@ -24,7 +24,7 @@ class NavigationBibleDivisionsView extends StackedView<NavigationBibleDivisionsV
   ) {
     return PopScope(
       canPop: false,
-      onPopInvoked: viewModel.onPopInvoked,
+      onPopInvokedWithResult: viewModel.onPopInvoked,
       child: Scaffold(
         backgroundColor: context.theme.appColors.background,
         appBar: AppBar(

lib/ui/views/navigation_bible_divisions/navigation_bible_divisions_viewmodel.dart

@@ -46,7 +46,7 @@ class NavigationBibleDivisionsViewModel extends BaseViewModel {
     _navigationService.navigateToNavigationSectionsChaptersView(readerArea: readerArea, bookCode: bookCode);
   }
 
-  void onPopInvoked(bool onPopInvoked) async {
+  void onPopInvoked(bool didPop, Object? result) async {
     _navigationService.clearStackAndShow(Routes.readerView);
   }
 }

lib/ui/views/search/search_view.dart

@@ -17,7 +17,7 @@ class SearchView extends StackedView<SearchViewModel> {
     bool isPortrait = isPortraitOrientation(context);
     return PopScope(
       canPop: false,
-      onPopInvoked: viewModel.onPopInvoked,
+      onPopInvokedWithResult: viewModel.onPopInvoked,
       child: Scaffold(
         backgroundColor: context.theme.appColors.background,
         appBar: AppBar(

lib/ui/views/search/search_viewmodel.dart

@@ -7,7 +7,7 @@ import '../../../app/app.router.dart';
 class SearchViewModel extends BaseViewModel {
   final _navigationService = locator<NavigationService>();
 
-  void onPopInvoked(bool onPopInvoked) async {
+  void onPopInvoked(bool didPop, Object? result) async {
     _navigationService.clearStackAndShow(Routes.readerView);
   }
 }

lib/ui/views/settings/settings_view.dart

@@ -22,7 +22,7 @@ class SettingsView extends StackedView<SettingsViewModel> {
     bool isPortrait = isPortraitOrientation(context);
     return PopScope(
       canPop: false,
-      onPopInvoked: viewModel.onPopInvoked,
+      onPopInvokedWithResult: viewModel.onPopInvoked,
       child: Scaffold(
         appBar: AppBar(
           backgroundColor: context.theme.appColors.background,

lib/ui/views/settings/settings_viewmodel.dart

@@ -38,7 +38,7 @@ class SettingsViewModel extends FutureViewModel<String> {
     return 'v$appVersion';
   }
 
-  void onPopInvoked(bool onPopInvoked) async {
+  void onPopInvoked(bool didPop, Object? result) async {
     _navigationService.clearStackAndShow(Routes.readerView);
   }
 }