fix: Fix flutter analyze (#14)

lenra-io · Sep 29, 2023 · 3bbb069 · 3bbb069
1 parent e034f01
commit 3bbb069
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 46 deletions.
diff --git a/lib/api/request_models/loginRequest.dart → lib/api/request_models/login_request.dart b/lib/api/request_models/loginRequest.dart → lib/api/request_models/login_request.dart
diff --git a/lib/api/response_models/build_response.dart b/lib/api/response_models/build_response.dart
@@ -10,8 +10,9 @@ class BuildResponse extends ApiResponse {
 
  BuildResponse.fromJson(Map<String, dynamic> json)
  : id = json["id"],
- status = BuildStatus.values
- .firstWhere((e) => e.toString() == 'BuildStatus.' + json["status"], orElse: () => BuildStatus.failure),
+ status = BuildStatus.values.firstWhere(
+ (e) => e.toString() == 'BuildStatus.${json["status"]}',
+ orElse: () => BuildStatus.failure),
  insertedAt = DateTime.parse(json["inserted_at"]),
  buildNumber = json["build_number"];
 

diff --git a/lib/api/user_api.dart b/lib/api/user_api.dart
@@ -1,7 +1,7 @@
 import 'package:client_common/api/lenra_http_client.dart';
 import 'package:client_common/api/request_models/ask_code_lost_password_request.dart';
 import 'package:client_common/api/request_models/change_password_request.dart';
-import 'package:client_common/api/request_models/loginRequest.dart';
+import 'package:client_common/api/request_models/login_request.dart';
 import 'package:client_common/api/request_models/register_request.dart';
 import 'package:client_common/api/request_models/send_code_lost_password_request.dart';
 import 'package:client_common/api/request_models/validate_dev_request.dart';
@@ -10,25 +10,29 @@ import 'package:client_common/api/response_models/auth_response.dart';
 import 'package:client_common/api/response_models/empty_response.dart';
 
 class UserApi {
- static Future<AuthResponse> register(RegisterRequest body) => LenraAuth.instance.post(
+ static Future<AuthResponse> register(RegisterRequest body) =>
+ LenraAuth.instance.post(
  "/register",
  body: body,
  responseMapper: (json) => AuthResponse.fromJson(json),
  );
 
- static Future<AuthResponse> login(LoginRequest body) => LenraAuth.instance.post(
+ static Future<AuthResponse> login(LoginRequest body) =>
+ LenraAuth.instance.post(
  "/login",
  body: body,
  responseMapper: (json) => AuthResponse.fromJson(json),
  );
 
- static Future<AuthResponse> validateUser(ValidateUserRequest body) => LenraAuth.instance.post(
+ static Future<AuthResponse> validateUser(ValidateUserRequest body) =>
+ LenraAuth.instance.post(
  "/verify",
  body: body,
  responseMapper: (json) => AuthResponse.fromJson(json),
  );
 
- static Future<AuthResponse> validateDev(ValidateDevRequest body) => LenraApi.instance.put(
+ static Future<AuthResponse> validateDev(ValidateDevRequest body) =>
+ LenraApi.instance.put(
  "/verify/dev",
  body: body,
  responseMapper: (json) => AuthResponse.fromJson(json),
@@ -43,19 +47,24 @@ class UserApi {
  "/logout",
  responseMapper: (json) => EmptyResponse.fromJson(json),
  );
- static Future<EmptyResponse> changePassword(ChangePasswordRequest body) => LenraApi.instance.put(
+ static Future<EmptyResponse> changePassword(ChangePasswordRequest body) =>
+ LenraApi.instance.put(
  "/password",
  body: body,
  responseMapper: (json) => EmptyResponse.fromJson(json),
  );
 
- static Future<EmptyResponse> askCodeLostPassword(AskCodeLostPasswordRequest body) => LenraAuth.instance.post(
+ static Future<EmptyResponse> askCodeLostPassword(
+ AskCodeLostPasswordRequest body) =>
+ LenraAuth.instance.post(
  "/password/lost",
  body: body,
  responseMapper: (json) => EmptyResponse.fromJson(json),
  );
 
- static Future<EmptyResponse> sendCodeLostPassword(SendCodeLostPasswordRequest body) => LenraAuth.instance.put(
+ static Future<EmptyResponse> sendCodeLostPassword(
+ SendCodeLostPasswordRequest body) =>
+ LenraAuth.instance.put(
  "/password/lost",
  body: body,
  responseMapper: (json) => EmptyResponse.fromJson(json),

diff --git a/lib/models/auth_model.dart b/lib/models/auth_model.dart
@@ -1,7 +1,7 @@
 import 'package:client_common/api/lenra_http_client.dart';
 import 'package:client_common/api/request_models/ask_code_lost_password_request.dart';
 import 'package:client_common/api/request_models/change_password_request.dart';
-import 'package:client_common/api/request_models/loginRequest.dart';
+import 'package:client_common/api/request_models/login_request.dart';
 import 'package:client_common/api/request_models/register_request.dart';
 import 'package:client_common/api/request_models/send_code_lost_password_request.dart';
 import 'package:client_common/api/request_models/validate_dev_request.dart';
@@ -49,13 +49,16 @@ class AuthModel extends ChangeNotifier {
  }
 
  Future<AuthResponse> register(String email, String password) async {
- var res = await registerStatus.handle(() => UserApi.register(RegisterRequest(email, password)), notifyListeners);
+ var res = await registerStatus.handle(
+ () => UserApi.register(RegisterRequest(email, password)),
+ notifyListeners);
  _handleAuthResponse(res);
  return res;
  }
 
  Future<AuthResponse> login(String email, String password) async {
- var res = await loginStatus.handle(() => UserApi.login(LoginRequest(email, password)), notifyListeners);
+ var res = await loginStatus.handle(
+ () => UserApi.login(LoginRequest(email, password)), notifyListeners);
  _handleAuthResponse(res);
  return res;
  }
@@ -67,13 +70,15 @@ class AuthModel extends ChangeNotifier {
  }
 
  Future<AuthResponse> validateUser(String code) async {
- var res = await validateUserStatus.handle(() => UserApi.validateUser(ValidateUserRequest(code)), notifyListeners);
+ var res = await validateUserStatus.handle(
+ () => UserApi.validateUser(ValidateUserRequest(code)), notifyListeners);
  _handleAuthResponse(res);
  return res;
  }
 
  Future<AuthResponse> validateDev(String code) async {
- var res = await validateDevStatus.handle(() => UserApi.validateDev(ValidateDevRequest(code)), notifyListeners);
+ var res = await validateDevStatus.handle(
+ () => UserApi.validateDev(ValidateDevRequest(code)), notifyListeners);
  _handleAuthResponse(res);
  return res;
  }
@@ -88,22 +93,28 @@ class AuthModel extends ChangeNotifier {
 
  Future<EmptyResponse> askCodeLostPassword(String email) async {
  var res = await askCodeLostPasswordStatus.handle(
- () => UserApi.askCodeLostPassword(AskCodeLostPasswordRequest(email)), notifyListeners);
+ () => UserApi.askCodeLostPassword(AskCodeLostPasswordRequest(email)),
+ notifyListeners);
  notifyListeners();
  return res;
  }
 
- Future<EmptyResponse> sendCodeLostPassword(String code, String email, String password, String confirmation) async {
+ Future<EmptyResponse> sendCodeLostPassword(
+ String code, String email, String password, String confirmation) async {
  var res = await sendCodeLostPasswordStatus.handle(
- () => UserApi.sendCodeLostPassword(SendCodeLostPasswordRequest(code, email, password, confirmation)),
+ () => UserApi.sendCodeLostPassword(
+ SendCodeLostPasswordRequest(code, email, password, confirmation)),
  notifyListeners);
  notifyListeners();
  return res;
  }
 
- Future<EmptyResponse> changePassword(String old, String password, String confirmation) async {
+ Future<EmptyResponse> changePassword(
+ String old, String password, String confirmation) async {
  var res = await changePasswordStatus.handle(
- () => UserApi.changePassword(ChangePasswordRequest(old, password, confirmation)), notifyListeners);
+ () => UserApi.changePassword(
+ ChangePasswordRequest(old, password, confirmation)),
+ notifyListeners);
  notifyListeners();
  return res;
  }

diff --git a/lib/models/user_application_model.dart b/lib/models/user_application_model.dart
@@ -32,8 +32,9 @@ class UserApplicationModel extends ChangeNotifier {
  String? currentApp;
 
  Future<List<AppResponse>> fetchUserApplications() async {
- var res = await fetchApplicationsStatus.handle(ApplicationApi.getUserApps, notifyListeners);
- this.userApps = res.apps;
+ var res = await fetchApplicationsStatus.handle(
+ ApplicationApi.getUserApps, notifyListeners);
+ userApps = res.apps;
  notifyListeners();
  return res.apps;
  }
@@ -55,7 +56,8 @@ class UserApplicationModel extends ChangeNotifier {
  }
 
  Future<UpdateAppResponse> updateApp(UpdateAppRequest body) async {
- var res = await updateApplicationStatus.handle(() => ApplicationApi.updateApp(body), notifyListeners);
+ var res = await updateApplicationStatus.handle(
+ () => ApplicationApi.updateApp(body), notifyListeners);
  notifyListeners();
  return res;
  }
@@ -70,7 +72,8 @@ class UserApplicationModel extends ChangeNotifier {
  return res;
  }
 
- Future<UpdateEnvironmentResponse> updateEnvironment(int appId, int envId, UpdateEnvironmentRequest body) async {
+ Future<UpdateEnvironmentResponse> updateEnvironment(
+ int appId, int envId, UpdateEnvironmentRequest body) async {
  var res = await updateEnvironmentStatus.handle(
  () => EnvironmentApi.updateEnvironment(appId, envId, body),
  notifyListeners,
@@ -86,15 +89,17 @@ class UserApplicationModel extends ChangeNotifier {
  CreateEnvironmentUserAccessRequest body,
  ) async {
  var res = await inviteUserStatus.handle(
- () => EnvironmentUserAccessApi.createEnvironmentUserAccess(appId, envId, body),
+ () => EnvironmentUserAccessApi.createEnvironmentUserAccess(
+ appId, envId, body),
  notifyListeners,
  );
 
  notifyListeners();
  return res;
  }
 
- Future<EnvironmentUserAccessesResponse> getInvitedUsers(int appId, int envId) async {
+ Future<EnvironmentUserAccessesResponse> getInvitedUsers(
+ int appId, int envId) async {
  var res = await getInvitedUsersStatus.handle(
  () => EnvironmentUserAccessApi.getEnvironmentUserAccesses(appId, envId),
  notifyListeners,

diff --git a/lib/utils/color_parser.dart b/lib/utils/color_parser.dart
@@ -2,7 +2,7 @@ import 'package:flutter/painting.dart';
 
 extension ColorParser on String {
  Color parseColor() {
- String hex = this.replaceFirst('#', '');
+ String hex = replaceFirst('#', '');
  int hexb16 = int.parse('FF$hex', radix: 16);
  return Color(hexb16);
  }

diff --git a/lib/utils/connexion_utils_io.dart b/lib/utils/connexion_utils_io.dart
@@ -5,9 +5,9 @@ PhoenixSocket createPhoenixSocket(
  String endpoint,
  Map<String, String> params,
 ) =>
- new PhoenixSocket(
+ PhoenixSocket(
  endpoint,
- socketOptions: new PhoenixSocketOptions(params: params),
+ socketOptions: PhoenixSocketOptions(params: params),
  );
 
 http.Client createHttpClient() => http.Client();

diff --git a/lib/utils/connexion_utils_web.dart b/lib/utils/connexion_utils_web.dart
@@ -10,10 +10,10 @@ PhoenixSocket createPhoenixSocket(
  String endpoint,
  Map<String, String> params,
 ) =>
- new PhoenixSocket(
+ PhoenixSocket(
  endpoint,
  connectionProvider: PhoenixHtmlConnection.provider,
- socketOptions: new PhoenixSocketOptions(params: params),
+ socketOptions: PhoenixSocketOptions(params: params),
  );
 
 http.Client createHttpClient() {

diff --git a/lib/views/loading_button.dart b/lib/views/loading_button.dart
@@ -21,10 +21,10 @@ class LoadingButton extends StatelessWidget {
  // }
 
  return LenraButton(
- onPressed: !this.loading ? this.onPressed : null,
- disabled: this.loading ? true : false,
- text: this.text,
- rightIcon: /*this.loading ? CircularProgressIndicator() :*/ this.rightIcon,
+ onPressed: !loading ? onPressed : null,
+ disabled: loading ? true : false,
+ text: text,
+ rightIcon: /*this.loading ? CircularProgressIndicator() :*/ rightIcon,
  );
  }
 }
diff --git a/lib/views/simple_page.dart b/lib/views/simple_page.dart
@@ -37,28 +37,33 @@ class SimplePage extends StatelessWidget {
  child: Text(
  title,
  style: theme.lenraTextThemeData.headline2,
- textAlign: this.textAlign,
+ textAlign: textAlign,
  ),
  ));
  }
- if (title.isNotEmpty && message.isNotEmpty) children.add(SizedBox(height: theme.baseSize * 2));
+ if (title.isNotEmpty && message.isNotEmpty) {
+ children.add(SizedBox(height: theme.baseSize * 2));
+ }
  if (message.isNotEmpty) {
  children.add(SizedBox(
  width: double.infinity,
  child: Text(
  message,
  style: theme.lenraTextThemeData.disabledBodyText,
- textAlign: this.textAlign,
+ textAlign: textAlign,
  ),
  ));
  }
  if (child != null) {
- if (title.isNotEmpty || message.isNotEmpty) children.add(SizedBox(height: theme.baseSize * 4));
+ if (title.isNotEmpty || message.isNotEmpty) {
+ children.add(SizedBox(height: theme.baseSize * 4));
+ }
  children.add(child!);
  }
 
  var size = MediaQuery.of(context).size;
- var padding = min(min(size.height * 0.08, size.width * 0.1), theme.baseSize * 10);
+ var padding =
+ min(min(size.height * 0.08, size.width * 0.1), theme.baseSize * 10);
  return GestureDetector(
  behavior: HitTestBehavior.translucent,
  onTap: () {
@@ -72,7 +77,7 @@ class SimplePage extends StatelessWidget {
  child: Column(
  children: _buildBackInk(context, theme)
  ..add(Center(
- child: new Container(
+ child: Container(
  width: 400,
  child: Column(
  children: children,
@@ -90,15 +95,17 @@ class SimplePage extends StatelessWidget {
  List<Widget> _buildBackInk(BuildContext context, LenraThemeData theme) {
  var size = MediaQuery.of(context).size;
  var inkSize = 20;
- var separation = min(min(size.height * 0.05, size.width * 0.06), theme.baseSize * 6);
+ var separation =
+ min(min(size.height * 0.05, size.width * 0.06), theme.baseSize * 6);
  if (backInkText == null || backInkText!.isEmpty) {
  return [
  SizedBox(
  height: inkSize + separation,
  )
  ];
  }
- var linkTheme = theme.lenraTextThemeData.bodyText.copyWith(color: theme.lenraColorThemeData.primaryBackgroundColor);
+ var linkTheme = theme.lenraTextThemeData.bodyText
+ .copyWith(color: theme.lenraColorThemeData.primaryBackgroundColor);
  return [
  Align(
  alignment: Alignment.topLeft,

diff --git a/lib/views/stateful_wrapper.dart b/lib/views/stateful_wrapper.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-typedef Widget Builder(BuildContext context);
+typedef Builder = Widget Function(BuildContext context);
 
 /// Wrapper for stateful functionality to provide onInit calls in stateles widget
 /// from https://medium.com/filledstacks/how-to-call-a-function-on-start-in-flutter-stateless-widgets-28d90ab3bf49
@@ -12,7 +12,7 @@ class StatefulWrapper extends StatefulWidget {
  required this.builder,
  });
  @override
- _StatefulWrapperState createState() => _StatefulWrapperState();
+ State<StatefulWrapper> createState() => _StatefulWrapperState();
 }
 
 class _StatefulWrapperState extends State<StatefulWrapper> {

diff --git a/test/api/request_models/login_request_test.dart b/test/api/request_models/login_request_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:client_common/api/request_models/loginRequest.dart';
+import 'package:client_common/api/request_models/login_request.dart';
 import 'package:test/test.dart';
 
 void main() {