Replace WillPopScope with PopScope

KyleKun · Dec 24, 2023 · 9a20e08 · 9a20e08
1 parent 0f430b3
commit 9a20e08
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/lib/lang/es.dart b/lib/lang/es.dart
@@ -152,7 +152,7 @@ const Map<String, String> es = {
       'Genera películas personalizadas con periodos seleccionados o vídeos específicos 🎥',
   'feat7v15': 'Notificacion',
   'featDesc7v15':
-      'Configura notificaciones diarias programadas para recordarte grabar tu momento especial 🔔',
+      'Configura notificaciones diaryas programadas para recordarte grabar tu momento especial 🔔',
   'default': 'Patrón',
   'profileNameAlreadyExists': 'El nombre del perfil ya existe',
   'profileNameCannotContainSpecialChars':

diff --git a/lib/pages/home/create_movie/widgets/create_movie_options.dart b/lib/pages/home/create_movie/widgets/create_movie_options.dart
@@ -48,9 +48,10 @@ class _CreateMovieOptionsState extends State<CreateMovieOptions> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
-        showDialog(
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (_) async {
+        await showDialog(
           barrierDismissible: false,
           context: Get.context!,
           builder: (context) => CustomDialog(
@@ -65,7 +66,6 @@ class _CreateMovieOptionsState extends State<CreateMovieOptions> {
             action2: () => Get.back(),
           ),
         );
-        return true;
       },
       child: Scaffold(
         appBar: AppBar(

diff --git a/lib/pages/save_video/save_video_page.dart b/lib/pages/save_video/save_video_page.dart
@@ -465,8 +465,9 @@ class _SaveVideoPageState extends State<SaveVideoPage> {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () async {
+    return PopScope(
+      canPop: false,
+      onPopInvoked: (_) async {
         // Prevent showing the option to re-record video if not coming from the recording page
         final isFromRecordingPage = routeArguments['isFromRecordingPage'];
         if (!isFromRecordingPage) {
@@ -477,7 +478,7 @@ class _SaveVideoPageState extends State<SaveVideoPage> {
           }
           Get.back();
         } else {
-          showDialog(
+          await showDialog(
             barrierDismissible: false,
             context: Get.context!,
             builder: (context) => CustomDialog(
@@ -493,7 +494,6 @@ class _SaveVideoPageState extends State<SaveVideoPage> {
             ),
           );
         }
-        return true;
       },
       child: Scaffold(
         appBar: AppBar(

diff --git a/lib/pages/save_video/widgets/save_button.dart b/lib/pages/save_video/widgets/save_button.dart
@@ -115,8 +115,8 @@ class _SaveButtonState extends State<SaveButton> {
     return await showDialog(
       context: Get.context!,
       barrierDismissible: false,
-      builder: (context) => WillPopScope(
-        onWillPop: () async => false,
+      builder: (context) => PopScope(
+        canPop: false,
         child: ValueListenableBuilder(
           valueListenable: saveProgressPercentage,
           builder: (context, value, child) => AlertDialog(

diff --git a/lib/utils/storage_utils.dart b/lib/utils/storage_utils.dart
@@ -124,8 +124,8 @@ class StorageUtils {
         showDialog(
           barrierDismissible: false,
           context: Get.context!,
-          builder: (context) => WillPopScope(
-            onWillPop: () async => false,
+          builder: (context) => PopScope(
+            canPop: false,
             child: AlertDialog(
               title: const Icon(
                 Icons.handyman,