Merge pull request #61 from mkobuolys/feat/update-project

feat: update project

.metadata

@@ -4,7 +4,27 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 2d2a1ffec95cc70a3218872a2cd3f8de4933c42f
-  channel: stable
+  revision: "603104015dd692ea3403755b55d07813d5cf8965"
+  channel: "stable"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
+    - platform: web
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

assets/markdown/decorator.md

@@ -298,6 +298,7 @@ class _DecoratorExampleState extends State<DecoratorExample> {
           horizontal: LayoutConstants.paddingL,
         ),
         child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
             Row(
               children: <Widget>[

lib/data/repositories/design_pattern_categories_repository.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:flutter/services.dart' show rootBundle;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../../constants/constants.dart';
@@ -16,16 +17,14 @@ DesignPatternCategoriesRepository designPatternCategoriesRepository(_) {
 }
 
 @riverpod
-Future<List<DesignPatternCategory>> designPatternCategories(
-  DesignPatternCategoriesRef ref,
-) {
+Future<List<DesignPatternCategory>> designPatternCategories(Ref ref) {
   final repository = ref.watch(designPatternCategoriesRepositoryProvider);
 
   return repository.get();
 }
 
 @riverpod
-Future<DesignPattern> designPattern(DesignPatternRef ref, String id) async {
+Future<DesignPattern> designPattern(Ref ref, String id) async {
   final categories = await ref.watch(designPatternCategoriesProvider.future);
 
   return categories

lib/data/repositories/markdown_repository.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/services.dart' show rootBundle;
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 import '../../constants/constants.dart';
@@ -9,7 +10,7 @@ part 'markdown_repository.g.dart';
 MarkdownRepository markdownRepository(_) => const MarkdownRepository();
 
 @riverpod
-Future<String> markdown(MarkdownRef ref, String id) {
+Future<String> markdown(Ref ref, String id) {
   return ref.watch(markdownRepositoryProvider).get(id);
 }
 

lib/design_patterns/command/commands/change_color_command.dart

@@ -1,4 +1,4 @@
-import 'package:faker/faker.dart';
+import 'package:faker/faker.dart' hide Color;
 import 'package:flutter/material.dart';
 
 import '../command.dart';

lib/design_patterns/memento/command_design_pattern/commands/randomise_properties_command.dart

@@ -1,4 +1,4 @@
-import 'package:faker/faker.dart';
+import 'package:faker/faker.dart' hide Color;
 import 'package:flutter/material.dart';
 
 import '../../memento/imemento.dart';

lib/design_patterns/prototype/shapes/circle.dart

@@ -1,4 +1,4 @@
-import 'package:faker/faker.dart';
+import 'package:faker/faker.dart' hide Color;
 import 'package:flutter/material.dart';
 
 import '../shape.dart';

lib/design_patterns/prototype/shapes/rectangle.dart

@@ -1,4 +1,4 @@
-import 'package:faker/faker.dart';
+import 'package:faker/faker.dart' hide Color;
 import 'package:flutter/material.dart';
 
 import '../shape.dart';

lib/main.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:url_strategy/url_strategy.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
 
 import 'app.dart';
 
@@ -10,7 +10,7 @@ Future<void> main() async {
 
   await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
 
-  setPathUrlStrategy();
+  usePathUrlStrategy();
 
   runApp(const ProviderScope(child: App()));
 }

lib/navigation/router.dart

@@ -10,8 +10,11 @@ part 'router.g.dart';
 @riverpod
 GoRouter router(_) => GoRouter(
       routes: $appRoutes,
-      redirect: (context, state) =>
-          state.location.isEmpty ? const MainMenuRoute().location : null,
+      redirect: (context, state) {
+        final uri = state.uri.toString();
+
+        return uri.isEmpty ? const MainMenuRoute().location : null;
+      },
     );
 
 @TypedGoRoute<MainMenuRoute>(

lib/themes.dart

@@ -4,7 +4,7 @@ const lightBackgroundColor = Color(0xFFECECEC);
 
 final lightTheme = ThemeData.from(
   colorScheme: const ColorScheme.light(
-    background: lightBackgroundColor,
+    surface: lightBackgroundColor,
     primary: Colors.grey,
   ),
 ).copyWith(

lib/widgets/design_patterns/decorator/custom_pizza_selection.dart

@@ -51,8 +51,8 @@ class _ChoiceChip extends StatelessWidget {
     final color = selected ? Colors.white : Colors.black;
 
     return ChoiceChip(
-      color: MaterialStateProperty.resolveWith((states) {
-        if (states.contains(MaterialState.selected)) {
+      color: WidgetStateProperty.resolveWith((states) {
+        if (states.contains(WidgetState.selected)) {
           return Colors.black;
         }
 

lib/widgets/design_patterns/decorator/decorator_example.dart

@@ -56,6 +56,7 @@ class _DecoratorExampleState extends State<DecoratorExample> {
           horizontal: LayoutConstants.paddingL,
         ),
         child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
             Row(
               children: <Widget>[

lib/widgets/image_view.dart

@@ -114,7 +114,7 @@ class _ImageViewState extends State<ImageView>
     return Scaffold(
       appBar: AppBar(
         elevation: 0,
-        backgroundColor: Theme.of(context).colorScheme.background,
+        backgroundColor: Theme.of(context).colorScheme.surface,
         leading: const CloseButton(color: Colors.black),
       ),
       body: GestureDetector(

pubspec.yaml

@@ -9,27 +9,28 @@ environment:
   sdk: ">=3.0.0 <4.0.0"
 
 dependencies:
-  cupertino_icons: ^1.0.5
-  faker: ^2.1.0
+  cupertino_icons: ^1.0.8
+  faker: ^2.2.0
   flutter:
     sdk: flutter
-  flutter_markdown: ^0.6.14
-  flutter_riverpod: ^2.3.6
-  font_awesome_flutter: ^10.4.0
-  go_router: ^7.0.1
+  flutter_markdown: ^0.7.4+1
+  flutter_riverpod: ^2.6.1
+  flutter_web_plugins:
+    sdk: flutter
+  font_awesome_flutter: ^10.7.0
+  go_router: ^14.3.0
   highlight: ^0.7.0
-  riverpod_annotation: ^2.1.1
-  url_launcher: ^6.1.11
-  url_strategy: ^0.2.0
-  xml: ^6.3.0
+  riverpod_annotation: ^2.6.1
+  url_launcher: ^6.3.1
+  xml: ^6.5.0
 
 dev_dependencies:
-  build_runner: ^2.4.4
+  build_runner: ^2.4.13
   flutter_test:
     sdk: flutter
-  go_router_builder: ^2.0.1
-  lint: ^2.1.2
-  riverpod_generator: ^2.2.3
+  go_router_builder: ^2.7.1
+  lint: ^2.3.0
+  riverpod_generator: ^2.6.2
 
 flutter:
   uses-material-design: true

web/index.html

@@ -1,17 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
-
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
-
-    Fore more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-  -->
-  <base href="/">
+  <base href="$FLUTTER_BASE_HREF">
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
@@ -40,16 +30,6 @@ <h1>
       Welcome to Flutter Design Patterns! 👋
     </h1>
   </div>
-  <!-- This script installs service_worker.js to provide PWA functionality to
-       application. For more information, see:
-       https://developers.google.com/web/fundamentals/primers/service-workers -->
-  <script>
-    if ('serviceWorker' in navigator) {
-      window.addEventListener('flutter-first-frame', function () {
-        navigator.serviceWorker.register('flutter_service_worker.js');
-      });
-    }
-  </script>
-  <script src="main.dart.js" type="application/javascript"></script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
 </html>

web/manifest.json

@@ -18,6 +18,18 @@
       "src": "icons/Icon-512.png",
       "sizes": "512x512",
       "type": "image/png"
+    },
+    {
+      "src": "icons/Icon-maskable-192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "maskable"
+    },
+    {
+      "src": "icons/Icon-maskable-512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
     }
   ]
 }