build: test and flutter analyze issues fix. Test result : +219 ~10: A…

…ll tests passed!
cevheri · Nov 20, 2024 · 34fbc97 · 34fbc97
1 parent bd92bfa
commit 34fbc97
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 52 deletions.
diff --git a/lib/data/repository/city_repository.dart b/lib/data/repository/city_repository.dart
@@ -1,4 +1,3 @@
-import 'package:dart_json_mapper/dart_json_mapper.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_bloc_advance/data/app_api_exception.dart';
 

diff --git a/lib/data/repository/district_repository.dart b/lib/data/repository/district_repository.dart
@@ -1,4 +1,3 @@
-import 'package:dart_json_mapper/dart_json_mapper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc_advance/data/app_api_exception.dart';
 

diff --git a/lib/data/repository/user_repository.dart b/lib/data/repository/user_repository.dart
@@ -16,7 +16,7 @@ class UserRepository {
   Future<List<User?>> getUsers({int page = 0, int size = 10, List<String> sort = const ["id,desc"]}) async {
     debugPrint("BEGIN:getUsers repository start");
     final httpResponse = await HttpUtils.getRequest("/admin/$_resource?page=$page&size=$size&sort=${sort.join("&sort=")}");
-    final response = User.fromJsonStringList(httpResponse.body)!;
+    final response = User.fromJsonStringList(httpResponse.body);
     debugPrint("END:getUsers successful");
     return response;
   }

diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/main/main_local.mapper.g.dart b/lib/main/main_local.mapper.g.dart
diff --git a/lib/main/main_prod.mapper.g.dart b/lib/main/main_prod.mapper.g.dart
diff --git a/lib/presentation/common_blocs/authority/authority_state.dart b/lib/presentation/common_blocs/authority/authority_state.dart
@@ -24,7 +24,7 @@ class AuthorityState extends Equatable {
   }
 
   @override
-  List<Object> get props => [status];
+  List<Object> get props => [status, authorities ?? []];
 
   @override
   bool get stringify => true;
@@ -35,12 +35,7 @@ class AuthorityInitialState extends AuthorityState {}
 class AuthorityLoadInProgressState extends AuthorityState {}
 
 class AuthorityLoadSuccessState extends AuthorityState {
-  final List authorities;
-
-  const AuthorityLoadSuccessState({required this.authorities});
-
-  @override
-  List<Object> get props => [authorities];
+  const AuthorityLoadSuccessState({required List authorities}) : super(authorities: authorities, status: AuthorityStatus.success);
 }
 
 class AuthorityLoadFailureState extends AuthorityState {

diff --git a/lib/presentation/common_blocs/city/city_state.dart b/lib/presentation/common_blocs/city/city_state.dart
@@ -24,7 +24,7 @@ class CityState extends Equatable {
   }
 
   @override
-  List<Object> get props => [status];
+  List<Object> get props => [status, cities ?? []];
 
   @override
   bool get stringify => true;
@@ -33,12 +33,7 @@ class CityState extends Equatable {
 class CityInitialState extends CityState {}
 
 class CityLoadSuccessState extends CityState {
-  final List<City?> cities;
-
-  const CityLoadSuccessState({required this.cities});
-
-  @override
-  List<Object> get props => [cities];
+  const CityLoadSuccessState({required List<City?> cities}) : super(cities: cities, status: CityStatus.success);
 }
 
 class CityLoadFailureState extends CityState {

diff --git a/lib/presentation/screen/login/bloc/login_bloc.dart b/lib/presentation/screen/login/bloc/login_bloc.dart
@@ -10,7 +10,6 @@ import '../../../../data/models/user_jwt.dart';
 import '../../../../data/repository/login_repository.dart';
 
 part 'login_event.dart';
-
 part 'login_state.dart';
 
 class LoginBloc extends Bloc<LoginEvent, LoginState> {

diff --git a/lib/presentation/screen/user/edit/edit_form_widget.dart b/lib/presentation/screen/user/edit/edit_form_widget.dart
@@ -160,7 +160,7 @@ class EditFormAuthorities extends StatelessWidget {
             validator: FormBuilderValidators.compose([
               FormBuilderValidators.required(errorText: S.of(context).authorities_required),
             ]),
-            items: state.authorities.map((role) => DropdownMenuItem(value: role, child: Text(role))).toList(),
+            items: state.authorities!.map((role) => DropdownMenuItem(value: role, child: Text(role))).toList(),
             initialValue: () {}(),
             onChanged: (value) {},
           );

diff --git a/lib/presentation/screen/user/list/list_user_screen.dart b/lib/presentation/screen/user/list/list_user_screen.dart
@@ -78,11 +78,9 @@ class ListUserScreen extends StatelessWidget {
                         mainAxisSize: MainAxisSize.max,
                         verticalDirection: VerticalDirection.down,
                         children: [
-
                           Expanded(
                             flex: 7,
-                            child: Text(
-                                state.userList[index].authorities!.contains("ROLE_ADMIN")? S.of(context).admin : S.of(context).guest,
+                            child: Text(state.userList[index].authorities!.contains("ROLE_ADMIN") ? S.of(context).admin : S.of(context).guest,
                                 textAlign: TextAlign.left),
                           ),
                           SizedBox(width: 5),
@@ -275,15 +273,15 @@ class ListUserScreen extends StatelessWidget {
                         decoration: InputDecoration(
                           hintText: S.of(context).authorities,
                         ),
-                        items: state.authorities
+                        items: state.authorities!
                             .map(
                               (role) => DropdownMenuItem(
                                 value: role,
                                 child: Text(role),
                               ),
                             )
                             .toList(),
-                        initialValue: state.authorities[0],
+                        initialValue: state.authorities![0],
                       );
                     } else {
                       return Container();