Update dependencies

Author: hoc081098

.flutter-plugins-dependencies

@@ -0,0 +1 @@
+{"_info":"// This is a generated file; do not edit or check into version control.","dependencyGraph":[{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]}]}

.idea/libraries/Dart_Packages.xml

@@ -0,0 +1,10 @@
+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=C:\flutter\flutter"
+export "FLUTTER_APPLICATION_PATH=E:\Admin\Documents\Android\search-book"
+export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build\ios"
+export "FLUTTER_FRAMEWORK_DIR=C:\flutter\flutter\bin\cache\artifacts\engine\ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"

.idea/libraries/Flutter_Plugins.xml

@@ -7,10 +7,12 @@ import 'package:flutter/material.dart';
 // ignore_for_file: camel_case_types
 // ignore_for_file: prefer_single_quotes
 
-//This file is automatically generated. DO NOT EDIT, all your changes would be lost.
+// This file is automatically generated. DO NOT EDIT, all your changes would be lost.
 class S implements WidgetsLocalizations {
   const S();
 
+  static S current;
+
   static const GeneratedLocalizationsDelegate delegate =
     GeneratedLocalizationsDelegate();
 
@@ -34,24 +36,49 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate<S> {
     ];
   }
 
-  LocaleListResolutionCallback listResolution({Locale fallback}) {
+  LocaleListResolutionCallback listResolution({Locale fallback, bool withCountry = true}) {
     return (List<Locale> locales, Iterable<Locale> supported) {
       if (locales == null || locales.isEmpty) {
         return fallback ?? supported.first;
       } else {
-        return _resolve(locales.first, fallback, supported);
+        return _resolve(locales.first, fallback, supported, withCountry);
       }
     };
   }
 
-  LocaleResolutionCallback resolution({Locale fallback}) {
+  LocaleResolutionCallback resolution({Locale fallback, bool withCountry = true}) {
     return (Locale locale, Iterable<Locale> supported) {
-      return _resolve(locale, fallback, supported);
+      return _resolve(locale, fallback, supported, withCountry);
     };
   }
 
-  Locale _resolve(Locale locale, Locale fallback, Iterable<Locale> supported) {
-    if (locale == null || !isSupported(locale)) {
+  @override
+  Future<S> load(Locale locale) {
+    final String lang = getLang(locale);
+    if (lang != null) {
+      switch (lang) {
+        case "en":
+          S.current = const $en();
+          return SynchronousFuture<S>(S.current);
+        default:
+          // NO-OP.
+      }
+    }
+    S.current = const S();
+    return SynchronousFuture<S>(S.current);
+  }
+
+  @override
+  bool isSupported(Locale locale) => _isSupported(locale, true);
+
+  @override
+  bool shouldReload(GeneratedLocalizationsDelegate old) => false;
+
+  ///
+  /// Internal method to resolve a locale from a list of locales.
+  ///
+  Locale _resolve(Locale locale, Locale fallback, Iterable<Locale> supported, bool withCountry) {
+    if (locale == null || !_isSupported(locale, withCountry)) {
       return fallback ?? supported.first;
     }
 
@@ -66,26 +93,30 @@ class GeneratedLocalizationsDelegate extends LocalizationsDelegate<S> {
     }
   }
 
-  @override
-  Future<S> load(Locale locale) {
-    final String lang = getLang(locale);
-    if (lang != null) {
-      switch (lang) {
-        case "en":
-          return SynchronousFuture<S>(const $en());
-        default:
-          // NO-OP.
+  ///
+  /// Returns true if the specified locale is supported, false otherwise.
+  ///
+  bool _isSupported(Locale locale, bool withCountry) {
+    if (locale != null) {
+      for (Locale supportedLocale in supportedLocales) {
+        // Language must always match both locales.
+        if (supportedLocale.languageCode != locale.languageCode) {
+          continue;
+        }
+
+        // If country code matches, return this locale.
+        if (supportedLocale.countryCode == locale.countryCode) {
+          return true;
+        }
+
+        // If no country requirement is requested, check if this locale has no country.
+        if (true != withCountry && (supportedLocale.countryCode == null || supportedLocale.countryCode.isEmpty)) {
+          return true;
+        }
       }
     }
-    return SynchronousFuture<S>(const S());
+    return false;
   }
-
-  @override
-  bool isSupported(Locale locale) =>
-    locale != null && supportedLocales.contains(locale);
-
-  @override
-  bool shouldReload(GeneratedLocalizationsDelegate old) => false;
 }
 
 String getLang(Locale l) => l == null

.idea/workspace.xml

@@ -43,6 +43,8 @@ class CustomBuiltValueToStringHelper implements BuiltValueToStringHelper {
 }
 
 void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
   newBuiltValueToStringHelper =
       (className) => CustomBuiltValueToStringHelper(className);
 

ios/Flutter/flutter_export_environment.sh

@@ -2,32 +2,26 @@ import 'dart:async';
 
 import 'package:built_collection/built_collection.dart';
 import 'package:disposebag/disposebag.dart';
+import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
+import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
+import 'package:rxdart/rxdart.dart';
 import 'package:search_book/domain/book.dart';
 import 'package:search_book/domain/book_repo.dart';
 import 'package:search_book/pages/detail_page/detail_state.dart';
 import 'package:search_book/shared_pref.dart';
-import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
-import 'package:rxdart/rxdart.dart';
-import 'package:distinct_value_connectable_observable/distinct_value_connectable_observable.dart';
 
 // ignore_for_file: close_sinks
 
 class DetailBloc implements BaseBloc {
-  ///
-  ///
-  ///
-  final ValueObservable<BookDetailState> bookDetail$;
+  /// Outputs
+  final ValueStream<BookDetailState> bookDetail$;
   final Stream<Object> error$;
 
-  ///
-  ///
-  ///
+  /// Inputs
   final Future<void> Function() refresh;
   final void Function() toggleFavorited;
 
-  ///
   /// Clean up resource
-  ///
   final void Function() _dispose;
 
   DetailBloc._(
@@ -47,6 +41,7 @@ class DetailBloc implements BaseBloc {
     assert(sharedPref != null);
     assert(initial != null);
 
+    /// Controllers
     final refreshController = PublishSubject<Completer>();
     final errorController = PublishSubject<Object>();
     final toggleController = PublishSubject<void>();
@@ -63,7 +58,7 @@ class DetailBloc implements BaseBloc {
       },
     ).startWith(initial);
 
-    final state$ = Observable.combineLatest2(
+    final state$ = Rx.combineLatest2(
       book$,
       sharedPref.favoritedIds$,
       (Book book, BuiltSet<String> ids) {
@@ -72,25 +67,18 @@ class DetailBloc implements BaseBloc {
           ids.contains(book.id),
         );
       },
-    );
-
-    final bookDetail$ = publishValueSeededDistinct(
-      state$,
-      seedValue: BookDetailState.fromDomain(initial),
-    );
-
-    ///
-    ///
-    ///
+    ).publishValueSeededDistinct(
+        seedValue: BookDetailState.fromDomain(initial));
 
+    /// DisposeBag
     final bag = DisposeBag(
       [
         toggleController
             .throttleTime(const Duration(milliseconds: 600))
             .listen((_) => sharedPref.toggleFavorite(initial.id)),
-        bookDetail$.listen((book) => print('[DETAIL] book=$book')),
+        state$.listen((book) => print('[DETAIL] book=$book')),
         //
-        bookDetail$.connect(),
+        state$.connect(),
         //
         refreshController,
         errorController,
@@ -101,7 +89,7 @@ class DetailBloc implements BaseBloc {
     print('[DETAIL] new id=${initial.id}');
 
     return DetailBloc._(
-      bookDetail$,
+      state$,
       errorController,
       () {
         final completer = Completer<void>();

lib/generated/i18n.dart

@@ -2,18 +2,20 @@ import 'dart:async';
 
 import 'package:built_collection/built_collection.dart';
 import 'package:disposebag/disposebag.dart';
+import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
+import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
+import 'package:rxdart/rxdart.dart';
 import 'package:search_book/domain/book_repo.dart';
 import 'package:search_book/domain/cache_policy.dart';
 import 'package:search_book/pages/fav_page/fav_books_state.dart';
 import 'package:search_book/shared_pref.dart';
-import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
-import 'package:distinct_value_connectable_observable/distinct_value_connectable_observable.dart';
-import 'package:rxdart/rxdart.dart';
 import 'package:tuple/tuple.dart';
 
+// ignore_for_file: close_sinks
+
 class FavBooksInteractor {
   final BookRepo _bookRepo;
-  final ValueObservable<BuiltSet<String>> favoritedIds$;
+  final ValueStream<BuiltSet<String>> favoritedIds$;
   final void Function(String) toggleFavorite;
 
   FavBooksInteractor(this._bookRepo, SharedPref _sharedPref)
@@ -27,14 +29,14 @@ class FavBooksInteractor {
     bool forceUpdate = false,
     Completer<void> completer,
   ]) {
-    return Observable.fromIterable(ids)
+    return Stream.fromIterable(ids)
         .flatMap((id) {
           final stream = _bookRepo.getBookBy(
             id: id,
             cachePolicy:
                 forceUpdate ? CachePolicy.networkOnly : CachePolicy.localFirst,
           );
-          return Observable(stream)
+          return stream
               .map<FavBookPartialChange>((book) => LoadedFavBookChange(book))
               .onErrorReturnWith((e) => ErrorFavBookChange(e));
         })
@@ -43,23 +45,15 @@ class FavBooksInteractor {
   }
 }
 
-// ignore_for_file: close_sinks
-
 class FavBooksBloc implements BaseBloc {
-  ///
-  ///
-  ///
+  /// Inputs
   final void Function(String) removeFavorite;
   final Future<void> Function() refresh;
 
-  ///
-  ///
-  ///
-  final ValueObservable<FavBooksState> state$;
+  /// Outputs
+  final ValueStream<FavBooksState> state$;
 
-  ///
-  ///
-  ///
+  /// Clean up resources
   final void Function() _dispose;
 
   FavBooksBloc._(
@@ -75,32 +69,29 @@ class FavBooksBloc implements BaseBloc {
   factory FavBooksBloc(final FavBooksInteractor interactor) {
     assert(interactor != null, 'interactor cannot be null');
 
+    /// Controllers
     final removeFavoriteController = PublishSubject<String>();
     final refreshController = PublishSubject<Completer<void>>();
 
-    final state$ = publishValueSeededDistinct(
-      Observable.merge(
-        [
-          interactor.favoritedIds$.switchMap(interactor.partialChanges),
-          refreshController
-              .withLatestFrom(
-                interactor.favoritedIds$,
-                (Completer<void> completer, BuiltSet<String> ids) =>
-                    Tuple2(completer, ids),
-              )
-              .exhaustMap((tuple2) =>
-                  interactor.partialChanges(tuple2.item2, true, tuple2.item1)),
-        ],
-      )
-          .doOnData((change) => print('[FAV_BOOKS] change=$change'))
-          .scan(_reducer, FavBooksState.initial()),
-      seedValue: FavBooksState.initial(),
-    );
-
-    ///
-    ///
-    ///
+    /// State stream
+    final state$ = Rx.merge(
+      [
+        interactor.favoritedIds$.switchMap(interactor.partialChanges),
+        refreshController
+            .withLatestFrom(
+              interactor.favoritedIds$,
+              (Completer<void> completer, BuiltSet<String> ids) =>
+                  Tuple2(completer, ids),
+            )
+            .exhaustMap((tuple2) =>
+                interactor.partialChanges(tuple2.item2, true, tuple2.item1)),
+      ],
+    )
+        .doOnData((change) => print('[FAV_BOOKS] change=$change'))
+        .scan(_reducer, FavBooksState.initial())
+        .publishValueSeededDistinct(seedValue: FavBooksState.initial());
 
+    /// DisposeBag
     final bag = DisposeBag(
       [
         refreshController,