Merge pull request #2 from NODO-UH/feature/improve-code

Setup config for signing in CodeMagic
NODO-UH · Apr 17, 2021 · 57eb63c · 57eb63c
2 parents bde6622 + c148c9c
commit 57eb63c
Show file tree

Hide file tree

Showing 47 changed files with 731 additions and 447 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# GestiónUH
+# Gestión UH
 
 A UH managment app.
 
-[![tests](https://github.com/rmarticedeno/gestionapp/actions/workflows/tests.yml/badge.svg)](https://github.com/rmarticedeno/gestionapp/actions/workflows/tests.yml)
+[![tests](https://github.com/NODO-UH/gestionapp/actions/workflows/tests.yml/badge.svg)](https://github.com/NODO-UH/gestionapp/actions/workflows/tests.yml) [![Codemagic build status](https://api.codemagic.io/apps/607a1a18d35b7a12ffb6c7dc/607a1a18d35b7a12ffb6c7db/status_badge.svg)](https://codemagic.io/apps/607a1a18d35b7a12ffb6c7dc/607a1a18d35b7a12ffb6c7db/latest_build)
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -2,6 +2,7 @@ include: package:lint/analysis_options.yaml
 
 linter:
   rules:
+    always_use_package_imports: true
     avoid_classes_with_only_static_members: false
     avoid_positional_boolean_parameters: false
     constant_identifier_names: false

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -25,6 +25,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 29
 
@@ -37,21 +43,27 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "cu.uh.gestionuh"
         minSdkVersion 18
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
 
-    buildTypes {
-        release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
-        }
-    }
+   signingConfigs {
+       release {
+           keyAlias keystoreProperties['keyAlias']
+           keyPassword keystoreProperties['keyPassword']
+           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword keystoreProperties['storePassword']
+       }
+   }
+
+   buildTypes {
+       release {
+           signingConfig signingConfigs.release
+       }
+   }
 }
 
 flutter {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="gestionuh"
+        android:label="Gestión UH"
         android:icon="@mipmap/launcher_icon">
         <activity
 

diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -11,7 +11,7 @@
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundleName</key>
-		<string>gestionuh</string>
+		<string>Gestión UH</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>

diff --git a/lib/app.dart b/lib/app.dart
@@ -1,16 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-
-import 'deps_injector.dart';
-import 'src/data/repository/auth_repository/auth_repository.dart';
-import 'src/presentation/blocs.dart';
-import 'src/presentation/blocs/reset_password_bloc/resetpassword_bloc.dart';
-import 'src/presentation/pages.dart';
-import 'src/presentation/pages/about_page.dart';
-import 'src/presentation/pages/register_page.dart';
-import 'src/presentation/theme.dart';
-import 'src/utils/constants.dart';
-import 'src/utils/constants/routes.dart';
+import 'package:gestionuh/deps_injector.dart';
+import 'package:gestionuh/src/data/repository/auth_repository/auth_repository.dart';
+import 'package:gestionuh/src/presentation/blocs.dart';
+import 'package:gestionuh/src/presentation/pages.dart';
+import 'package:gestionuh/src/presentation/pages/about_page.dart';
+import 'package:gestionuh/src/presentation/pages/register_page.dart';
+import 'package:gestionuh/src/presentation/theme.dart';
+import 'package:gestionuh/src/utils/constants.dart';
+import 'package:gestionuh/src/utils/constants/routes.dart';
 
 class GestionUhApp extends StatelessWidget {
   @override
@@ -67,9 +65,15 @@ class GestionUhApp extends StatelessWidget {
             );
           case REGISTER_ROUTE_NAME:
             return MaterialPageRoute(
-              builder: (_) => BlocProvider<RegisterBloc>(
-                create: (_) => di()..add(QuestionsRequestedRegister()),
-                child: const RegisterPage(),
+              builder: (_) => Overlay(
+                initialEntries: [
+                  OverlayEntry(builder: (context) {
+                    return BlocProvider<RegisterBloc>(
+                      create: (_) => di()..add(QuestionsRequestedRegister()),
+                      child: const RegisterPage(),
+                    );
+                  }),
+                ],
               ),
             );
           case ABOUT_ROUTE_NAME:

diff --git a/lib/deps_injector.dart b/lib/deps_injector.dart
@@ -1,13 +1,11 @@
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:gestionuh/src/data/api/api.dart';
+import 'package:gestionuh/src/data/local.dart';
+import 'package:gestionuh/src/data/repository.dart';
+import 'package:gestionuh/src/presentation/blocs.dart';
 import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'src/data/api/api.dart';
-import 'src/data/local.dart';
-import 'src/data/repository.dart';
-import 'src/presentation/blocs.dart';
-import 'src/presentation/blocs/reset_password_bloc/resetpassword_bloc.dart';
-
 final di = GetIt.instance;
 
 Future<void> init() async {

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
-
-import 'app.dart';
-import 'deps_injector.dart';
-import 'src/data/repository/auth_repository/auth_repository.dart';
+import 'package:gestionuh/app.dart';
+import 'package:gestionuh/deps_injector.dart';
+import 'package:gestionuh/src/data/repository/auth_repository/auth_repository.dart';
 
 Future<void> main() async {
   await initialize();

diff --git a/lib/src/data/api/api.dart b/lib/src/data/api/api.dart
@@ -1,9 +1,8 @@
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
-
-import '../../utils/constants.dart';
-import '../models.dart';
+import 'package:gestionuh/src/data/models.dart';
+import 'package:gestionuh/src/utils/constants.dart';
 
 typedef ClassBuilder<T extends BaseModel> = T Function(
     Map<String, dynamic> json);
@@ -88,7 +87,7 @@ class GestionApi {
       );
     }
 
-    UserData response = await apiRequest<UserData, UserData>(
+    final UserData response = await apiRequest<UserData, UserData>(
       Constants.userDataUrl,
       () => UserData(),
       null,
@@ -252,16 +251,16 @@ class GestionApi {
         queryParameters: queryParams,
       );
     } catch (error) {
-      target.error = error.toString();
+      target.error = Errors.retrieveError(error.toString());
       return target;
     }
 
     if (builder != null) {
       try {
         if (response.statusCode! >= 300) {
-          Error error = Error.fromJson(
+          final Error error = Error.fromJson(
               jsonDecode(response.data!) as Map<String, dynamic>);
-          target.error = error.message;
+          target.error = error.code.toString();
         } else {
           target = builder(jsonDecode(response.data!) as Map<String, dynamic>);
         }
@@ -270,6 +269,10 @@ class GestionApi {
       }
     }
 
+    if (target.error != null) {
+      target.error = Errors.retrieveError(target.error!);
+    }
+
     return target;
   }
 }
diff --git a/lib/src/data/models/auth.dart b/lib/src/data/models/auth.dart
@@ -12,5 +12,6 @@ class Auth extends BaseModel {
 
   static Auth fromJson(Map<String, dynamic> json) => _$AuthFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$AuthToJson(this);
 }
diff --git a/lib/src/data/models/error.dart b/lib/src/data/models/error.dart
@@ -12,5 +12,6 @@ class Error extends BaseModel {
 
   static Error fromJson(Map<String, dynamic> json) => _$ErrorFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$ErrorToJson(this);
 }
diff --git a/lib/src/data/models/login.dart b/lib/src/data/models/login.dart
@@ -12,5 +12,6 @@ class Login extends BaseModel {
 
   static Login fromJson(Map<String, dynamic> json) => _$LoginFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$LoginToJson(this);
 }
diff --git a/lib/src/data/models/mail_quota.dart b/lib/src/data/models/mail_quota.dart
@@ -13,5 +13,6 @@ class MailQuota extends BaseModel {
   static MailQuota fromJson(Map<String, dynamic> json) =>
       _$MailQuotaFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$MailQuotaToJson(this);
 }
diff --git a/lib/src/data/models/pass_reset.dart b/lib/src/data/models/pass_reset.dart
@@ -13,5 +13,6 @@ class PassReset extends BaseModel {
   static PassReset fromJson(Map<String, dynamic> json) =>
       _$PassResetFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$PassResetToJson(this);
 }
diff --git a/lib/src/data/models/password_edit_data.dart b/lib/src/data/models/password_edit_data.dart
@@ -15,5 +15,6 @@ class PasswordEditData extends BaseModel {
   static PasswordEditData fromJson(Map<String, dynamic> json) =>
       _$PasswordEditDataFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$PasswordEditDataToJson(this);
 }
diff --git a/lib/src/data/models/password_reset_data.dart b/lib/src/data/models/password_reset_data.dart
@@ -15,5 +15,6 @@ class PasswordResetData extends BaseModel {
   static PasswordResetData fromJson(Map<String, dynamic> json) =>
       _$PasswordResetDataFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$PasswordResetDataToJson(this);
 }
diff --git a/lib/src/data/models/password_reset_user_id.dart b/lib/src/data/models/password_reset_user_id.dart
@@ -12,5 +12,6 @@ class PasswordResetUserId extends BaseModel {
   static PasswordResetUserId fromJson(Map<String, dynamic> json) =>
       _$PasswordResetUserIdFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$PasswordResetUserIdToJson(this);
 }
diff --git a/lib/src/data/models/quota.dart b/lib/src/data/models/quota.dart
@@ -13,5 +13,6 @@ class Quota extends BaseModel {
 
   static Quota fromJson(Map<String, dynamic> json) => _$QuotaFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$QuotaToJson(this);
 }
diff --git a/lib/src/data/models/security_questions.dart b/lib/src/data/models/security_questions.dart
@@ -12,5 +12,6 @@ class SecurityQuestions extends BaseModel {
   static SecurityQuestions fromJson(Map<String, dynamic> json) =>
       _$SecurityQuestionsFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$SecurityQuestionsToJson(this);
 }
diff --git a/lib/src/data/models/user_ci.dart b/lib/src/data/models/user_ci.dart
@@ -11,5 +11,6 @@ class UserCi extends BaseModel {
 
   static UserCi fromJson(Map<String, dynamic> json) => _$UserCiFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$UserCiToJson(this);
 }
diff --git a/lib/src/data/models/user_data.dart b/lib/src/data/models/user_data.dart
@@ -28,5 +28,6 @@ class UserData extends BaseModel {
   static UserData fromJson(Map<String, dynamic> json) =>
       _$UserDataFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$UserDataToJson(this);
 }
diff --git a/lib/src/data/models/user_id.dart b/lib/src/data/models/user_id.dart
@@ -11,5 +11,6 @@ class UserId extends BaseModel {
 
   static UserId fromJson(Map<String, dynamic> json) => _$UserIdFromJson(json);
 
+  @override
   Map<String, dynamic> toJson() => _$UserIdToJson(this);
 }
diff --git a/lib/src/data/repository/auth_repository/auth_repository.dart b/lib/src/data/repository/auth_repository/auth_repository.dart
@@ -1,10 +1,10 @@
 import 'dart:developer';
 
-import '../../../utils/constants/storage_keys.dart';
-import '../../api/api.dart';
-import '../../local/local_storage.dart';
-import '../../models.dart';
-import '../../models/status.dart';
+import 'package:gestionuh/src/data/api/api.dart';
+import 'package:gestionuh/src/data/local/local_storage.dart';
+import 'package:gestionuh/src/data/models.dart';
+import 'package:gestionuh/src/data/models/status.dart';
+import 'package:gestionuh/src/utils/constants/storage_keys.dart';
 
 class AuthRepository {
   final GestionApi api;

diff --git a/lib/src/presentation/blocs/login_bloc/login_bloc.dart b/lib/src/presentation/blocs/login_bloc/login_bloc.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../../data/repository.dart';
+import 'package:gestionuh/src/data/repository.dart';
+import 'package:gestionuh/src/utils/constants.dart';
 
 part 'login_event.dart';
 part 'login_state.dart';
@@ -28,7 +28,7 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
     );
     if (result == null) {
       yield LoginAttemptInitial(
-        error: 'Ha ocurrido un error inesperado.',
+        error: Errors.DefaultError,
       );
     } else if (result.error != null) {
       yield LoginAttemptInitial(

diff --git a/lib/src/presentation/blocs/mail_quota_bloc/mail_quota_bloc.dart b/lib/src/presentation/blocs/mail_quota_bloc/mail_quota_bloc.dart
@@ -1,6 +1,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:gestionuh/src/data/models.dart';
 import 'package:gestionuh/src/data/repository.dart';
+import 'package:gestionuh/src/utils/constants.dart';
 
 part 'mail_quota_event.dart';
 part 'mail_quota_state.dart';
@@ -25,7 +26,7 @@ class MailQuotaBloc extends Bloc<MailQuotaEvent, MailQuotaState> {
     final result = await mailQuotasRepository.getQuota();
     if (result == null) {
       yield MailQuotaLoadedFailure(
-        error: 'Ha ocurrido un error inesperado.',
+        error: Errors.DefaultError,
       );
     } else if (result.error != null) {
       yield MailQuotaLoadedFailure(

diff --git a/lib/src/presentation/blocs/profile_bloc/profile_bloc.dart b/lib/src/presentation/blocs/profile_bloc/profile_bloc.dart
@@ -1,6 +1,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:gestionuh/src/data/models.dart';
 import 'package:gestionuh/src/data/repository.dart';
+import 'package:gestionuh/src/utils/constants.dart';
 
 part 'profile_event.dart';
 part 'profile_state.dart';
@@ -25,7 +26,7 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
     final result = await profileRepository.getUserData();
     if (result == null) {
       yield ProfileLoadedFailure(
-        error: 'Ha ocurrido un error inesperado.',
+        error: Errors.DefaultError,
       );
     } else if (result.error != null) {
       yield ProfileLoadedFailure(

diff --git a/lib/src/presentation/blocs/quota_bloc/quota_bloc.dart b/lib/src/presentation/blocs/quota_bloc/quota_bloc.dart
@@ -1,6 +1,7 @@
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:gestionuh/src/data/models.dart';
 import 'package:gestionuh/src/data/repository.dart';
+import 'package:gestionuh/src/utils/constants.dart';
 
 part 'quota_event.dart';
 part 'quota_state.dart';
@@ -24,7 +25,7 @@ class QuotaBloc extends Bloc<QuotaEvent, QuotaState> {
     final result = await quotasRepository.getQuota();
     if (result == null) {
       yield QuotaLoadedFailure(
-        error: 'Ha ocurrido un error inesperado.',
+        error: Errors.DefaultError,
       );
     } else if (result.error != null) {
       yield QuotaLoadedFailure(