update pub lib and support redux epic

Author: CarGuo

ios/Podfile.lock

@@ -18,10 +18,12 @@ PODS:
     - Flutter
   - path_provider (0.0.1):
     - Flutter
+  - path_provider_macos (0.0.1):
+    - Flutter
   - permission_handler (3.2.2):
     - Flutter
   - Reachability (3.2)
-  - share (0.5.2):
+  - share (0.0.1):
     - Flutter
   - shared_preferences (0.0.1):
     - Flutter
@@ -50,6 +52,7 @@ DEPENDENCIES:
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
   - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - share (from `.symlinks/plugins/share/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
@@ -83,6 +86,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/package_info/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
+  path_provider_macos:
+    :path: ".symlinks/plugins/path_provider_macos/ios"
   permission_handler:
     :path: ".symlinks/plugins/permission_handler/ios"
   share:
@@ -113,18 +118,19 @@ SPEC CHECKSUMS:
   fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
   FMDB: 6198a90e7b6900cfc046e6bc0ef6ebb7be9236aa
   package_info: 48b108e75b8802c2d5e126f208ef540561c98aef
-  path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
+  path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
+  path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
   permission_handler: d59f41439f5bc6c4d1005f3355e98f05ddc68ece
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  share: bae0a282aab4483288913fc4dc0b935d4b491f2e
+  share: 0b2c3e82132f5888bccca3351c504d0003b3b410
   shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
   shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
   shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
   sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0
   url_launcher: a1c0cc845906122c4784c542523d8cacbded5626
   url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
   url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
-  webview_flutter: bec7599de6bfbe8008a739aa3ebd7b364ea9d0cd
+  webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96
 
 PODFILE CHECKSUM: 083258d7f5e80b42ea9bfee905fe93049bc04c64
 

lib/page/trend/trend_bloc.dart

@@ -20,7 +20,7 @@ class TrendBloc {
   ///rxdart 实现的 stream
   var _subject = PublishSubject<List<TrendingRepoModel>>();
 
-  Observable<List<TrendingRepoModel>> get stream => _subject.stream;
+  Stream<List<TrendingRepoModel>> get stream => _subject.stream;
 
   ///根据数据库和网络返回数据
   Future<void> requestRefresh(selectTime, selectType) async {

lib/redux/gsy_state.dart

@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:gsy_github_app_flutter/model/User.dart';
 import 'package:gsy_github_app_flutter/redux/login_redux.dart';
-import 'package:gsy_github_app_flutter/redux/middleware/epic_middleware.dart';
 import 'package:gsy_github_app_flutter/redux/user_redux.dart';
 import 'package:gsy_github_app_flutter/redux/theme_redux.dart';
 import 'package:gsy_github_app_flutter/redux/locale_redux.dart';
 import 'package:redux/redux.dart';
 
+import 'middleware/epic_middleware.dart';
+
 /**
  * Redux全局State
  * Created by guoshuyu
@@ -52,9 +53,9 @@ GSYState appReducer(GSYState state, action) {
 }
 
 final List<Middleware<GSYState>> middleware = [
-  EpicMiddleware<GSYState>(UserInfoEpic()),
-  EpicMiddleware<GSYState>(LoginEpic()),
-  EpicMiddleware<GSYState>(OAuthEpic()),
+  EpicMiddleware<GSYState>(loginEpic),
+  EpicMiddleware<GSYState>(userInfoEpic),
+  EpicMiddleware<GSYState>(oauthEpic),
   UserInfoMiddleware(),
   LoginMiddleware(),
 ];

lib/redux/login_redux.dart

@@ -2,12 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:gsy_github_app_flutter/db/sql_manager.dart';
 import 'package:gsy_github_app_flutter/common/dao/user_dao.dart';
 import 'package:gsy_github_app_flutter/redux/gsy_state.dart';
-import 'package:gsy_github_app_flutter/redux/middleware/epic.dart';
-import 'package:gsy_github_app_flutter/redux/middleware/epic_store.dart';
 import 'package:gsy_github_app_flutter/common/utils/common_utils.dart';
 import 'package:gsy_github_app_flutter/common/utils/navigator_utils.dart';
 import 'package:redux/redux.dart';
 import 'package:rxdart/rxdart.dart';
+import 'middleware/epic_store.dart';
 
 /**
  * 登录相关Redux
@@ -71,14 +70,7 @@ class LoginMiddleware implements MiddlewareClass<GSYState> {
   }
 }
 
-class LoginEpic implements EpicClass<GSYState> {
-  @override
-  Stream<dynamic> call(Stream<dynamic> actions, EpicStore<GSYState> store) {
-    return Observable(actions)
-        .whereType<LoginAction>()
-        .switchMap((action) => _loginIn(action, store));
-  }
-
+Stream<dynamic> loginEpic(Stream<dynamic> actions, EpicStore<GSYState> store) {
   Stream<dynamic> _loginIn(
       LoginAction action, EpicStore<GSYState> store) async* {
     CommonUtils.showLoadingDialog(action.context);
@@ -87,21 +79,20 @@ class LoginEpic implements EpicClass<GSYState> {
     Navigator.pop(action.context);
     yield LoginSuccessAction(action.context, (res != null && res.result));
   }
+  return actions
+      .whereType<LoginAction>()
+      .switchMap((action) => _loginIn(action, store));
 }
 
-class OAuthEpic implements EpicClass<GSYState> {
-  @override
-  Stream<dynamic> call(Stream<dynamic> actions, EpicStore<GSYState> store) {
-    return Observable(actions)
-        .whereType<OAuthAction>()
-        .switchMap((action) => _loginIn(action, store));
-  }
-
+Stream<dynamic> oauthEpic(Stream<dynamic> actions, EpicStore<GSYState> store) {
   Stream<dynamic> _loginIn(
       OAuthAction action, EpicStore<GSYState> store) async* {
     CommonUtils.showLoadingDialog(action.context);
     var res = await UserDao.oauth(action.code, store);
     Navigator.pop(action.context);
     yield LoginSuccessAction(action.context, (res != null && res.result));
   }
+  return actions
+      .whereType<OAuthAction>()
+      .switchMap((action) => _loginIn(action, store));
 }

lib/redux/middleware/combine_epics.dart

@@ -1,9 +1,10 @@
 import 'dart:async';
 
-import 'package:gsy_github_app_flutter/redux/middleware/epic.dart';
-import 'package:gsy_github_app_flutter/redux/middleware/epic_store.dart';
 import 'package:rxdart/streams.dart';
 
+import 'epic.dart';
+import 'epic_store.dart';
+
 /// Combines a list of [Epic]s into one.
 ///
 /// Rather than having one massive [Epic] that handles every possible type of
@@ -23,6 +24,7 @@ import 'package:rxdart/streams.dart';
 ///     ]);
 Epic<State> combineEpics<State>(List<Epic<State>> epics) {
   return (Stream<dynamic> actions, EpicStore<State> store) {
-    return new MergeStream<dynamic>(epics.map((epic) => epic(actions, store)));
+    return MergeStream<dynamic>(
+        epics.map((epic) => epic(actions, store)).toList());
   };
 }

lib/redux/middleware/epic.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
-import 'package:gsy_github_app_flutter/redux/middleware/epic_store.dart';
-
+import 'epic_store.dart';
 
 /// A function that transforms one stream of actions into another
 /// stream of actions.
@@ -52,8 +51,10 @@ import 'package:gsy_github_app_flutter/redux/middleware/epic_store.dart';
 ///             .then((results) => new SearchResultsAction(results))
 ///             .catchError((error) => new SearchErrorAction(error)));
 ///     }
-typedef Stream<dynamic> Epic<State>(
-    Stream<dynamic> actions, EpicStore<State> store);
+typedef Epic<State> = Stream<dynamic> Function(
+  Stream<dynamic> actions,
+  EpicStore<State> store,
+);
 
 /// A class that acts as an [Epic], transforming one stream of actions into
 /// another stream of actions. Generally, [Epic] functions are simpler, but
@@ -63,7 +64,7 @@ typedef Stream<dynamic> Epic<State>(
 ///
 ///     class ExampleEpic extends EpicClass<State> {
 ///       @override
-///       Stream<dynamic> map(Stream<dynamic> actions, EpicStore<State> store) {
+///       Stream<dynamic> call(Stream<dynamic> actions, EpicStore<State> store) {
 ///         return actions
 ///           .where((action) => action is PerformSearchAction)
 ///           .asyncMap((action) =>
@@ -117,7 +118,7 @@ class TypedEpic<State, Action> extends EpicClass<State> {
   @override
   Stream<dynamic> call(Stream<dynamic> actions, EpicStore<State> store) {
     return epic(
-      actions.transform(new StreamTransformer<dynamic, Action>.fromHandlers(
+      actions.transform(StreamTransformer<dynamic, Action>.fromHandlers(
         handleData: (dynamic action, EventSink<Action> sink) {
           if (action is Action) {
             sink.add(action);

lib/redux/middleware/epic_middleware.dart

@@ -1,10 +1,11 @@
 import 'dart:async';
 
-import 'package:gsy_github_app_flutter/redux/middleware/epic.dart';
-import 'package:gsy_github_app_flutter/redux/middleware/epic_store.dart';
 import 'package:redux/redux.dart';
 import 'package:rxdart/transformers.dart';
 
+import 'epic.dart';
+import 'epic_store.dart';
+
 /// A [Redux](https://pub.dartlang.org/packages/redux) middleware that passes
 /// a stream of dispatched actions to the given [Epic].
 ///
@@ -19,9 +20,9 @@ import 'package:rxdart/transformers.dart';
 ///       initialState: [], middleware: [epicMiddleware]);
 class EpicMiddleware<State> extends MiddlewareClass<State> {
   final StreamController<dynamic> _actions =
-      new StreamController<dynamic>.broadcast();
+      StreamController<dynamic>.broadcast();
   final StreamController<Epic<State>> _epics =
-      new StreamController.broadcast(sync: true);
+      StreamController.broadcast(sync: true);
 
   final bool supportAsyncGenerators;
   Epic<State> _epic;
@@ -31,12 +32,10 @@ class EpicMiddleware<State> extends MiddlewareClass<State> {
       : _epic = epic;
 
   @override
-  call(Store<State> store, dynamic action, NextDispatcher next) {
+  void call(Store<State> store, dynamic action, NextDispatcher next) {
     if (!_isSubscribed) {
       _epics.stream
-          .transform<dynamic>(
-              new SwitchMapStreamTransformer<Epic<State>, dynamic>(
-                  (epic) => epic(_actions.stream, new EpicStore(store))))
+          .switchMap<dynamic>((epic) => epic(_actions.stream, EpicStore(store)))
           .listen(store.dispatch);
 
       _epics.add(_epic);
@@ -50,7 +49,7 @@ class EpicMiddleware<State> extends MiddlewareClass<State> {
       // Future.delayed is an ugly hack to support async* functions.
       //
       // See: https://github.com/dart-lang/sdk/issues/33818
-      new Future.delayed(Duration.zero, () {
+      Future.delayed(Duration.zero, () {
         _actions.add(action);
       });
     } else {

lib/redux/middleware/epic_store.dart

@@ -16,7 +16,8 @@ class EpicStore<State> {
 
   Stream<State> get onChange => _store.onChange;
 
-  void dispatch(dynamic action) {
-    _store.dispatch(action);
+  /// through to the reducer.
+  dynamic dispatch(dynamic action) {
+    return _store.dispatch(action);
   }
 }

lib/redux/user_redux.dart

@@ -1,11 +1,12 @@
 import 'package:gsy_github_app_flutter/common/dao/user_dao.dart';
 import 'package:gsy_github_app_flutter/model/User.dart';
 import 'package:gsy_github_app_flutter/redux/gsy_state.dart';
-import 'package:gsy_github_app_flutter/redux/middleware/epic.dart';
-import 'package:gsy_github_app_flutter/redux/middleware/epic_store.dart';
 import 'package:redux/redux.dart';
 import 'package:rxdart/rxdart.dart';
 
+import 'middleware/epic_store.dart';
+
+
 /**
  * 用户相关Redux
  * Created by guoshuyu
@@ -33,12 +34,9 @@ class UpdateUserAction {
   UpdateUserAction(this.userInfo);
 }
 
-class FetchUserAction {
-}
-
+class FetchUserAction {}
 
 class UserInfoMiddleware implements MiddlewareClass<GSYState> {
-
   @override
   void call(Store<GSYState> store, dynamic action, NextDispatcher next) {
     if (action is UpdateUserAction) {
@@ -49,21 +47,19 @@ class UserInfoMiddleware implements MiddlewareClass<GSYState> {
   }
 }
 
-class UserInfoEpic implements EpicClass<GSYState> {
-  @override
-  Stream<dynamic> call(Stream<dynamic> actions, EpicStore<GSYState> store) {
-    return Observable(actions)
-        // to UpdateUserAction actions
-        .whereType<FetchUserAction>()
-        // Don't start  until the 10ms
-        .debounce(((_) => TimerStream(true, const Duration(milliseconds: 10))))
-        .switchMap((action) => _loadUserInfo());
-  }
-
+Stream<dynamic> userInfoEpic(
+    Stream<dynamic> actions, EpicStore<GSYState> store) {
   // Use the async* function to make easier
   Stream<dynamic> _loadUserInfo() async* {
     print("*********** userInfoEpic _loadUserInfo ***********");
     var res = await UserDao.getUserInfo(null);
     yield UpdateUserAction(res.data);
   }
-}
+
+  return actions
+      // to UpdateUserAction actions
+      .whereType<FetchUserAction>()
+      // Don't start  until the 10ms
+      .debounce(((_) => TimerStream(true, const Duration(milliseconds: 10))))
+      .switchMap((action) => _loadUserInfo());
+}