update deps and fix lints

Author: hoc081098

analysis_options.yaml

@@ -1,8 +1,8 @@
 include: package:flutter_lints/flutter.yaml
 analyzer:
-  strong-mode:
-    implicit-casts: false
-    implicit-dynamic: false
+  language:
+    strict-casts: true
+    strict-raw-types: true
 linter:
   rules:
     - public_member_api_docs

example/lib/bloc_with_deps.dart

@@ -1,7 +1,7 @@
-// ignore_for_file: avoid_print
-
 import 'dart:async';
 
+import 'package:disposebag/disposebag.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
 import 'package:rxdart_ext/rxdart_ext.dart';
 
@@ -11,14 +11,14 @@ class Dependencies {
   var _i = 0;
 
   Dependencies() {
-    print('$this::init');
+    debugPrint('$this::init');
   }
 
   Future<String> loadSomething() =>
       Future.delayed(const Duration(milliseconds: 500), () => 'String ${_i++}');
 
   void dispose() {
-    print('$this::dispose');
+    debugPrint('$this::dispose');
   }
 }
 
@@ -34,21 +34,15 @@ class Bloc1 extends DisposeCallbackBaseBloc {
   }) : super(dispose);
 
   factory Bloc1(Dependencies dependencies) {
-    // ignore: close_sinks
     final loadS = StreamController<void>();
 
     final string$ = loadS.stream
         .switchMap((value) => Rx.fromCallable(dependencies.loadSomething))
         .cast<String?>()
         .publishState(null);
-    final connection = string$.connect();
 
     return Bloc1._(
-      dispose: () async {
-        await connection.cancel();
-        await loadS.close();
-        print('Bloc1::disposed');
-      },
+      dispose: DisposeBag([loadS, string$.connect()]).dispose,
       load: () => loadS.add(null),
       string$: string$,
     );
@@ -57,11 +51,11 @@ class Bloc1 extends DisposeCallbackBaseBloc {
 
 class Bloc2 implements BaseBloc {
   Bloc2(CounterBloc bloc) {
-    print('$this::init with counter bloc $bloc');
+    debugPrint('$this::init with counter bloc $bloc');
   }
 
   @override
   void dispose() {
-    print('$this::dispose');
+    debugPrint('$this::dispose');
   }
 }

example/lib/counter_bloc.dart

@@ -1,7 +1,6 @@
-// ignore_for_file: avoid_print
-
 import 'dart:async';
 
+import 'package:disposebag/disposebag.dart';
 import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
 import 'package:rxdart_ext/rxdart_ext.dart';
 
@@ -19,22 +18,16 @@ class CounterBloc extends DisposeCallbackBaseBloc {
   }) : super(dispose);
 
   factory CounterBloc() {
-    // ignore: close_sinks
     final incrementController = StreamController<void>();
 
-    final state = incrementController.stream
+    final state$ = incrementController.stream
         .scan<int>((acc, _, __) => acc + 1, 0)
         .publishState(0);
-    final connection = state.connect();
 
     return CounterBloc._(
-      dispose: () async {
-        await connection.cancel();
-        await incrementController.close();
-        print('CounterBloc::disposed');
-      },
-      increment: () => incrementController.add(null),
-      state: state,
+      dispose: DisposeBag([incrementController, state$.connect()]).dispose,
+      increment: incrementController.addNull,
+      state: state$,
     );
   }
 }

example/lib/main.dart

@@ -12,7 +12,7 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -29,7 +29,7 @@ class MyApp extends StatelessWidget {
 }
 
 class StartPage extends StatelessWidget {
-  const StartPage({Key? key}) : super(key: key);
+  const StartPage({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -62,7 +62,7 @@ class StartPage extends StatelessWidget {
 }
 
 class MyHomePage extends StatefulWidget {
-  const MyHomePage({Key? key}) : super(key: key);
+  const MyHomePage({super.key});
 
   @override
   State<MyHomePage> createState() => _MyHomePageState();
@@ -80,12 +80,12 @@ class _MyHomePageState extends State<MyHomePage> {
           mainAxisAlignment: MainAxisAlignment.center,
           children: <Widget>[
             const Text('You have pushed the button this many times:'),
-            const SizedBox(height: 8),
+            const SizedBox(height: 16),
             const TextCounter1(),
             const TextCounter2(),
-            const SizedBox(height: 8),
+            const SizedBox(height: 16),
             const TextBloc1(),
-            const SizedBox(height: 8),
+            const SizedBox(height: 16),
             ElevatedButton(
               onPressed: () => context.bloc<Bloc2>(),
               child: const Text('Access Bloc 2'),
@@ -99,7 +99,7 @@ class _MyHomePageState extends State<MyHomePage> {
 }
 
 class TextCounter1 extends StatelessWidget {
-  const TextCounter1({Key? key}) : super(key: key);
+  const TextCounter1({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -110,15 +110,15 @@ class TextCounter1 extends StatelessWidget {
       builder: (context, state) {
         return Text(
           'COUNTER 1: $state',
-          style: Theme.of(context).textTheme.headline6,
+          style: Theme.of(context).textTheme.titleLarge,
         );
       },
     );
   }
 }
 
 class TextCounter2 extends StatelessWidget {
-  const TextCounter2({Key? key}) : super(key: key);
+  const TextCounter2({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -129,15 +129,15 @@ class TextCounter2 extends StatelessWidget {
       builder: (context, state) {
         return Text(
           'COUNTER 2: $state',
-          style: Theme.of(context).textTheme.headline6,
+          style: Theme.of(context).textTheme.titleLarge,
         );
       },
     );
   }
 }
 
 class IncrementButton extends StatelessWidget {
-  const IncrementButton({Key? key}) : super(key: key);
+  const IncrementButton({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -152,7 +152,7 @@ class IncrementButton extends StatelessWidget {
 }
 
 class TextBloc1 extends StatelessWidget {
-  const TextBloc1({Key? key}) : super(key: key);
+  const TextBloc1({super.key});
 
   @override
   Widget build(BuildContext context) {