up

Author: hoc081098

analysis_options.yaml

@@ -1,8 +1,4 @@
 include: package:pedantic/analysis_options.1.9.0.yaml
-analyzer:
-  exclude:
-    - "lib/src/generated/*.dart"
-    - "lib/generated/*.dart"
 linter:
   rules:
     - prefer_final_locals

lib/app.dart

@@ -68,7 +68,6 @@ class MyApp extends StatelessWidget {
           brightness: Brightness.dark,
           accentColor: const Color(0xFF00e676),
         ),
-        initialRoute: '/',
         routes: routes,
       ),
     );

lib/main.dart

@@ -13,15 +13,15 @@ import 'package:rx_shared_preferences/rx_shared_preferences.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  DisposeBag.logger = null;
+  // DisposeBag.logger = null;
 
   await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
 
   // construct RemoteDataSource
   const RemoteDataSource remoteDataSource = ApiService();
 
   // construct LocalDataSource
-  RxSharedPreferencesConfigs.logger = null;
+  // RxSharedPreferencesConfigs.logger = null;
   final rxPrefs = RxSharedPreferences.getInstance();
   final LocalDataSource localDataSource = SharedPrefUtil(rxPrefs);
 

lib/pages/home/change_password/change_password_bottomsheet.dart

@@ -18,8 +18,8 @@ class _ChangePasswordBottomSheetState extends State<ChangePasswordBottomSheet>
   AnimationController fadeMessageController;
   Animation<double> messageOpacity;
 
-  StreamSubscription subscription;
-  FocusNode newPasswordFocusNode;
+  StreamSubscription<void> subscription;
+  final newPasswordFocusNode = FocusNode();
 
   @override
   void initState() {
@@ -38,8 +38,6 @@ class _ChangePasswordBottomSheetState extends State<ChangePasswordBottomSheet>
         curve: Curves.bounceIn,
       ),
     );
-
-    newPasswordFocusNode = FocusNode();
   }
 
   @override
@@ -50,21 +48,24 @@ class _ChangePasswordBottomSheetState extends State<ChangePasswordBottomSheet>
         .changePasswordState$
         .listen((state) async {
       if (state.message != null) {
+        final navigatorState = Navigator.of(context);
+
         fadeMessageController.reset();
         await fadeMessageController.forward();
 
         if (state?.error == null) {
-          Navigator.of(context).pop();
+          navigatorState.pop();
         }
       }
     });
   }
 
   @override
   void dispose() {
+    super.dispose();
     subscription.cancel();
     fadeMessageController.dispose();
-    super.dispose();
+    newPasswordFocusNode.dispose();
   }
 
   @override

lib/pages/home/home_page.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
+import 'package:flutter_disposebag/flutter_disposebag.dart';
 import 'package:flutter_provider/flutter_provider.dart';
 import 'package:node_auth/domain/usecases/change_password_use_case.dart';
 import 'package:node_auth/pages/home/change_password/change_password.dart';
@@ -10,6 +11,7 @@ import 'package:node_auth/pages/home/home_profile_widget.dart';
 import 'package:node_auth/pages/login/login.dart';
 import 'package:node_auth/utils/delay.dart';
 import 'package:node_auth/utils/snackbar.dart';
