fixed

hoc081098 · hoc081098 · commit 81330e52416a · 2021-06-08T17:15:09.000+07:00
diff --git a/lib/app.dart b/lib/app.dart
@@ -69,6 +69,7 @@ class MyApp extends StatelessWidget {
           accentColor: const Color(0xFF00e676),
         ),
         routes: routes,
+        debugShowCheckedModeBanner: false,
       ),
     );
   }
diff --git a/lib/data/user_repository_imp.dart b/lib/data/user_repository_imp.dart
@@ -175,9 +175,7 @@ class UserRepositoryImpl implements UserRepository {
   ///
   Single<Result<T>> _execute<T>(Future<T> Function() factory) =>
       Single.fromCallable(factory)
-          .doOnError(
-              _handleUnauthenticatedError) // TODO(single): remove singleOrError
-          .singleOrError()
+          .doOnError(_handleUnauthenticatedError)
           .map<Result<T>>((value) => Success<T>(value))
           .onErrorReturnWith(_errorToResult);
 
diff --git a/lib/domain/usecases/change_password_use_case.dart b/lib/domain/usecases/change_password_use_case.dart
@@ -6,7 +6,7 @@ class ChangePasswordUseCase {
 
   const ChangePasswordUseCase(this._userRepository);
 
-  Stream<Result<void>> call({
+  Stream<Result_Unit> call({
     required String password,
     required String newPassword,
   }) =>
diff --git a/lib/domain/usecases/login_use_case.dart b/lib/domain/usecases/login_use_case.dart
@@ -6,7 +6,7 @@ class LoginUseCase {
 
   const LoginUseCase(this._userRepository);
 
-  Stream<Result<void>> call({
+  Stream<Result_Unit> call({
     required String email,
     required String password,
   }) =>
diff --git a/lib/domain/usecases/logout_use_case.dart b/lib/domain/usecases/logout_use_case.dart
@@ -6,5 +6,5 @@ class LogoutUseCase {
 
   const LogoutUseCase(this._userRepository);
 
-  Stream<Result<void>> call() => _userRepository.logout();
+  Stream<Result_Unit> call() => _userRepository.logout();
 }
diff --git a/lib/domain/usecases/register_use_case.dart b/lib/domain/usecases/register_use_case.dart
@@ -6,7 +6,7 @@ class RegisterUseCase {
 
   const RegisterUseCase(this._userRepository);
 
-  Stream<Result<void>> call({
+  Stream<Result_Unit> call({
     required String name,
     required String email,
     required String password,
diff --git a/lib/domain/usecases/reset_password_use_case.dart b/lib/domain/usecases/reset_password_use_case.dart
@@ -6,7 +6,7 @@ class ResetPasswordUseCase {
 
   const ResetPasswordUseCase(this._userRepository);
 
-  Stream<Result<void>> call({
+  Stream<Result_Unit> call({
     required String email,
     required String token,
     required String newPassword,
diff --git a/lib/domain/usecases/send_reset_password_email_use_case.dart b/lib/domain/usecases/send_reset_password_email_use_case.dart
@@ -6,6 +6,6 @@ class SendResetPasswordEmailUseCase {
 
   const SendResetPasswordEmailUseCase(this._userRepository);
 
-  Stream<Result<void>> call(String email) =>
+  Stream<Result_Unit> call(String email) =>
       _userRepository.sendResetPasswordEmail(email);
 }
diff --git a/lib/domain/usecases/upload_image_use_case.dart b/lib/domain/usecases/upload_image_use_case.dart
@@ -8,5 +8,5 @@ class UploadImageUseCase {
 
   const UploadImageUseCase(this._userRepository);
 
-  Stream<Result<void>> call(File image) => _userRepository.uploadImage(image);
+  Stream<Result_Unit> call(File image) => _userRepository.uploadImage(image);
 }
diff --git a/lib/pages/home/change_password/change_password_bloc.dart b/lib/pages/home/change_password/change_password_bloc.dart
@@ -9,6 +9,7 @@ import 'package:node_auth/utils/result.dart';
 import 'package:node_auth/utils/streams.dart';
 import 'package:node_auth/utils/type_defs.dart';
 import 'package:rxdart/rxdart.dart';
+import 'package:rxdart_ext/rxdart_ext.dart';
 import 'package:tuple/tuple.dart';
 
 bool _isValidPassword(String password) {
@@ -66,6 +67,7 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
 
     final changePasswordState$ = submitChangePasswordS.stream
         .withLatestFrom(isValidSubmit$, (_, bool isValid) => isValid)
+        .debug()
         .where((isValid) => isValid)
         .withLatestFrom(both$, (_, Tuple2<String, String> both) => both)
         .exhaustMap((both) => _performChangePassword(changePassword, both))
@@ -116,7 +118,11 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
     }.debug();
 
     return ChangePasswordBloc._(
-      dispose: DisposeBag([...subscriptions, ...controllers]).dispose,
+      dispose: DisposeBag([
+        ...subscriptions,
+        ...controllers,
+        changePasswordState$.connect(),
+      ]).dispose,
       changePassword: () => submitChangePasswordS.add(null),
       changePasswordState$: changePasswordState$,
       passwordChanged: passwordS.add,
@@ -132,7 +138,7 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
   ) {
     print('[DEBUG] change password both=$both');
 
-    ChangePasswordState resultToState(Result<void> result) {
+    ChangePasswordState resultToState(Result_Unit result) {
       print('[DEBUG] change password result=$result');
 
       return result.fold(
diff --git a/lib/pages/home/change_password/change_password_bottomsheet.dart b/lib/pages/home/change_password/change_password_bottomsheet.dart
@@ -106,10 +106,10 @@ class _ChangePasswordBottomSheetState extends State<ChangePasswordBottomSheet>
       },
     );
 
-    final messageText = StreamBuilder<ChangePasswordState>(
+    final messageText = RxStreamBuilder<ChangePasswordState>(
       stream: changePasswordBloc.changePasswordState$,
-      builder: (context, snapshot) {
-        final message = snapshot.data?.message;
+      builder: (context, state) {
+        final message = state.message;
         if (message != null) {
           return Padding(
             padding: const EdgeInsets.all(8.0),
@@ -132,7 +132,7 @@ class _ChangePasswordBottomSheetState extends State<ChangePasswordBottomSheet>
     final changePasswordButton = RxStreamBuilder<ChangePasswordState>(
       stream: changePasswordBloc.changePasswordState$,
       builder: (context, state) {
-        if (state.isLoading) {
+        if (!state.isLoading) {
           return ElevatedButton(
             style: ElevatedButton.styleFrom(
               padding: const EdgeInsets.all(12),
diff --git a/lib/pages/home/home_bloc.dart b/lib/pages/home/home_bloc.dart
@@ -75,14 +75,14 @@ class HomeBloc extends DisposeCallbackBaseBloc {
     );
   }
 
-  static LogoutMessage _resultToLogoutMessage(Result<void> result) {
+  static LogoutMessage _resultToLogoutMessage(Result_Unit result) {
     return result.fold(
       (value) => const LogoutSuccessMessage(),
       (error, message) => LogoutErrorMessage(message, error),
     );
   }
 
-  static UpdateAvatarMessage _resultToChangeAvatarMessage(Result<void> result) {
+  static UpdateAvatarMessage _resultToChangeAvatarMessage(Result_Unit result) {
     return result.fold(
       (value) => const UpdateAvatarSuccessMessage(),
       (error, message) => UpdateAvatarErrorMessage(message, error),
diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart
@@ -70,7 +70,7 @@ class _HomePageState extends State<HomePage>
             image: AssetImage('assets/bg.jpg'),
             fit: BoxFit.cover,
             colorFilter: ColorFilter.mode(
-              Colors.black.withAlpha(0xBF),
+              Colors.black.withOpacity(0.5),
               BlendMode.darken,
             ),
           ),
@@ -79,7 +79,7 @@ class _HomePageState extends State<HomePage>
           children: <Widget>[
             const HomeUserProfile(),
             Container(
-              height: 48.0,
+              height: 54.0,
               margin: EdgeInsets.only(left: 8.0, right: 8.0, top: 16.0),
               width: double.infinity,
               child: ElevatedButton.icon(
@@ -92,7 +92,7 @@ class _HomePageState extends State<HomePage>
               ),
             ),
             Container(
-              height: 48.0,
+              height: 54.0,
               margin: EdgeInsets.only(left: 8.0, right: 8.0, top: 16.0),
               width: double.infinity,
               child: ElevatedButton.icon(
@@ -104,6 +104,7 @@ class _HomePageState extends State<HomePage>
                 ),
               ),
             ),
+            const SizedBox(height: 8),
             Center(
               child: Padding(
                 padding: const EdgeInsets.all(16.0),
@@ -116,6 +117,7 @@ class _HomePageState extends State<HomePage>
                 ),
               ),
             ),
+            const SizedBox(height: 8),
             Center(
               child: RotationTransition(
                 turns: rotateLogoController,
diff --git a/lib/pages/login/login_bloc.dart b/lib/pages/login/login_bloc.dart
@@ -126,7 +126,7 @@ class LoginBloc extends DisposeCallbackBaseBloc {
     );
   }
 
-  static LoginMessage _responseToMessage(Result<void> result) {
+  static LoginMessage _responseToMessage(Result_Unit result) {
     return result.fold(
       (value) => const LoginSuccessMessage(),
       (error, message) => LoginErrorMessage(message, error),
diff --git a/lib/pages/register/register_bloc.dart b/lib/pages/register/register_bloc.dart
@@ -147,7 +147,7 @@ class RegisterBloc extends DisposeCallbackBaseBloc {
     );
   }
 
-  static RegisterMessage _responseToMessage(Result<void> result, String email) {
+  static RegisterMessage _responseToMessage(Result_Unit result, String email) {
     return result.fold(
       (value) => RegisterSuccessMessage(email),
       (error, message) => RegisterErrorMessage(message, error),
diff --git a/lib/utils/result.dart b/lib/utils/result.dart
@@ -80,12 +80,13 @@ extension UnitSingleResultExtension<T> on Single<Result<T>> {
   Single_Result_Unit asUnit() => map(
         (r) => r.fold(
           (_) => Success<Unit>(unit),
-          (error, message) => r as Result<Unit>,
+          (error, message) => r as Failure,
         ),
       );
 }
 
-typedef Single_Result_Unit = Single<Result<Unit>>;
+typedef Result_Unit = Result<Unit>;
+typedef Single_Result_Unit = Single<Result_Unit>;
 
 class Unit {
   const Unit._();
diff --git a/pubspec.lock b/pubspec.lock
@@ -316,7 +316,7 @@ packages:
       name: image_picker
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.7.5+3"
+    version: "0.8.0+1"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -503,8 +503,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: b2c19235776bb50af60bc1f029766ee68f4f61c6
-      resolved-ref: b2c19235776bb50af60bc1f029766ee68f4f61c6
+      ref: "61ab80610903916556d8f2cf9d0055c23f05bb91"
+      resolved-ref: "61ab80610903916556d8f2cf9d0055c23f05bb91"
       url: "https://github.com/hoc081098/rxdart_ext.git"
     source: git
     version: "0.1.1-dev.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   built_value: ^8.0.6
   tuple: ^2.0.0
   rxdart: ^0.27.1
-  image_picker: ^0.7.5+3
+  image_picker: ^0.8.0+1
   shared_preferences: ^2.0.6
   octo_image: ^1.0.0+1
 
@@ -43,7 +43,7 @@ dependency_overrides:
   rxdart_ext:
     git:
       url: https://github.com/hoc081098/rxdart_ext.git
-      ref: b2c19235776bb50af60bc1f029766ee68f4f61c6
+      ref: 61ab80610903916556d8f2cf9d0055c23f05bb91
 
 flutter:
   uses-material-design: true

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ class MyApp extends StatelessWidget {`
`69`	`69`	`accentColor: const Color(0xFF00e676),`
`70`	`70`	`),`
`71`	`71`	`routes: routes,`
	`72`	`+ debugShowCheckedModeBanner: false,`
`72`	`73`	`),`
`73`	`74`	`);`
`74`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@ class LogoutUseCase {`
`6`	`6`
`7`	`7`	`const LogoutUseCase(this._userRepository);`
`8`	`8`
`9`		`- Stream<Result<void>> call() => _userRepository.logout();`
	`9`	`+ Stream<Result_Unit> call() => _userRepository.logout();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ class SendResetPasswordEmailUseCase {`
`6`	`6`
`7`	`7`	`const SendResetPasswordEmailUseCase(this._userRepository);`
`8`	`8`
`9`		`- Stream<Result<void>> call(String email) =>`
	`9`	`+ Stream<Result_Unit> call(String email) =>`
`10`	`10`	`_userRepository.sendResetPasswordEmail(email);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@ class UploadImageUseCase {`
`8`	`8`
`9`	`9`	`const UploadImageUseCase(this._userRepository);`
`10`	`10`
`11`		`- Stream<Result<void>> call(File image) => _userRepository.uploadImage(image);`
	`11`	`+ Stream<Result_Unit> call(File image) => _userRepository.uploadImage(image);`
`12`	`12`	`}`