Skip to content

Commit d4ad47a

Browse files
authored
Merge pull request #6 from hoc081098/nnbd
Nnbd
2 parents 6fefd41 + ffc1867 commit d4ad47a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1029
-1173
lines changed

analysis_options.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
include: package:pedantic/analysis_options.1.9.0.yaml
1+
include: package:pedantic/analysis_options.1.11.0.yaml
2+
3+
analyzer:
4+
enable-experiment:
5+
- nonfunction-type-aliases
6+
27
linter:
38
rules:
49
- prefer_final_locals

lib/app.dart

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import 'package:node_auth/pages/register/register.dart';
1515
import 'package:node_auth/pages/reset_password/reset_password_page.dart';
1616

1717
class MyApp extends StatelessWidget {
18-
const MyApp({Key key}) : super(key: key);
18+
const MyApp({Key? key}) : super(key: key);
1919

2020
@override
2121
Widget build(BuildContext context) {
@@ -28,15 +28,14 @@ class MyApp extends StatelessWidget {
2828
},
2929
RegisterPage.routeName: (context) {
3030
return BlocProvider<RegisterBloc>(
31-
child: const RegisterPage(),
3231
initBloc: (context) => RegisterBloc(
3332
RegisterUseCase(context.get()),
3433
),
34+
child: const RegisterPage(),
3535
);
3636
},
3737
HomePage.routeName: (context) {
3838
return BlocProvider<HomeBloc>(
39-
child: const HomePage(),
4039
initBloc: (context) {
4140
final userRepository = context.get<UserRepository>();
4241
return HomeBloc(
@@ -45,6 +44,7 @@ class MyApp extends StatelessWidget {
4544
UploadImageUseCase(userRepository),
4645
);
4746
},
47+
child: const HomePage(),
4848
);
4949
},
5050
LoginPage.routeName: (context) {
@@ -69,13 +69,14 @@ class MyApp extends StatelessWidget {
6969
accentColor: const Color(0xFF00e676),
7070
),
7171
routes: routes,
72+
debugShowCheckedModeBanner: false,
7273
),
7374
);
7475
}
7576
}
7677

7778
class Home extends StatelessWidget {
78-
const Home({Key key}) : super(key: key);
79+
const Home({Key? key}) : super(key: key);
7980

8081
@override
8182
Widget build(BuildContext context) {
@@ -102,12 +103,12 @@ class Home extends StatelessWidget {
102103

103104
if (snapshot.hasError || snapshot.data is UnauthenticatedState) {
104105
print('[HOME] home [2] >> [NotAuthenticated]');
105-
return routes[LoginPage.routeName](context);
106+
return routes[LoginPage.routeName]!(context);
106107
}
107108

108109
if (snapshot.data is AuthenticatedState) {
109110
print('[HOME] home [3] >> [Authenticated]');
110-
return routes[HomePage.routeName](context);
111+
return routes[HomePage.routeName]!(context);
111112
}
112113

113114
return Container(width: 0, height: 0);

lib/data/exception/local_data_source_exception.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
class LocalDataSourceException implements Exception {
22
final String message;
33
final Object error;
4+
final StackTrace stackTrace;
45

5-
const LocalDataSourceException(this.message, [this.error]);
6+
const LocalDataSourceException(this.message, this.error, this.stackTrace);
67

78
@override
89
String toString() =>

lib/data/local/entities/user_and_token_entity.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ abstract class UserAndTokenEntity
2323
_$UserAndTokenEntity;
2424

2525
factory UserAndTokenEntity.fromJson(Map<String, dynamic> json) =>
26-
serializers.deserializeWith(serializer, json);
26+
serializers.deserializeWith<UserAndTokenEntity>(serializer, json)!;
2727

28-
Map<String, dynamic> toJson() => serializers.serializeWith(serializer, this);
28+
Map<String, dynamic> toJson() =>
29+
serializers.serializeWith(serializer, this) as Map<String, dynamic>;
2930
}

lib/data/local/entities/user_and_token_entity.g.dart

Lines changed: 29 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/data/local/entities/user_entity.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@ abstract class UserEntity implements Built<UserEntity, UserEntityBuilder> {
1414
@BuiltValueField(wireName: 'created_at')
1515
DateTime get createdAt;
1616

17-
@nullable
1817
@BuiltValueField(wireName: 'image_url')
19-
String get imageUrl;
18+
String? get imageUrl;
2019

2120
static Serializer<UserEntity> get serializer => _$userEntitySerializer;
2221

@@ -25,7 +24,8 @@ abstract class UserEntity implements Built<UserEntity, UserEntityBuilder> {
2524
factory UserEntity([void Function(UserEntityBuilder) updates]) = _$UserEntity;
2625

2726
factory UserEntity.fromJson(Map<String, dynamic> json) =>
28-
serializers.deserializeWith<UserEntity>(serializer, json);
27+
serializers.deserializeWith<UserEntity>(serializer, json)!;
2928

30-
Map<String, dynamic> toJson() => serializers.serializeWith(serializer, this);
29+
Map<String, dynamic> toJson() =>
30+
serializers.serializeWith(serializer, this) as Map<String, dynamic>;
3131
}

0 commit comments

Comments
 (0)