update flutter

assets/translations/ru.json

@@ -1,3 +1,7 @@
 {
-  "test": "ру-тест"
+  "test": "en-test",
+  "basis:": {
+    "_comment": "Повторяющиеся названия",
+    "next": "Далее"
+  }
 }

ios/Podfile.lock

@@ -39,7 +39,7 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock/ios"
 
 SPEC CHECKSUMS:
-  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
+  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c

ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:Runner.xcodeproj">
+      location = "self:">
    </FileRef>
 </Workspace>

lib/ui/pages/more/app_settings/app_setting.dart

@@ -80,8 +80,10 @@ class _AppSettingsPageState extends State<AppSettingsPage> {
                       ),
                     ),
                     SizedBox(width: 5),
-                    RaisedButton(
+                    ElevatedButton(
-                      color: BrandColors.red1,
+                      style: ElevatedButton.styleFrom(
+                        primary: BrandColors.red1,
+                      ),
                       child: Text(
                         'Reset',
                         style: TextStyle(
@@ -92,24 +94,26 @@ class _AppSettingsPageState extends State<AppSettingsPage> {
                       onPressed: () {
                         showDialog(
                           context: context,
-                          child: BrandAlert(
+                          builder: (_) {
-                            title: 'Вы уверенны',
+                            return BrandAlert(
-                            contentText: 'Сбросить все ключи?',
+                              title: 'Вы уверенны',
-                            acitons: [
+                              contentText: 'Сбросить все ключи?',
-                              ActionButton(
+                              acitons: [
-                                  text: 'Да, сбросить',
+                                ActionButton(
-                                  isRed: true,
+                                    text: 'Да, сбросить',
-                                  onPressed: () {
+                                    isRed: true,
-                                    context
+                                    onPressed: () {
-                                        .read<AppConfigCubit>()
+                                      context
-                                        .clearAppConfig();
+                                          .read<AppConfigCubit>()
-                                    Navigator.of(context).pop();
+                                          .clearAppConfig();
-                                  }),
+                                      Navigator.of(context).pop();
-                              ActionButton(
+                                    }),
-                                text: 'Отмена',
+                                ActionButton(
-                              ),
+                                  text: 'Отмена',
-                            ],
+                                ),
-                          ),
+                              ],
+                            );
+                          },
                         );
                       },
                     )

lib/ui/pages/onboarding/onboarding.dart

@@ -78,7 +78,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
                 curve: Curves.easeIn,
               );
             },
-            title: 'Далее',
+            title: 'Далее'.tr(),
           ),
           SizedBox(height: 30),
         ],

lib/ui/pages/users/user_details.dart

@@ -42,8 +42,9 @@ class _UserDetails extends StatelessWidget {
                             break;
                           case PopupMenuItemType.delete:
                             showDialog(
-                                context: context,
+                              context: context,
-                                child: AlertDialog(
+                              builder: (context) {
+                                return AlertDialog(
                                   title: Text('Подтверждение '),
                                   content: SingleChildScrollView(
                                     child: ListBody(
@@ -72,7 +73,9 @@ class _UserDetails extends StatelessWidget {
                                       },
                                     ),
                                   ],
-                                ));
+                                );
+                              },
+                            );
                             break;
                         }
                       },

pubspec.lock

@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.5.0"
   basic_utils:
     dependency: "direct dev"
     description:
@@ -56,7 +56,7 @@ packages:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   build:
     dependency: transitive
     description:
@@ -119,14 +119,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -147,7 +147,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
@@ -161,7 +161,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
@@ -231,7 +231,7 @@ packages:
       name: easy_localization
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.3"
+    version: "2.3.3+1"
   either_option:
     dependency: "direct main"
     description:
@@ -259,7 +259,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   ffi:
     dependency: transitive
     description:
@@ -273,7 +273,7 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.1"
+    version: "6.1.0"
   fixnum:
     dependency: transitive
     description:
@@ -419,7 +419,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.17.0"
   io:
     dependency: transitive
     description:
@@ -433,7 +433,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3-nullsafety.2"
+    version: "0.6.3"
   json_annotation:
     dependency: "direct main"
     description:
@@ -468,14 +468,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   mime:
     dependency: transitive
     description:
@@ -503,7 +503,7 @@ packages:
       name: node_io
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.1.1"
   node_preamble:
     dependency: transitive
     description:
@@ -531,7 +531,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
@@ -573,7 +573,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.2"
+    version: "1.11.0"
   petitparser:
     dependency: transitive
     description:
@@ -587,7 +587,7 @@ packages:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.0"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -608,14 +608,14 @@ packages:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0-nullsafety.2"
+    version: "1.5.0"
   process:
     dependency: transitive
     description:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.13"
+    version: "4.1.0"
   provider:
     dependency: "direct main"
     description:
@@ -739,35 +739,35 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.10-nullsafety.2"
+    version: "0.10.10"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
@@ -781,35 +781,35 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test:
     dependency: transitive
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.16.0-nullsafety.5"
+    version: "1.16.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.2.19"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.12-nullsafety.5"
+    version: "0.3.15"
   time:
     dependency: transitive
     description:
@@ -830,7 +830,7 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -886,7 +886,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   vm_service:
     dependency: transitive
     description:
@@ -965,5 +965,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0 <2.11.0"
+  dart: ">=2.12.0-0.0 <3.0.0"
-  flutter: ">=1.22.0 <2.0.0"
+  flutter: ">=1.22.0"