Merge pull request #10 from deandreamatias/update-setup-2024-06

Update setup 2024 06

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.22.2"
+}

.github/workflows/build.yaml

@@ -12,11 +12,15 @@ jobs:
     steps:
     - name: Configure enviroment
       uses: actions/checkout@v4
-    - uses: kuhnroyal/flutter-fvm-config-action@v1
+    - name: Get Flutter version by FVM
+      uses: kuhnroyal/flutter-fvm-config-action@v2
+      id: fvm-config-action
+      with:
+        path: '.fvmrc'
     - name: Download flutter
       uses: subosito/flutter-action@v2
       with:
-        flutter-version: ${{ env.FLUTTER_VERSION }}
+        flutter-version: ${{ steps.fvm-config-action.outputs.FLUTTER_VERSION }}
         cache: true
         cache-key: 'flutter-:os:-:version:'
         cache-path: '${{ runner.tool_cache }}/flutter/:os:-:version:'

.gitignore

@@ -9,7 +9,6 @@
 .history
 .svn/
 migrate_working_dir/
-.fvm/flutter_sdk
 .firebase/
 .env/
 
@@ -46,3 +45,6 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+# FVM Version Cache
+.fvm/

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "efbf63d9c66b9f6ec30e9ad4611189aa80003d31"
+  revision: "761747bfc538b5af34aa0d3fac380f1bc331ec49"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
-      base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: web
-      create_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
-      base_revision: efbf63d9c66b9f6ec30e9ad4611189aa80003d31
+      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
+      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
 
   # User provided section
 

lib/data/services/dio_service.dart

@@ -116,7 +116,7 @@ class DioRestService<V> {
       if (_catchErrors == null) {
         rethrow;
       }
-      return Left(_catchErrors!(e));
+      return Left(_catchErrors(e));
     } catch (e) {
       rethrow;
     }

lib/ui/styles/theme.dart

@@ -7,23 +7,23 @@ final themeData = ThemeData(
   scaffoldBackgroundColor: AppColors.white,
   elevatedButtonTheme: ElevatedButtonThemeData(
     style: ButtonStyle(
-      backgroundColor: MaterialStateProperty.all(AppColors.secondary),
-      textStyle: MaterialStateProperty.all(TextStyles.labelLarge),
-      shape: MaterialStateProperty.all(
+      backgroundColor: WidgetStateProperty.all(AppColors.secondary),
+      textStyle: WidgetStateProperty.all(TextStyles.labelLarge),
+      shape: WidgetStateProperty.all(
         RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(56),
         ),
       ),
     ),
   ),
   checkboxTheme: CheckboxThemeData(
-    fillColor: MaterialStateProperty.resolveWith((states) {
-      if (states.contains(MaterialState.selected)) {
+    fillColor: WidgetStateProperty.resolveWith((states) {
+      if (states.contains(WidgetState.selected)) {
         return AppColors.secondary;
       }
       return AppColors.white;
     }),
-    checkColor: MaterialStateProperty.all(AppColors.white),
+    checkColor: WidgetStateProperty.all(AppColors.white),
     side: const BorderSide(color: AppColors.secondary, width: 2),
     shape: const RoundedRectangleBorder(
       borderRadius: BorderTypes.borderRadius4,

pubspec.yaml

@@ -6,29 +6,29 @@ publish_to: 'none'
 version: 0.0.1+1
 
 environment:
-  sdk: '>=3.0.0 <4.0.0'
-  flutter: '>=3.13.0'
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.22.0'
 
 dependencies:
-  dio: ^5.3.3
-  easy_localization: ^3.0.3
+  dio: ^5.4.3
+  easy_localization: ^3.0.7
   either_dart: ^1.0.0
   flutter:
     sdk: flutter
-  flutter_native_splash: ^2.3.5
-  flutter_svg: ^2.0.9
-  flutter_widget_from_html: ^0.14.7
-  get_it: ^7.6.4
-  go_router: ^12.1.1
-  injectable: ^2.3.2
-  url_launcher: ^6.2.1
+  flutter_native_splash: ^2.4.0
+  flutter_svg: ^2.0.10
+  flutter_widget_from_html: ^0.15.1
+  get_it: ^7.7.0
+  go_router: ^14.2.0
+  injectable: ^2.4.2
+  url_launcher: ^6.3.0
 
 dev_dependencies:
-  build_runner: ^2.4.6
-  flutter_lints: ^3.0.1
+  build_runner: ^2.4.11
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
-  injectable_generator: ^2.4.1
+  injectable_generator: ^2.6.1
 
 flutter:
   uses-material-design: true

setup.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-$1 flutter clean && $1 flutter pub get && $1 flutter packages pub run build_runner build --delete-conflicting-outputs
+$1 flutter clean && $1 flutter pub get && $1 dart run build_runner build --delete-conflicting-outputs

web/index.html

@@ -45,13 +45,6 @@
   <meta property="og:type" content="website">
 
   <title>Peluquería canina Mimos</title>
-
-  <script>
-    // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = null;
-  </script>
-  <!-- This script adds the flutter initialization JS code -->
-  <script src="flutter.js" defer=""></script>
   <style id="splash-screen-style">
     html {
       height: 100%
@@ -124,21 +117,7 @@
       <source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
       <img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
   </picture>
-  <script>
-    window.addEventListener('load', function(ev) {
-      // Download main.dart.js
-      _flutter.loader.loadEntrypoint({
-        serviceWorker: {
-          serviceWorkerVersion: serviceWorkerVersion,
-        },
-        onEntrypointLoaded: function(engineInitializer) {
-          engineInitializer.initializeEngine().then(function(appRunner) {
-            appRunner.runApp();
-          });
-        }
-      });
-    });
-  </script>
+  <script src="flutter_bootstrap.js" async></script>
   <script type="application/ld+json">
     {
       "@context": "https://schema.org",