Fixed push with Generic types

darwin-morocho · Feb 10, 2021 · e72b10f · e72b10f
1 parent 05b3e34
commit e72b10f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/docs/home.md b/docs/home.md
@@ -28,7 +28,7 @@ Add the following to your pubspec.yaml
 ```yaml
 dependencies:
   meedu: ^0.5.4
-  flutter_meedu: ^1.1.1
+  flutter_meedu: ^1.1.2
 ```
 
 Now you're ready to use **flutter_meedu**
diff --git a/packages/flutter_meedu/CHANGELOG.md b/packages/flutter_meedu/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [1.1.2]
+- Fixed push with Generic types.
+
 ## [1.1.1]
 - Updated meedu: ^0.5.4.
 

diff --git a/packages/flutter_meedu/example/pubspec.lock b/packages/flutter_meedu/example/pubspec.lock
@@ -75,7 +75,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.1.1"
+    version: "1.1.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter

diff --git a/packages/flutter_meedu/lib/src/router/meedu_page_route.dart b/packages/flutter_meedu/lib/src/router/meedu_page_route.dart
@@ -6,7 +6,7 @@ import 'transitions/right_to_left.dart';
 import 'transition.dart';
 import 'transitions/up_to_down.dart';
 
-class MeeduPageRoute extends PageRoute {
+class MeeduPageRoute<T> extends PageRoute<T> {
   final Duration transitionDuration;
   final bool maintainState;
   final Color barrierColor;

diff --git a/packages/flutter_meedu/lib/src/router/router.dart b/packages/flutter_meedu/lib/src/router/router.dart
@@ -33,8 +33,8 @@ Future<T> push<T>(
   Duration transitionDuration = const Duration(milliseconds: 300),
   bool backGestureEnabled = false,
 }) {
-  return _state.push(
-    getRoute(
+  return _state.push<T>(
+    getRoute<T>(
       page,
       arguments: arguments,
       maintainState: maintainState,

diff --git a/packages/flutter_meedu/lib/src/router/utils.dart b/packages/flutter_meedu/lib/src/router/utils.dart
@@ -5,7 +5,7 @@ import 'navigator.dart';
 import 'transition.dart';
 
 /// get the transition
-Route getRoute(
+Route<T> getRoute<T>(
   Widget page, {
   Object arguments,
   bool maintainState = true,
@@ -27,22 +27,22 @@ Route getRoute(
 
   switch (_transition) {
     case Transition.material:
-      return MaterialPageRoute(
+      return MaterialPageRoute<T>(
         builder: (_) => page,
         maintainState: maintainState,
         fullscreenDialog: fullscreenDialog,
         settings: settings,
       );
     case Transition.cupertino:
-      return CupertinoPageRoute(
+      return CupertinoPageRoute<T>(
         builder: (_) => page,
         maintainState: maintainState,
         fullscreenDialog: fullscreenDialog,
         settings: settings,
       );
 
     default:
-      return MeeduPageRoute(
+      return MeeduPageRoute<T>(
         page,
         settings: settings,
         maintainState: maintainState,

diff --git a/packages/flutter_meedu/pubspec.yaml b/packages/flutter_meedu/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_meedu
 description: A simple State Managment, Dependency Injection, Reactive programming and Navigation for Flutter apps.
-version: 1.1.1
+version: 1.1.2
 homepage: https://github.com/darwin-morocho/flutter-meedu/tree/master/packages/flutter_meedu
 documentation: https://flutter.meedu.app