+import 'package:rxdart_ext/rxdart_ext.dart';
 
 class HomePage extends StatefulWidget {
   static const routeName = '/home_page';
@@ -21,11 +23,9 @@ class HomePage extends StatefulWidget {
 }
 
 class _HomePageState extends State<HomePage>
-    with SingleTickerProviderStateMixin<HomePage> {
-  final scaffoldKey = GlobalKey<ScaffoldState>();
+    with SingleTickerProviderStateMixin<HomePage>, DisposeBagMixin {
   AnimationController rotateLogoController;
-
-  StreamSubscription subscription;
+  Object listen;
 
   @override
   void initState() {
@@ -41,14 +41,16 @@ class _HomePageState extends State<HomePage>
   void didChangeDependencies() {
     super.didChangeDependencies();
 
-    subscription ??=
-        BlocProvider.of<HomeBloc>(context).message$.listen(handleMessage);
+    listen ??= BlocProvider.of<HomeBloc>(context)
+        .message$
+        .flatMap(handleMessage)
+        .collect()
+        .disposedBy(bag);
   }
 
   @override
   void dispose() {
     rotateLogoController.dispose();
-    subscription.cancel();
     super.dispose();
   }
 
@@ -58,7 +60,6 @@ class _HomePageState extends State<HomePage>
     final logoSize = MediaQuery.of(context).size.width / 2;
 
     return Scaffold(
-      key: scaffoldKey,
       appBar: AppBar(
         title: Text('Home'),
       ),
@@ -127,28 +128,30 @@ class _HomePageState extends State<HomePage>
     );
   }
 
-  void handleMessage(HomeMessage message) async {
+  Stream<void> handleMessage(HomeMessage message) async* {
     print('[DEBUG] homeBloc message=$message');
 
     if (message is LogoutMessage) {
       if (message is LogoutSuccessMessage) {
-        scaffoldKey.showSnackBar('Logout successfully!');
+        context.showSnackBar('Logout successfully!');
         await delay(1000);
+
+        context.hideCurrentSnackBar();
         await Navigator.of(context).pushNamedAndRemoveUntil(
           LoginPage.routeName,
           (_) => false,
         );
       }
       if (message is LogoutErrorMessage) {
-        scaffoldKey.showSnackBar('Error when logout: ${message.message}');
+        context.showSnackBar('Error when logout: ${message.message}');
       }
     }
     if (message is UpdateAvatarMessage) {
       if (message is UpdateAvatarSuccessMessage) {
-        scaffoldKey.showSnackBar('Upload image successfully!');
+        context.showSnackBar('Upload image successfully!');
       }
       if (message is UpdateAvatarErrorMessage) {
-        scaffoldKey.showSnackBar('Error when upload image: ${message.message}');
+        context.showSnackBar('Error when upload image: ${message.message}');
       }
     }
   }

lib/pages/login/login_page.dart

@@ -1,13 +1,16 @@
-import 'package:disposebag/disposebag.dart';
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
+import 'package:flutter_disposebag/flutter_disposebag.dart';
 import 'package:node_auth/pages/home/home.dart';
 import 'package:node_auth/pages/login/login.dart';
 import 'package:node_auth/pages/register/register.dart';
 import 'package:node_auth/pages/reset_password/reset_password_page.dart';
 import 'package:node_auth/utils/delay.dart';
 import 'package:node_auth/utils/snackbar.dart';
 import 'package:node_auth/widgets/password_textfield.dart';
+import 'package:rxdart_ext/rxdart_ext.dart';
 
 class LoginPage extends StatefulWidget {
   static const routeName = '/login_page';
@@ -19,15 +22,13 @@ class LoginPage extends StatefulWidget {
 }
 
 class _MyLoginPageState extends State<LoginPage>
-    with SingleTickerProviderStateMixin<LoginPage> {
-  final scaffoldKey = GlobalKey<ScaffoldState>();
-  DisposeBag disposeBag;
-
+    with SingleTickerProviderStateMixin<LoginPage>, DisposeBagMixin {
   AnimationController loginButtonController;
   Animation<double> buttonSqueezeAnimation;
+  Object listen;
 
-  FocusNode passwordFocusNode;
-  TextEditingController emailController;
+  final passwordFocusNode = FocusNode();
+  final emailController = TextEditingController();
 
   @override
   void initState() {
@@ -49,45 +50,38 @@ class _MyLoginPageState extends State<LoginPage>
         ),
       ),
     );
-
-    passwordFocusNode = FocusNode();
-    emailController = TextEditingController();
   }
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
 
-    disposeBag ??= () {
-      final loginBloc = BlocProvider.of<LoginBloc>(context);
-      return DisposeBag([
-        loginBloc.message$.listen(handleMessage),
-        loginBloc.isLoading$.listen((isLoading) {
-          if (isLoading) {
-            loginButtonController
-              ..reset()
-              ..forward();
-          } else {
-            loginButtonController.reverse();
-          }
-        })
-      ]);
-    }();
+    listen ??= [
+      context.bloc<LoginBloc>().message$.flatMap(handleMessage).collect(),
+      context.bloc<LoginBloc>().isLoading$.listen((isLoading) {
+        if (isLoading) {
+          loginButtonController
+            ..reset()
+            ..forward();
+        } else {
+          loginButtonController.reverse();
+        }
+      })
+    ].disposedBy(bag);
   }
 
   @override
   void dispose() {
-    loginButtonController.dispose();
-    disposeBag.dispose();
     super.dispose();
+    passwordFocusNode.dispose();
+    loginButtonController.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
     final loginBloc = BlocProvider.of<LoginBloc>(context);
 
     return Scaffold(
-      key: scaffoldKey,
       body: Container(
         decoration: BoxDecoration(
           image: DecorationImage(
@@ -148,17 +142,19 @@ class _MyLoginPageState extends State<LoginPage>
     );
   }
 
-  void handleMessage(message) async {
+  Stream<void> handleMessage(message) async* {
     if (message is LoginSuccessMessage) {
-      scaffoldKey.showSnackBar('Login successfully');
+      context.showSnackBar('Login successfully');
       await delay(1000);
+
+      context.hideCurrentSnackBar();
       await Navigator.of(context).pushReplacementNamed(HomePage.routeName);
     }
     if (message is LoginErrorMessage) {
-      scaffoldKey.showSnackBar(message.message);
+      context.showSnackBar(message.message);
     }
     if (message is InvalidInformationMessage) {
-      scaffoldKey.showSnackBar('Invalid information');
+      context.showSnackBar('Invalid information');
     }
   }
 
@@ -255,6 +251,7 @@ class _MyLoginPageState extends State<LoginPage>
   Widget needAnAccount(LoginBloc loginBloc) {
     return FlatButton(
       onPressed: () async {
+        context.hideCurrentSnackBar();
         final email = await Navigator.pushNamed(
           context,
           RegisterPage.routeName,
@@ -280,6 +277,7 @@ class _MyLoginPageState extends State<LoginPage>
   Widget forgotPassword(LoginBloc loginBloc) {
     return FlatButton(
       onPressed: () async {
+        context.hideCurrentSnackBar();
         final email = await Navigator.pushNamed(
           context,
           ResetPasswordPage.routeName,