Merge remote-tracking branch 'origin/app' into app

# Conflicts:
#	pubspec.yaml

pubspec.yaml

@@ -28,21 +28,23 @@ environment:
 # the latest version available on pub.dev. To see which dependencies have newer
 # versions available, run `flutter pub outdated`.
 dependencies:
-
   flutter:
     sdk: flutter
   flutter_colorpicker: ^1.0.3
   window_manager: ^0.3.7
-  go_router: ^12.0.0
+  adaptive_navigation: ^0.0.4
+  go_router: ^10.1.0
+  provider: 6.0.5
+  url_launcher: ^6.0.7
+  equatable: ^2.0.5
+  url_strategy: ^0.2.0
+  quiver: ^3.1.0
+  path_to_regexp: ^0.4.0
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
-
-  logging: ^1.0.0
-  provider: 6.0.5
-  shared_preferences: ^2.0.11
-  url_launcher: ^6.0.7
-  adaptive_navigation: ^0.0.4
+  toly_menu:
+    path: E:\Projects\Flutter\packages\toly_menu
 
 dev_dependencies:
   flutter_test: