Skip to content

Commit 225d619

Browse files
committed
chore: updated
1 parent 1a85709 commit 225d619

File tree

7 files changed

+114
-82
lines changed

7 files changed

+114
-82
lines changed

analysis_options.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
include: package:pedantic/analysis_options.1.9.0.yaml
22
analyzer:
33
exclude:
4-
# Ignore generated files
5-
- '**/*.g.dart'
6-
- 'lib/src/generated/*.dart'
7-
- 'lib/generated/*.dart'
4+
- "lib/src/generated/*.dart"
5+
- "lib/generated/*.dart"
86
linter:
97
rules:
108
- prefer_final_locals

lib/main.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ void main() async {
2828
const RemoteDataSource remoteDataSource = ApiService();
2929

3030
// construct LocalDataSource
31+
RxSharedPreferencesConfigs.logger = null;
3132
final rxPrefs = RxSharedPreferences.getInstance();
3233
final LocalDataSource localDataSource = SharedPrefUtil(rxPrefs);
3334

lib/pages/home/home_bloc.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class HomeBloc extends DisposeCallbackBaseBloc {
2323
final Function0<void> logout;
2424

2525
/// Output stream
26-
final ValueStream<AuthenticationState> authState$;
26+
final DistinctValueStream<AuthenticationState> authState$;
2727
final Stream<HomeMessage> message$;
2828

2929
HomeBloc._({
@@ -60,7 +60,7 @@ class HomeBloc extends DisposeCallbackBaseBloc {
6060
.switchMap(uploadImage)
6161
.map(_resultToChangeAvatarMessage);
6262

63-
final authState$ = authenticationState$.publishValueDistinct();
63+
final authState$ = authenticationState$.publishValueDistinct(null);
6464

6565
final message$ = Rx.merge([logoutMessage$, updateAvatarMessage$]).publish();
6666

lib/pages/reset_password/reset_password_page.dart

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
1+
import 'dart:async';
2+
23
import 'package:flutter/material.dart';
34
import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
45
import 'package:flutter_disposebag/flutter_disposebag.dart';
@@ -20,11 +21,7 @@ class ResetPasswordPage extends StatefulWidget {
2021

2122
class _ResetPasswordPageState extends State<ResetPasswordPage>
2223
with SingleTickerProviderStateMixin<ResetPasswordPage>, DisposeBagMixin {
23-
/// Observable of bool values,
24-
/// Emits true if current page is request email page
25-
/// and reset password page otherwise
26-
final requestEmailS = PublishSubject<void>();
27-
DistinctValueConnectableStream<bool> requestEmail$;
24+
final requestEmailS = StreamController<void>(sync: true);
2825

2926
AnimationController animationController;
3027
Animation<Offset> animationPosition;
@@ -77,26 +74,22 @@ class _ResetPasswordPageState extends State<ResetPasswordPage>
7774
),
7875
);
7976

80-
requestEmail$ = requestEmailS
77+
/// Stream of bool values.
78+
/// Emits true if current page is request email page.
79+
/// Otherwise, it is reset password page.
80+
requestEmailS.stream
8181
.scan((acc, e, _) => !acc, true)
82-
.publishValueSeededDistinct(seedValue: true);
83-
84-
bag.addAll([
85-
requestEmail$.listen((requestEmailPage) {
86-
if (requestEmailPage) {
87-
animationController.reverse();
88-
} else {
89-
animationController.forward();
90-
}
91-
}),
92-
requestEmail$.connect(),
93-
]);
82+
.listen((requestEmailPage) => requestEmailPage
83+
? animationController.reverse()
84+
: animationController.forward())
85+
.disposedBy(bag);
86+
requestEmailS.disposedBy(bag);
9487
}
9588

9689
@override
9790
void dispose() {
98-
animationController.dispose();
9991
super.dispose();
92+
animationController.dispose();
10093
}
10194

10295
void onToggle() => requestEmailS.add(null);

lib/utils/result.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ abstract class Failure<T>
3030
}
3131

3232
extension FlatMapResultExtension<T> on Stream<Result<T>> {
33-
Stream<Result<R>> flatMapResult<R>(Stream<Result<R>> Function(T result) mapper) {
33+
Stream<Result<R>> flatMapResult<R>(
34+
Stream<Result<R>> Function(T result) mapper) {
3435
ArgumentError.checkNotNull(mapper, 'mapper');
36+
3537
return flatMap((result) {
3638
if (result is Failure<T>) {
3739
final failure = Failure<R>((b) => b

0 commit comments

Comments
 (0)