migrate to new version of router, upgrade dependencies (#2)

* migrate to new version of router, upgrade dependencies

* updated ci settings

.github/workflows/ci-branch.yml

@@ -2,9 +2,9 @@ name: "CI [branch]"
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "master" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "master" ]
 
 jobs:
   build:
@@ -14,7 +14,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: "3.7.6"
+          flutter-version: "3.13.0"
           cache: true
 
       - uses: actions/checkout@v3
@@ -25,7 +25,7 @@ jobs:
       - name:  Analyze project source
         run: |
           flutter analyze --fatal-infos
-          flutter format --set-exit-if-changed .
+          dart format --set-exit-if-changed .
 
       - name: Run tests
         run: flutter test

.github/workflows/tag-release.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
-          flutter-version: "3.7.6"
+          flutter-version: "3.13.0"
           cache: true
 
       - name: Create Key
@@ -54,4 +54,3 @@ jobs:
           generateReleaseNotes: true
           artifacts: build/app/outputs/flutter-apk/app-release.apk
           token: ${{ secrets.RELEASE_TOKEN }}
-

lib/app.dart

@@ -4,10 +4,10 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:sys_dia_log/locale/locales.dart';
 import 'package:sys_dia_log/modules/settings/providers/app_settings_provider.dart';
-import 'package:sys_dia_log/routing/router.dart';
+import 'package:sys_dia_log/routing/app_router.dart';
 
 class SysDiaLogApp extends StatelessWidget {
-  SysDiaLogApp({Key? key}) : super(key: key);
+  SysDiaLogApp({super.key});
 
   final _appRouter = AppRouter();
 
@@ -20,7 +20,6 @@ class SysDiaLogApp extends StatelessWidget {
         ),
       ],
       builder: (context, child) => MaterialApp.router(
-        useInheritedMediaQuery: true,
         title: 'Sys Dia Log',
         debugShowCheckedModeBanner: false,
         theme: ThemeData(

lib/modules/home/views/home_view.dart

@@ -8,9 +8,10 @@ import 'package:sys_dia_log/modules/home/ui/add_new_button.dart';
 import 'package:sys_dia_log/modules/home/ui/measurements_list.dart';
 import 'package:sys_dia_log/modules/home/ui/refresh_button.dart';
 import 'package:sys_dia_log/modules/measurement/models/measurement.dart';
-import 'package:sys_dia_log/routing/router.dart';
+import 'package:sys_dia_log/routing/app_router.dart';
 import 'package:sys_dia_log/shared/ui/loading_indicator.dart';
 
+@RoutePage()
 class HomeView extends StatefulWidget {
   const HomeView({super.key});
 
@@ -28,7 +29,7 @@ class _HomeViewState extends State<HomeView> {
   }
 
   _addNavigate() {
-    context.router.navigate(MeasurementViewRoute(
+    context.router.navigate(MeasurementRoute(
         onAddNewMeasurement: (Measurement m) => setState(() {})));
   }
 

lib/modules/measurement/views/measurement_view.dart

@@ -5,13 +5,14 @@ import 'package:intl/intl.dart';
 import 'package:numberpicker/numberpicker.dart';
 import 'package:sys_dia_log/modules/measurement/models/measurement.dart';
 import 'package:sys_dia_log/modules/measurement/service/measurement_service.dart';
-import 'package:sys_dia_log/routing/router.dart';
+import 'package:sys_dia_log/routing/app_router.dart';
 import 'package:sys_dia_log/shared/ui/snack_bars.dart';
 
+@RoutePage()
 class MeasurementView extends StatefulWidget {
   final void Function(Measurement)? onAddNewMeasurement;
 
-  const MeasurementView({Key? key, this.onAddNewMeasurement}) : super(key: key);
+  const MeasurementView({super.key, this.onAddNewMeasurement});
 
   @override
   State<StatefulWidget> createState() => _MeasurementViewState();
@@ -41,7 +42,7 @@ class _MeasurementViewState extends State<MeasurementView> {
 
     widget.onAddNewMeasurement?.call(measurement);
 
-    AutoRouter.of(context).navigate(const HomeViewRoute());
+    AutoRouter.of(context).navigate(const HomeRoute());
 
     ScaffoldMessenger.of(context)
       ..removeCurrentSnackBar()

lib/modules/settings/views/settings_view.dart

@@ -1,10 +1,12 @@
+import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_i18n/widgets/I18nText.dart';
 import 'package:sys_dia_log/modules/settings/ui/locale_settings.dart';
 import 'package:sys_dia_log/modules/settings/ui/theme_settings.dart';
 
+@RoutePage()
 class SettingsView extends StatelessWidget {
-  const SettingsView({Key? key}) : super(key: key);
+  const SettingsView({super.key});
 
   @override
   Widget build(BuildContext context) {

lib/routing/app_router.dart

@@ -0,0 +1,26 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:sys_dia_log/modules/home/views/home_view.dart';
+import 'package:sys_dia_log/modules/measurement/models/measurement.dart';
+import 'package:sys_dia_log/modules/measurement/views/measurement_view.dart';
+import 'package:sys_dia_log/modules/settings/views/settings_view.dart';
+import 'package:sys_dia_log/shared/views/nav_bar_view.dart';
+import 'package:sys_dia_log/shared/views/splash_screen_view.dart';
+
+part 'app_router.gr.dart';
+
+@AutoRouterConfig(replaceInRouteName: 'View,Route')
+class AppRouter extends _$AppRouter {
+  @override
+  RouteType get defaultRouteType => const RouteType.material();
+
+  @override
+  List<AutoRoute> get routes => [
+        AutoRoute(page: SplashScreenRoute.page, initial: true),
+        CustomRoute(page: NavBarRoute.page, children: [
+          AutoRoute(page: HomeRoute.page),
+          AutoRoute(page: MeasurementRoute.page),
+          AutoRoute(page: SettingsRoute.page)
+        ]),
+      ];
+}