Skip to content

Commit 90e2af1

Browse files
authored
Flutter 2.5.0 (#17)
* deps * readme
1 parent 9088177 commit 90e2af1

File tree

7 files changed

+49
-54
lines changed

7 files changed

+49
-54
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414

1515
## Download apk [here](https://nightly.link/hoc081098/node-auth-flutter-BLoC-pattern-RxDart/workflows/flutter/master/app.zip)
1616

17-
## Flutter version: channel beta
17+
## Flutter version: channel stable
1818

1919
```yaml
2020
environment:
21-
sdk: ">=2.14.0-0 <3.0.0"
22-
flutter: ">=2.4.0-0"
21+
sdk: ">=2.14.0 <3.0.0"
22+
flutter: ">=2.5.0"
2323
```
2424
2525
```shell
26-
Flutter 2.4.0-4.2.pre • channel beta • https://github.com/flutter/flutter.git
27-
Framework • revision f18b9281c2 (4 weeks ago) • 2021-07-22 14:08:30 -0700
28-
Engine • revision 844c29f42a
29-
Tools • Dart 2.14.0 (build 2.14.0-301.2.beta)
26+
Flutter 2.5.0 • channel stable • https://github.com/flutter/flutter.git
27+
Framework • revision 4cc385b4b8 (5 days ago) • 2021-09-07 23:01:49 -0700
28+
Engine • revision f0826da7ef
29+
Tools • Dart 2.14.0
3030
```
3131

3232
## Screenshots

analysis_options.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@ analyzer:
66

77
linter:
88
rules:
9-
- prefer_final_locals
9+
- prefer_final_locals
10+
# https://github.com/dart-lang/lints#migrating-from-packagepedantic
11+
- always_declare_return_types
12+
- prefer_single_quotes
13+
- unawaited_futures
14+
- unsafe_html

lib/pages/home/change_password/change_password_bloc.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'dart:async';
22

33
import 'package:disposebag/disposebag.dart';
4-
import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
54
import 'package:flutter/foundation.dart';
65
import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
76
import 'package:node_auth/domain/usecases/change_password_use_case.dart';
@@ -27,7 +26,7 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
2726
final Function1<String, void> newPasswordChanged;
2827

2928
/// Output stream
30-
final DistinctValueStream<ChangePasswordState> changePasswordState$;
29+
final StateStream<ChangePasswordState> changePasswordState$;
3130
final Stream<String?> passwordError$;
3231
final Stream<String?> newPasswordError$;
3332

@@ -72,7 +71,7 @@ class ChangePasswordBloc extends DisposeCallbackBaseBloc {
7271
.where((isValid) => isValid)
7372
.withLatestFrom(both$, (_, Tuple2<String, String> both) => both)
7473
.exhaustMap((both) => _performChangePassword(changePassword, both))
75-
.publishValueDistinct(ChangePasswordState((b) => b..isLoading = false));
74+
.publishState(ChangePasswordState((b) => b..isLoading = false));
7675

7776
final passwordError$ = both$
7877
.map((tuple) {

lib/pages/home/home_bloc.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'dart:async';
22
import 'dart:io';
33

44
import 'package:disposebag/disposebag.dart';
5-
import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
65
import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
76
import 'package:image_picker/image_picker.dart';
87
import 'package:node_auth/domain/models/auth_state.dart';
@@ -24,7 +23,7 @@ class HomeBloc extends DisposeCallbackBaseBloc {
2423
final Function0<void> logout;
2524

2625
/// Output stream
27-
final DistinctValueStream<AuthenticationState?> authState$;
26+
final StateStream<AuthenticationState?> authState$;
2827
final Stream<HomeMessage> message$;
2928

3029
HomeBloc._({
@@ -68,7 +67,7 @@ class HomeBloc extends DisposeCallbackBaseBloc {
6867
.switchMap(uploadImage.call)
6968
.map(_resultToChangeAvatarMessage);
7069

71-
final authState$ = authenticationState$.publishValueDistinct(null);
70+
final authState$ = authenticationState$.publishState(null);
7271

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

lib/pages/reset_password/reset_password_page.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'dart:async';
22

3-
import 'package:distinct_value_connectable_stream/distinct_value_connectable_stream.dart';
43
import 'package:flutter/material.dart';
54
import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
65
import 'package:flutter_disposebag/flutter_disposebag.dart';
@@ -10,6 +9,7 @@ import 'package:node_auth/domain/usecases/send_reset_password_email_use_case.dar
109
import 'package:node_auth/pages/reset_password/input_token/input_token_and_reset_password.dart';
1110
import 'package:node_auth/pages/reset_password/send_email/send_email.dart';
1211
import 'package:rxdart/rxdart.dart';
12+
import 'package:rxdart_ext/rxdart_ext.dart';
1313

1414
class ResetPasswordPage extends StatefulWidget {
1515
static const routeName = '/reset_password_page';
@@ -23,7 +23,7 @@ class ResetPasswordPage extends StatefulWidget {
2323
class _ResetPasswordPageState extends State<ResetPasswordPage>
2424
with SingleTickerProviderStateMixin<ResetPasswordPage>, DisposeBagMixin {
2525
final requestEmailS = StreamController<void>(sync: true);
26-
late final DistinctValueStream<bool> requestEmail$;
26+
late final StateStream<bool> requestEmail$;
2727

2828
late final AnimationController animationController;
2929
late final Animation<Offset> animationPosition;
@@ -84,7 +84,7 @@ class _ResetPasswordPageState extends State<ResetPasswordPage>
8484
.doOnData((requestEmailPage) => requestEmailPage
8585
? animationController.reverse()
8686
: animationController.forward())
87-
.publishValueDistinct(true)
87+
.publishState(true)
8888
..connect().disposedBy(bag);
8989
requestEmailS.disposedBy(bag);
9090
}

pubspec.lock

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ packages:
77
name: _fe_analyzer_shared
88
url: "https://pub.dartlang.org"
99
source: hosted
10-
version: "22.0.0"
10+
version: "25.0.0"
1111
analyzer:
1212
dependency: "direct dev"
1313
description:
1414
name: analyzer
1515
url: "https://pub.dartlang.org"
1616
source: hosted
17-
version: "1.7.2"
17+
version: "2.2.0"
1818
args:
1919
dependency: transitive
2020
description:
@@ -28,7 +28,7 @@ packages:
2828
name: async
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "2.7.0"
31+
version: "2.8.1"
3232
boolean_selector:
3333
dependency: transitive
3434
description:
@@ -70,7 +70,7 @@ packages:
7070
name: build_runner
7171
url: "https://pub.dartlang.org"
7272
source: hosted
73-
version: "2.1.0"
73+
version: "2.1.2"
7474
build_runner_core:
7575
dependency: transitive
7676
description:
@@ -91,14 +91,14 @@ packages:
9191
name: built_value
9292
url: "https://pub.dartlang.org"
9393
source: hosted
94-
version: "8.1.1"
94+
version: "8.1.2"
9595
built_value_generator:
9696
dependency: "direct dev"
9797
description:
9898
name: built_value_generator
9999
url: "https://pub.dartlang.org"
100100
source: hosted
101-
version: "8.1.1"
101+
version: "8.1.2"
102102
characters:
103103
dependency: transitive
104104
description:
@@ -182,7 +182,7 @@ packages:
182182
name: dart_style
183183
url: "https://pub.dartlang.org"
184184
source: hosted
185-
version: "2.0.0"
185+
version: "2.1.0"
186186
did_change_dependencies:
187187
dependency: "direct main"
188188
description:
@@ -197,13 +197,6 @@ packages:
197197
url: "https://pub.dartlang.org"
198198
source: hosted
199199
version: "1.5.0"
200-
distinct_value_connectable_stream:
201-
dependency: "direct main"
202-
description:
203-
name: distinct_value_connectable_stream
204-
url: "https://pub.dartlang.org"
205-
source: hosted
206-
version: "1.3.0"
207200
fake_async:
208201
dependency: transitive
209202
description:
@@ -337,7 +330,7 @@ packages:
337330
name: image_picker
338331
url: "https://pub.dartlang.org"
339332
source: hosted
340-
version: "0.8.3+1"
333+
version: "0.8.4"
341334
image_picker_for_web:
342335
dependency: transitive
343336
description:
@@ -351,7 +344,7 @@ packages:
351344
name: image_picker_platform_interface
352345
url: "https://pub.dartlang.org"
353346
source: hosted
354-
version: "2.2.0"
347+
version: "2.4.1"
355348
io:
356349
dependency: transitive
357350
description:
@@ -512,35 +505,35 @@ packages:
512505
name: rx_shared_preferences
513506
url: "https://pub.dartlang.org"
514507
source: hosted
515-
version: "2.1.0"
508+
version: "2.2.0"
516509
rx_storage:
517510
dependency: transitive
518511
description:
519512
name: rx_storage
520513
url: "https://pub.dartlang.org"
521514
source: hosted
522-
version: "1.1.0"
515+
version: "1.2.0"
523516
rxdart:
524517
dependency: "direct main"
525518
description:
526519
name: rxdart
527520
url: "https://pub.dartlang.org"
528521
source: hosted
529-
version: "0.27.1"
522+
version: "0.27.2"
530523
rxdart_ext:
531524
dependency: "direct main"
532525
description:
533526
name: rxdart_ext
534527
url: "https://pub.dartlang.org"
535528
source: hosted
536-
version: "0.1.1"
529+
version: "0.1.2"
537530
shared_preferences:
538531
dependency: "direct main"
539532
description:
540533
name: shared_preferences
541534
url: "https://pub.dartlang.org"
542535
source: hosted
543-
version: "2.0.6"
536+
version: "2.0.7"
544537
shared_preferences_linux:
545538
dependency: transitive
546539
description:
@@ -601,7 +594,7 @@ packages:
601594
name: source_gen
602595
url: "https://pub.dartlang.org"
603596
source: hosted
604-
version: "1.0.0"
597+
version: "1.1.0"
605598
source_span:
606599
dependency: transitive
607600
description:
@@ -650,7 +643,7 @@ packages:
650643
name: test_api
651644
url: "https://pub.dartlang.org"
652645
source: hosted
653-
version: "0.4.1"
646+
version: "0.4.2"
654647
timing:
655648
dependency: transitive
656649
description:
@@ -715,5 +708,5 @@ packages:
715708
source: hosted
716709
version: "3.1.0"
717710
sdks:
718-
dart: ">=2.14.0-0 <3.0.0"
719-
flutter: ">=2.4.0-0"
711+
dart: ">=2.14.0 <3.0.0"
712+
flutter: ">=2.5.0"

pubspec.yaml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ publish_to: 'none'
55
version: 3.1.1+5
66

77
environment:
8-
sdk: ">=2.14.0-0 <3.0.0"
9-
flutter: ">=2.4.0-0"
8+
sdk: ">=2.14.0 <3.0.0"
9+
flutter: ">=2.5.0"
1010

1111
dependencies:
1212
flutter:
@@ -16,29 +16,28 @@ dependencies:
1616

1717
path: ^1.8.0
1818
http: ^0.13.3
19-
built_value: ^8.1.1
19+
built_value: ^8.1.2
2020
tuple: ^2.0.0
21-
rxdart: ^0.27.1
22-
image_picker: ^0.8.3+1
23-
shared_preferences: ^2.0.6
21+
rxdart: ^0.27.2
22+
image_picker: ^0.8.4
23+
shared_preferences: ^2.0.7
2424
octo_image: ^1.0.0+1
2525

26-
distinct_value_connectable_stream: ^1.3.0
2726
flutter_provider: ^2.0.0
28-
rx_shared_preferences: ^2.1.0
27+
rx_shared_preferences: ^2.2.0
2928
disposebag: ^1.5.0
3029
flutter_disposebag: ^1.1.0
3130
flutter_bloc_pattern: ^2.1.1
32-
rxdart_ext: ^0.1.1
31+
rxdart_ext: ^0.1.2
3332
did_change_dependencies: ^1.0.0
3433

3534
dev_dependencies:
3635
plugin_platform_interface: ^2.0.1
3736
flutter_test:
3837
sdk: flutter
39-
build_runner: ^2.0.0
40-
built_value_generator: ^8.1.1
41-
analyzer: ^2.0.0
38+
build_runner: ^2.1.2
39+
built_value_generator: ^8.1.2
40+
analyzer: ^2.2.0
4241
flutter_lints: ^1.0.4
4342

4443
flutter:

0 commit comments

Comments
 (0)