Fixed Page class name duplication

Sugers3 · Apr 9, 2020 · 4b34778 · 4b34778
1 parent f5b7376
commit 4b34778
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [0.3.2]
+- Fixed Page class name duplication
+
 ## [0.3.1]
 - rename AdapterSource’s api 
 - add PureViewComponent 

diff --git a/example/lib/app.dart b/example/lib/app.dart
@@ -1,5 +1,5 @@
 import 'package:fish_redux/fish_redux.dart';
-import 'package:flutter/material.dart' hide Action;
+import 'package:flutter/material.dart' hide Action,Page;
 
 import 'global_store/state.dart';
 import 'global_store/store.dart';

diff --git a/lib/src/redux_component_mixin/keep_alive_mixin.dart b/lib/src/redux_component_mixin/keep_alive_mixin.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart'hide Page;
 
 import '../redux_component/redux_component.dart';
 

diff --git a/lib/src/redux_component_mixin/single_ticker_provider_mixin.dart b/lib/src/redux_component_mixin/single_ticker_provider_mixin.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart'hide Page;
 
 import '../redux_component/redux_component.dart';
 

diff --git a/lib/src/redux_component_mixin/ticker_provider_mixin.dart b/lib/src/redux_component_mixin/ticker_provider_mixin.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart'hide Page;
 
 import '../redux_component/redux_component.dart';
 

diff --git a/lib/src/redux_component_mixin/widgets_binding_observer_mixin.dart b/lib/src/redux_component_mixin/widgets_binding_observer_mixin.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart' hide Action;
+import 'package:flutter/widgets.dart' hide Action,Page;
 
 import '../redux_component/redux_component.dart';
 

diff --git a/lib/src/redux_routes/page_routes.dart b/lib/src/redux_routes/page_routes.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/widgets.dart';
+import 'package:flutter/widgets.dart' hide Page;
 
 import '../redux_component/redux_component.dart';
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: fish_redux
 description: Fish Redux is an assembled flutter application framework based on Redux state management.
-version: 0.3.1
+version: 0.3.2
 author: Alibaba Xianyu Team <tino.wjf@alibaba-inc.com>
 homepage: https://github.com/alibaba/fish-redux
 

diff --git a/test/test_widgets/lib/adapter/adapter.dart b/test/test_widgets/lib/adapter/adapter.dart
@@ -1,5 +1,5 @@
 import 'package:fish_redux/fish_redux.dart';
-import 'package:flutter/material.dart' hide Action;
+import 'package:flutter/material.dart' hide Action,Page;
 
 import 'action.dart';
 import 'state.dart';

diff --git a/test/test_widgets/lib/adapter/page.dart b/test/test_widgets/lib/adapter/page.dart
@@ -1,5 +1,5 @@
 import 'package:fish_redux/fish_redux.dart';
-import 'package:flutter/material.dart' hide Action;
+import 'package:flutter/material.dart' hide Action,Page;
 
 import '../test_base.dart';
 import 'adapter.dart';

diff --git a/test/test_widgets/lib/test_base.dart b/test/test_widgets/lib/test_base.dart
@@ -1,5 +1,5 @@
 import 'package:fish_redux/fish_redux.dart';
-import 'package:flutter/material.dart' hide Action;
+import 'package:flutter/material.dart' hide Action,Page;
 
 @immutable
 class TestStub extends StatefulWidget {