fix: Migrate to onPopInvokedWithResult

Reference: https://docs.flutter.dev/release/breaking-changes/popscope-with-result Signed-off-by: validcube <pun.butrach@gmail.com>
ReVanced · Sep 6, 2024 · 43d5888 · 43d5888
1 parent 646feae
commit 43d5888
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/ui/views/installer/installer_view.dart b/lib/ui/views/installer/installer_view.dart
@@ -16,9 +16,9 @@ class InstallerView extends StatelessWidget {
  return ViewModelBuilder<InstallerViewModel>.reactive(
  onViewModelReady: (model) => model.initialize(context),
  viewModelBuilder: () => InstallerViewModel(),
- builder: (context, model, child) => PopScope(
+ builder: (context, model, child) => PopScope<Object?>(
  canPop: !model.isPatching,
- onPopInvoked: (bool didPop) {
+ onPopInvokedWithResult: (bool didPop, Object? result) {
  if (didPop) {
  model.onPop();
  } else {

diff --git a/lib/ui/views/navigation/navigation_view.dart b/lib/ui/views/navigation/navigation_view.dart
@@ -13,9 +13,9 @@ class NavigationView extends StatelessWidget {
  return ViewModelBuilder<NavigationViewModel>.reactive(
  onViewModelReady: (model) => model.initialize(context),
  viewModelBuilder: () => locator<NavigationViewModel>(),
- builder: (context, model, child) => PopScope(
+ builder: (context, model, child) => PopScope<Object?>(
  canPop: model.currentIndex == 0,
- onPopInvoked: (bool didPop) {
+ onPopInvokedWithResult: (bool didPop, Object? result) {
  if (!didPop) {
  model.setIndex(0);
  }