From 39bab3e4aca5f024ad8df7ca260e6dfb7290d467 Mon Sep 17 00:00:00 2001 From: EngDann Date: Sat, 28 Dec 2024 16:23:52 -0300 Subject: [PATCH] =?UTF-8?q?fix#00:=20refatora=C3=A7=C3=A3o=20de=20todas=20?= =?UTF-8?q?os=20arquivos=20e=20pastas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/config/{ThemeApp.dart => theme_app.dart} | 0 .../{StorageValue.dart => storage_value.dart} | 6 ++-- lib/core/log/{Log.dart => log.dart} | 0 lib/core/network/app_interceptors.dart | 7 ++--- lib/core/network/base_api.dart | 2 +- .../network/token_manager/auth_service.dart | 4 +-- lib/main.dart | 5 ++-- ...Request.dart => edit_profile_request.dart} | 0 ...sponse.dart => edit_profile_response.dart} | 0 ...Service.dart => edit_profile_service.dart} | 2 +- ...rofileView.dart => edit_profile_view.dart} | 29 +++++++------------ .../edit_profile_view_model.dart} | 0 .../view/{HomeView.dart => home_view.dart} | 0 .../{LoginRequest.dart => login_request.dart} | 0 ...LoginResponse.dart => login_response.dart} | 0 .../{LoginService.dart => login_service.dart} | 8 ++--- lib/ui/login/view/login_view.dart | 16 +++++----- .../login_view_model.dart | 8 ++--- ...ViewModel.dart => nav_bar_view_model.dart} | 0 .../{navBarView.dart => nav_bar_view.dart} | 6 ++-- lib/ui/onboarding/view/onboarding_view.dart | 2 +- .../onboarding_view_model.dart | 0 .../view/{Profile.dart => profile.dart} | 0 ...uest.dart => recover_account_request.dart} | 0 .../service/RecoverAccountService.dart | 17 ----------- .../service/recover_account_service.dart | 12 ++++++++ .../view/recover_account_view.dart | 13 ++++----- .../recover_account_view_model.dart | 5 ++-- .../view/register_account_view.dart | 19 ++++++------ .../register_view_model.dart | 0 .../{ErrorPopUp.dart => error_pop_up.dart} | 15 +++------- .../{OrDivider.dart => or_divider.dart} | 0 ...requestbutton.dart => request_button.dart} | 0 .../{TextAndLink.dart => text_and_link.dart} | 0 .../{TextEmail.dart => text_email.dart} | 0 .../shared/{TextName.dart => text_name.dart} | 0 .../{TextPassword.dart => text_password.dart} | 0 .../{TitleSlogan.dart => title_slogan.dart} | 0 .../{WelcomeView.dart => welcome_view.dart} | 0 ...PopUp_test.dart => error_pop_up_test.dart} | 2 +- ...xtEmail_test.dart => text_email_test.dart} | 11 ++++--- ...TextName_test.dart => text_name_test.dart} | 8 +++-- ...word_test.dart => text_password_test.dart} | 5 ++-- test/ui/login/view/login_view_test.dart | 13 ++++----- test/ui/login/view/login_view_test.mocks.dart | 2 +- .../view/recover_account_test.dart | 20 ++++--------- .../view/recover_account_test.mocks.dart | 2 +- .../view/register_account_view_test.dart | 13 ++++----- .../register_account_view_test.mocks.dart | 2 +- 49 files changed, 110 insertions(+), 144 deletions(-) rename lib/config/{ThemeApp.dart => theme_app.dart} (100%) rename lib/core/data/local/{StorageValue.dart => storage_value.dart} (92%) rename lib/core/log/{Log.dart => log.dart} (100%) rename lib/ui/edit_profile/model/{EditProfileRequest.dart => edit_profile_request.dart} (100%) rename lib/ui/edit_profile/model/{EditProfileResponse.dart => edit_profile_response.dart} (100%) rename lib/ui/edit_profile/service/{EditProfileService.dart => edit_profile_service.dart} (81%) rename lib/ui/edit_profile/view/{EditProfileView.dart => edit_profile_view.dart} (87%) rename lib/ui/edit_profile/{viewModel/EditProfileViewModel.dart => view_model/edit_profile_view_model.dart} (100%) rename lib/ui/home/view/{HomeView.dart => home_view.dart} (100%) rename lib/ui/login/model/{LoginRequest.dart => login_request.dart} (100%) rename lib/ui/login/model/{LoginResponse.dart => login_response.dart} (100%) rename lib/ui/login/service/{LoginService.dart => login_service.dart} (79%) rename lib/ui/login/{viewModel => view_model}/login_view_model.dart (87%) rename lib/ui/navbar/model/{navBarViewModel.dart => nav_bar_view_model.dart} (100%) rename lib/ui/navbar/view/{navBarView.dart => nav_bar_view.dart} (89%) rename lib/ui/onboarding/{viewModel => view_model}/onboarding_view_model.dart (100%) rename lib/ui/profile/view/{Profile.dart => profile.dart} (100%) rename lib/ui/recover_account/model/{RecoverAccountRequest.dart => recover_account_request.dart} (100%) delete mode 100644 lib/ui/recover_account/service/RecoverAccountService.dart create mode 100644 lib/ui/recover_account/service/recover_account_service.dart rename lib/ui/recover_account/{viewModel => view_model}/recover_account_view_model.dart (78%) rename lib/ui/register_account/{viewModel => view_model}/register_view_model.dart (100%) rename lib/ui/shared/{ErrorPopUp.dart => error_pop_up.dart} (70%) rename lib/ui/shared/{OrDivider.dart => or_divider.dart} (100%) rename lib/ui/shared/{requestbutton.dart => request_button.dart} (100%) rename lib/ui/shared/{TextAndLink.dart => text_and_link.dart} (100%) rename lib/ui/shared/{TextEmail.dart => text_email.dart} (100%) rename lib/ui/shared/{TextName.dart => text_name.dart} (100%) rename lib/ui/shared/{TextPassword.dart => text_password.dart} (100%) rename lib/ui/shared/{TitleSlogan.dart => title_slogan.dart} (100%) rename lib/ui/welcome/view/{WelcomeView.dart => welcome_view.dart} (100%) rename test/ui/Shared/{ErrorPopUp_test.dart => error_pop_up_test.dart} (94%) rename test/ui/Shared/{TextEmail_test.dart => text_email_test.dart} (73%) rename test/ui/Shared/{TextName_test.dart => text_name_test.dart} (76%) rename test/ui/Shared/{TextPassword_test.dart => text_password_test.dart} (94%) diff --git a/lib/config/ThemeApp.dart b/lib/config/theme_app.dart similarity index 100% rename from lib/config/ThemeApp.dart rename to lib/config/theme_app.dart diff --git a/lib/core/data/local/StorageValue.dart b/lib/core/data/local/storage_value.dart similarity index 92% rename from lib/core/data/local/StorageValue.dart rename to lib/core/data/local/storage_value.dart index e102264..e78c744 100644 --- a/lib/core/data/local/StorageValue.dart +++ b/lib/core/data/local/storage_value.dart @@ -1,8 +1,7 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart'; -import 'package:aranduapp/core/log/Log.dart'; +import 'package:aranduapp/core/log/log.dart'; class StorageValue { - static const String _authToken = "auth_token"; static const String _refreshToken = "refresh_token"; static const String _email = "email"; @@ -15,8 +14,7 @@ class StorageValue { : storage = const FlutterSecureStorage( aOptions: AndroidOptions(encryptedSharedPreferences: true)); - factory StorageValue.getInstance() => - _singleton ??= StorageValue._internal(); + factory StorageValue.getInstance() => _singleton ??= StorageValue._internal(); Future _setValue(String key, String value) async { try { diff --git a/lib/core/log/Log.dart b/lib/core/log/log.dart similarity index 100% rename from lib/core/log/Log.dart rename to lib/core/log/log.dart diff --git a/lib/core/network/app_interceptors.dart b/lib/core/network/app_interceptors.dart index 651249d..286d2b1 100644 --- a/lib/core/network/app_interceptors.dart +++ b/lib/core/network/app_interceptors.dart @@ -1,5 +1,5 @@ -import 'package:aranduapp/core/data/local/StorageValue.dart'; -import 'package:aranduapp/core/log/Log.dart'; +import 'package:aranduapp/core/data/local/storage_value.dart'; +import 'package:aranduapp/core/log/log.dart'; import 'package:aranduapp/core/network/token_manager/auth_service.dart'; import 'package:aranduapp/core/network/token_manager/model/refresh_token_response.dart'; import 'package:dio/dio.dart'; @@ -27,8 +27,7 @@ class AppInterceptors extends Interceptor { try { Log.i('Token expirado. Tentando atualizar o token...'); - RefreshTokenResponse tokens = - await AuthService().refreshToken(); + RefreshTokenResponse tokens = await AuthService().refreshToken(); final requestOptions = err.requestOptions; diff --git a/lib/core/network/base_api.dart b/lib/core/network/base_api.dart index 2f3e284..e7671cc 100644 --- a/lib/core/network/base_api.dart +++ b/lib/core/network/base_api.dart @@ -1,4 +1,4 @@ -import 'package:aranduapp/core/log/Log.dart'; +import 'package:aranduapp/core/log/log.dart'; import 'package:aranduapp/core/network/app_interceptors.dart'; import 'package:dio/dio.dart'; diff --git a/lib/core/network/token_manager/auth_service.dart b/lib/core/network/token_manager/auth_service.dart index 44b103f..af9256b 100644 --- a/lib/core/network/token_manager/auth_service.dart +++ b/lib/core/network/token_manager/auth_service.dart @@ -1,5 +1,5 @@ -import 'package:aranduapp/core/data/local/StorageValue.dart'; -import 'package:aranduapp/core/log/Log.dart'; +import 'package:aranduapp/core/data/local/storage_value.dart'; +import 'package:aranduapp/core/log/log.dart'; import 'package:aranduapp/core/network/base_api.dart'; import 'package:aranduapp/core/network/token_manager/model/refresh_token_response.dart'; import 'package:dio/dio.dart'; diff --git a/lib/main.dart b/lib/main.dart index abcd3db..81593fd 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,6 +1,5 @@ -import 'package:aranduapp/config/ThemeApp.dart'; -import 'package:aranduapp/ui/login/view/login_view.dart'; -import 'package:aranduapp/ui/welcome/view/WelcomeView.dart'; +import 'package:aranduapp/config/theme_app.dart'; +import 'package:aranduapp/ui/welcome/view/welcome_view.dart'; import 'package:flutter/material.dart'; void main() { diff --git a/lib/ui/edit_profile/model/EditProfileRequest.dart b/lib/ui/edit_profile/model/edit_profile_request.dart similarity index 100% rename from lib/ui/edit_profile/model/EditProfileRequest.dart rename to lib/ui/edit_profile/model/edit_profile_request.dart diff --git a/lib/ui/edit_profile/model/EditProfileResponse.dart b/lib/ui/edit_profile/model/edit_profile_response.dart similarity index 100% rename from lib/ui/edit_profile/model/EditProfileResponse.dart rename to lib/ui/edit_profile/model/edit_profile_response.dart diff --git a/lib/ui/edit_profile/service/EditProfileService.dart b/lib/ui/edit_profile/service/edit_profile_service.dart similarity index 81% rename from lib/ui/edit_profile/service/EditProfileService.dart rename to lib/ui/edit_profile/service/edit_profile_service.dart index 3b621f8..b9f83a3 100644 --- a/lib/ui/edit_profile/service/EditProfileService.dart +++ b/lib/ui/edit_profile/service/edit_profile_service.dart @@ -1,4 +1,4 @@ -import 'package:aranduapp/ui/edit_profile/model/EditProfileRequest.dart'; +import 'package:aranduapp/ui/edit_profile/model/edit_profile_request.dart'; import 'package:dio/dio.dart'; class EditProfileService { diff --git a/lib/ui/edit_profile/view/EditProfileView.dart b/lib/ui/edit_profile/view/edit_profile_view.dart similarity index 87% rename from lib/ui/edit_profile/view/EditProfileView.dart rename to lib/ui/edit_profile/view/edit_profile_view.dart index ec55fcb..195d2d8 100644 --- a/lib/ui/edit_profile/view/EditProfileView.dart +++ b/lib/ui/edit_profile/view/edit_profile_view.dart @@ -1,10 +1,10 @@ -import 'package:aranduapp/ui/shared/TextName.dart'; +import 'package:aranduapp/ui/shared/text_name.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:aranduapp/ui/edit_profile/viewModel/EditProfileViewModel.dart'; -import 'package:aranduapp/ui/shared/TextEmail.dart'; -import 'package:aranduapp/ui/shared/TextPassword.dart'; +import 'package:aranduapp/ui/edit_profile/view_model/edit_profile_view_model.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; +import 'package:aranduapp/ui/shared/text_password.dart'; class EditProfile extends StatelessWidget { const EditProfile({super.key}); @@ -26,16 +26,14 @@ class EditProfileScreen extends StatefulWidget { } class _EditProfileScreenState extends State { - @override Widget build(BuildContext context) { final viewModel = Provider.of(context); return Scaffold( - appBar: AppBar( - title: const Text('Editar Perfil'), - ), - body: _buildForm(viewModel) - ); + appBar: AppBar( + title: const Text('Editar Perfil'), + ), + body: _buildForm(viewModel)); } Widget _buildForm(EditProfileViewModel viewModel) { @@ -46,22 +44,17 @@ class _EditProfileScreenState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - TextName( - controller: viewModel.firstNameController, - padding: const EdgeInsets.symmetric(vertical: 16) - ), - + controller: viewModel.firstNameController, + padding: const EdgeInsets.symmetric(vertical: 16)), TextEmail( padding: const EdgeInsets.symmetric(vertical: 16), controller: viewModel.emailController, ), - TextPassWord( padding: const EdgeInsets.symmetric(vertical: 16), controller: viewModel.passwordController, ), - const SizedBox(height: 32), _saveButton(viewModel), const SizedBox(height: 16), @@ -87,13 +80,11 @@ class _EditProfileScreenState extends State { ); } }, - child: Consumer( builder: (context, value, child) => value.isLoading ? const CircularProgressIndicator(value: null) : const Text('Salvar'), ), - ); } diff --git a/lib/ui/edit_profile/viewModel/EditProfileViewModel.dart b/lib/ui/edit_profile/view_model/edit_profile_view_model.dart similarity index 100% rename from lib/ui/edit_profile/viewModel/EditProfileViewModel.dart rename to lib/ui/edit_profile/view_model/edit_profile_view_model.dart diff --git a/lib/ui/home/view/HomeView.dart b/lib/ui/home/view/home_view.dart similarity index 100% rename from lib/ui/home/view/HomeView.dart rename to lib/ui/home/view/home_view.dart diff --git a/lib/ui/login/model/LoginRequest.dart b/lib/ui/login/model/login_request.dart similarity index 100% rename from lib/ui/login/model/LoginRequest.dart rename to lib/ui/login/model/login_request.dart diff --git a/lib/ui/login/model/LoginResponse.dart b/lib/ui/login/model/login_response.dart similarity index 100% rename from lib/ui/login/model/LoginResponse.dart rename to lib/ui/login/model/login_response.dart diff --git a/lib/ui/login/service/LoginService.dart b/lib/ui/login/service/login_service.dart similarity index 79% rename from lib/ui/login/service/LoginService.dart rename to lib/ui/login/service/login_service.dart index 0d85360..b406dcc 100644 --- a/lib/ui/login/service/LoginService.dart +++ b/lib/ui/login/service/login_service.dart @@ -1,9 +1,9 @@ -import 'package:aranduapp/core/data/local/StorageValue.dart'; -import 'package:aranduapp/core/log/Log.dart'; +import 'package:aranduapp/core/data/local/storage_value.dart'; +import 'package:aranduapp/core/log/log.dart'; import 'package:aranduapp/core/network/base_api.dart'; import 'package:aranduapp/core/network/token_manager/auth_service.dart'; -import 'package:aranduapp/ui/login/model/LoginRequest.dart'; -import 'package:aranduapp/ui/login/model/LoginResponse.dart'; +import 'package:aranduapp/ui/login/model/login_request.dart'; +import 'package:aranduapp/ui/login/model/login_response.dart'; import 'package:dio/dio.dart'; class LoginService { diff --git a/lib/ui/login/view/login_view.dart b/lib/ui/login/view/login_view.dart index 1066cc7..34b1937 100644 --- a/lib/ui/login/view/login_view.dart +++ b/lib/ui/login/view/login_view.dart @@ -1,19 +1,19 @@ -import 'package:aranduapp/core/log/Log.dart'; -import 'package:aranduapp/ui/shared/TextAndLink.dart'; +import 'package:aranduapp/core/log/log.dart'; +import 'package:aranduapp/ui/shared/text_and_link.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:aranduapp/ui/login/viewModel/login_view_model.dart'; +import 'package:aranduapp/ui/login/view_model/login_view_model.dart'; import 'package:aranduapp/ui/recover_account/view/recover_account_view.dart'; import 'package:aranduapp/ui/register_account/view/register_account_view.dart'; -import 'package:aranduapp/ui/shared/TitleSlogan.dart'; -import 'package:aranduapp/ui/shared/TextEmail.dart'; -import 'package:aranduapp/ui/shared/ErrorPopUp.dart'; -import 'package:aranduapp/ui/shared/TextPassword.dart'; -import 'package:aranduapp/ui/shared/OrDivider.dart'; +import 'package:aranduapp/ui/shared/title_slogan.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; +import 'package:aranduapp/ui/shared/error_pop_up.dart'; +import 'package:aranduapp/ui/shared/text_password.dart'; +import 'package:aranduapp/ui/shared/or_divider.dart'; class Login extends StatelessWidget { const Login({super.key}); diff --git a/lib/ui/login/viewModel/login_view_model.dart b/lib/ui/login/view_model/login_view_model.dart similarity index 87% rename from lib/ui/login/viewModel/login_view_model.dart rename to lib/ui/login/view_model/login_view_model.dart index e941a46..1fe14fe 100644 --- a/lib/ui/login/viewModel/login_view_model.dart +++ b/lib/ui/login/view_model/login_view_model.dart @@ -1,9 +1,9 @@ -import 'package:aranduapp/core/log/Log.dart'; -import 'package:aranduapp/ui/navbar/view/navBarView.dart'; +import 'package:aranduapp/core/log/log.dart'; +import 'package:aranduapp/ui/navbar/view/nav_bar_view.dart'; import 'package:flutter/material.dart'; import 'package:local_auth/local_auth.dart'; -import 'package:aranduapp/ui/login/service/LoginService.dart'; -import 'package:aranduapp/ui/login/model/LoginRequest.dart'; +import 'package:aranduapp/ui/login/service/login_service.dart'; +import 'package:aranduapp/ui/login/model/login_request.dart'; class LoginViewModel extends ChangeNotifier { final BuildContext context; diff --git a/lib/ui/navbar/model/navBarViewModel.dart b/lib/ui/navbar/model/nav_bar_view_model.dart similarity index 100% rename from lib/ui/navbar/model/navBarViewModel.dart rename to lib/ui/navbar/model/nav_bar_view_model.dart diff --git a/lib/ui/navbar/view/navBarView.dart b/lib/ui/navbar/view/nav_bar_view.dart similarity index 89% rename from lib/ui/navbar/view/navBarView.dart rename to lib/ui/navbar/view/nav_bar_view.dart index 10eba37..56206c5 100644 --- a/lib/ui/navbar/view/navBarView.dart +++ b/lib/ui/navbar/view/nav_bar_view.dart @@ -1,7 +1,7 @@ -import 'package:aranduapp/ui/home/view/HomeView.dart'; +import 'package:aranduapp/ui/home/view/home_view.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:aranduapp/ui/navbar/model/navBarViewModel.dart'; +import 'package:aranduapp/ui/navbar/model/nav_bar_view_model.dart'; class NavbarView extends StatelessWidget { const NavbarView({super.key}); @@ -34,7 +34,7 @@ Widget page(BuildContext context) { currentIndex: viewModel.selectedIndex, onTap: viewModel.changeTab, selectedItemColor: Theme.of(context).colorScheme.primary, - unselectedItemColor:Theme.of(context).colorScheme.onSurface, + unselectedItemColor: Theme.of(context).colorScheme.onSurface, items: const [ BottomNavigationBarItem( icon: Icon(Icons.home_outlined), diff --git a/lib/ui/onboarding/view/onboarding_view.dart b/lib/ui/onboarding/view/onboarding_view.dart index 8f06575..ea4e7b0 100644 --- a/lib/ui/onboarding/view/onboarding_view.dart +++ b/lib/ui/onboarding/view/onboarding_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import '../viewModel/onboarding_view_model.dart'; +import '../view_model/onboarding_view_model.dart'; class OnboardingView extends StatelessWidget { const OnboardingView({super.key}); diff --git a/lib/ui/onboarding/viewModel/onboarding_view_model.dart b/lib/ui/onboarding/view_model/onboarding_view_model.dart similarity index 100% rename from lib/ui/onboarding/viewModel/onboarding_view_model.dart rename to lib/ui/onboarding/view_model/onboarding_view_model.dart diff --git a/lib/ui/profile/view/Profile.dart b/lib/ui/profile/view/profile.dart similarity index 100% rename from lib/ui/profile/view/Profile.dart rename to lib/ui/profile/view/profile.dart diff --git a/lib/ui/recover_account/model/RecoverAccountRequest.dart b/lib/ui/recover_account/model/recover_account_request.dart similarity index 100% rename from lib/ui/recover_account/model/RecoverAccountRequest.dart rename to lib/ui/recover_account/model/recover_account_request.dart diff --git a/lib/ui/recover_account/service/RecoverAccountService.dart b/lib/ui/recover_account/service/RecoverAccountService.dart deleted file mode 100644 index 2ab2331..0000000 --- a/lib/ui/recover_account/service/RecoverAccountService.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'package:aranduapp/core/network/base_api.dart'; -import 'package:aranduapp/ui/recover_account/model/RecoverAccountRequest.dart'; - -class RecoverAccountService { - - - static Future forgetPassword(RecoverAccountRequest recoverAccountRequest) async { - - await BaseApi.getInstance(auth:false).post( - path: '/auth/forgot-password', - data: { - 'email' : recoverAccountRequest.email, - } - ); - } - -} diff --git a/lib/ui/recover_account/service/recover_account_service.dart b/lib/ui/recover_account/service/recover_account_service.dart new file mode 100644 index 0000000..70715b6 --- /dev/null +++ b/lib/ui/recover_account/service/recover_account_service.dart @@ -0,0 +1,12 @@ +import 'package:aranduapp/core/network/base_api.dart'; +import 'package:aranduapp/ui/recover_account/model/recover_account_request.dart'; + +class RecoverAccountService { + static Future forgetPassword( + RecoverAccountRequest recoverAccountRequest) async { + await BaseApi.getInstance(auth: false) + .post(path: '/auth/forgot-password', data: { + 'email': recoverAccountRequest.email, + }); + } +} diff --git a/lib/ui/recover_account/view/recover_account_view.dart b/lib/ui/recover_account/view/recover_account_view.dart index 11199c0..c5ef8f5 100644 --- a/lib/ui/recover_account/view/recover_account_view.dart +++ b/lib/ui/recover_account/view/recover_account_view.dart @@ -1,10 +1,9 @@ -import 'package:aranduapp/core/log/Log.dart'; -import 'package:aranduapp/ui/recover_account/viewModel/recover_account_view_model.dart'; -import 'package:aranduapp/ui/shared/ErrorPopUp.dart'; -import 'package:aranduapp/ui/shared/TextAndLink.dart'; -import 'package:aranduapp/ui/shared/TextEmail.dart'; -import 'package:aranduapp/ui/shared/TitleSlogan.dart'; -import 'package:aranduapp/ui/shared/requestbutton.dart'; +import 'package:aranduapp/ui/recover_account/view_model/recover_account_view_model.dart'; +import 'package:aranduapp/ui/shared/error_pop_up.dart'; +import 'package:aranduapp/ui/shared/text_and_link.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; +import 'package:aranduapp/ui/shared/title_slogan.dart'; +import 'package:aranduapp/ui/shared/request_button.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/lib/ui/recover_account/viewModel/recover_account_view_model.dart b/lib/ui/recover_account/view_model/recover_account_view_model.dart similarity index 78% rename from lib/ui/recover_account/viewModel/recover_account_view_model.dart rename to lib/ui/recover_account/view_model/recover_account_view_model.dart index ae77d83..ee8dbdf 100644 --- a/lib/ui/recover_account/viewModel/recover_account_view_model.dart +++ b/lib/ui/recover_account/view_model/recover_account_view_model.dart @@ -1,7 +1,6 @@ -import 'package:aranduapp/core/log/Log.dart'; import 'package:aranduapp/core/state/command.dart'; -import 'package:aranduapp/ui/recover_account/model/RecoverAccountRequest.dart'; -import 'package:aranduapp/ui/recover_account/service/RecoverAccountService.dart'; +import 'package:aranduapp/ui/recover_account/model/recover_account_request.dart'; +import 'package:aranduapp/ui/recover_account/service/recover_account_service.dart'; import 'package:async/async.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/register_account/view/register_account_view.dart b/lib/ui/register_account/view/register_account_view.dart index ed81652..677feea 100644 --- a/lib/ui/register_account/view/register_account_view.dart +++ b/lib/ui/register_account/view/register_account_view.dart @@ -1,18 +1,17 @@ -import 'package:aranduapp/ui/login/view/login_view.dart'; -import 'package:aranduapp/ui/shared/OrDivider.dart'; -import 'package:aranduapp/ui/shared/TextAndLink.dart'; -import 'package:aranduapp/ui/shared/TextName.dart'; +import 'package:aranduapp/ui/shared/or_divider.dart'; +import 'package:aranduapp/ui/shared/text_and_link.dart'; +import 'package:aranduapp/ui/shared/text_name.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:aranduapp/core/log/Log.dart'; +import 'package:aranduapp/core/log/log.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:aranduapp/ui/register_account/viewModel/register_view_model.dart'; +import 'package:aranduapp/ui/register_account/view_model/register_view_model.dart'; -import 'package:aranduapp/ui/shared/TitleSlogan.dart'; -import 'package:aranduapp/ui/shared/TextEmail.dart'; -import 'package:aranduapp/ui/shared/ErrorPopUp.dart'; -import 'package:aranduapp/ui/shared/TextPassword.dart'; +import 'package:aranduapp/ui/shared/title_slogan.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; +import 'package:aranduapp/ui/shared/error_pop_up.dart'; +import 'package:aranduapp/ui/shared/text_password.dart'; class RegisterAccount extends StatelessWidget { const RegisterAccount({super.key}); diff --git a/lib/ui/register_account/viewModel/register_view_model.dart b/lib/ui/register_account/view_model/register_view_model.dart similarity index 100% rename from lib/ui/register_account/viewModel/register_view_model.dart rename to lib/ui/register_account/view_model/register_view_model.dart diff --git a/lib/ui/shared/ErrorPopUp.dart b/lib/ui/shared/error_pop_up.dart similarity index 70% rename from lib/ui/shared/ErrorPopUp.dart rename to lib/ui/shared/error_pop_up.dart index 8dbdc82..2ea1d96 100644 --- a/lib/ui/shared/ErrorPopUp.dart +++ b/lib/ui/shared/error_pop_up.dart @@ -1,19 +1,16 @@ import 'package:flutter/material.dart'; -import 'package:aranduapp/core/log/Log.dart'; +import 'package:aranduapp/core/log/log.dart'; class ErrorPopUp extends StatelessWidget { - final Widget content; const ErrorPopUp({super.key, required this.content}); @override Widget build(BuildContext context) { - return AlertDialog ( - title: Align( - + return AlertDialog( + title: Align( alignment: Alignment.centerLeft, - child: Icon( Icons.error, size: 40, @@ -23,11 +20,7 @@ class ErrorPopUp extends StatelessWidget { content: content, actions: [ TextButton( - - onPressed: () => { - Log.d('tap'), - Navigator.pop(context, 'OK') - }, + onPressed: () => {Log.d('tap'), Navigator.pop(context, 'OK')}, child: const Text('OK'), ), ], diff --git a/lib/ui/shared/OrDivider.dart b/lib/ui/shared/or_divider.dart similarity index 100% rename from lib/ui/shared/OrDivider.dart rename to lib/ui/shared/or_divider.dart diff --git a/lib/ui/shared/requestbutton.dart b/lib/ui/shared/request_button.dart similarity index 100% rename from lib/ui/shared/requestbutton.dart rename to lib/ui/shared/request_button.dart diff --git a/lib/ui/shared/TextAndLink.dart b/lib/ui/shared/text_and_link.dart similarity index 100% rename from lib/ui/shared/TextAndLink.dart rename to lib/ui/shared/text_and_link.dart diff --git a/lib/ui/shared/TextEmail.dart b/lib/ui/shared/text_email.dart similarity index 100% rename from lib/ui/shared/TextEmail.dart rename to lib/ui/shared/text_email.dart diff --git a/lib/ui/shared/TextName.dart b/lib/ui/shared/text_name.dart similarity index 100% rename from lib/ui/shared/TextName.dart rename to lib/ui/shared/text_name.dart diff --git a/lib/ui/shared/TextPassword.dart b/lib/ui/shared/text_password.dart similarity index 100% rename from lib/ui/shared/TextPassword.dart rename to lib/ui/shared/text_password.dart diff --git a/lib/ui/shared/TitleSlogan.dart b/lib/ui/shared/title_slogan.dart similarity index 100% rename from lib/ui/shared/TitleSlogan.dart rename to lib/ui/shared/title_slogan.dart diff --git a/lib/ui/welcome/view/WelcomeView.dart b/lib/ui/welcome/view/welcome_view.dart similarity index 100% rename from lib/ui/welcome/view/WelcomeView.dart rename to lib/ui/welcome/view/welcome_view.dart diff --git a/test/ui/Shared/ErrorPopUp_test.dart b/test/ui/Shared/error_pop_up_test.dart similarity index 94% rename from test/ui/Shared/ErrorPopUp_test.dart rename to test/ui/Shared/error_pop_up_test.dart index 3bee757..43c7f62 100644 --- a/test/ui/Shared/ErrorPopUp_test.dart +++ b/test/ui/Shared/error_pop_up_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:aranduapp/ui/shared/ErrorPopUp.dart'; +import 'package:aranduapp/ui/shared/error_pop_up.dart'; void main() { testWidgets('Testa ErrorPopUp', (WidgetTester tester) async { diff --git a/test/ui/Shared/TextEmail_test.dart b/test/ui/Shared/text_email_test.dart similarity index 73% rename from test/ui/Shared/TextEmail_test.dart rename to test/ui/Shared/text_email_test.dart index fb07c2e..ad59c50 100644 --- a/test/ui/Shared/TextEmail_test.dart +++ b/test/ui/Shared/text_email_test.dart @@ -1,4 +1,4 @@ -import 'package:aranduapp/ui/shared/TextEmail.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -29,9 +29,12 @@ void main() { // Teste de validação para diferentes casos await testEmail("", "E-mail Obrigatório."); // Campo vazio - await testEmail("joaozinhi", "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem '@' - await testEmail("joaozinhi@", "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem domínio - await testEmail("joao@domain", "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem extensão + await testEmail("joaozinhi", + "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem '@' + await testEmail("joaozinhi@", + "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem domínio + await testEmail("joao@domain", + "Opa, E-mail inválido!\n(Ex: exemplo@gmail.com)"); // Sem extensão await testEmail("joao@example.com", null); // Entrada válida }); } diff --git a/test/ui/Shared/TextName_test.dart b/test/ui/Shared/text_name_test.dart similarity index 76% rename from test/ui/Shared/TextName_test.dart rename to test/ui/Shared/text_name_test.dart index b18e1ae..5ef6b97 100644 --- a/test/ui/Shared/TextName_test.dart +++ b/test/ui/Shared/text_name_test.dart @@ -1,4 +1,4 @@ -import 'package:aranduapp/ui/shared/TextName.dart'; +import 'package:aranduapp/ui/shared/text_name.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -27,8 +27,10 @@ void main() { // Teste de validação para diferentes casos de nome await testName("", 'Nome Obrigatório.'); // Campo vazio - await testName(" a", 'Opa, seu Nome está pequeno!\nacrescente mais caracteres. (Ex: Ana)'); // Nome com menos de 3 caracteres - await testName("Jo", 'Opa, seu Nome está pequeno!\nacrescente mais um caractere. (Ex: Ana)'); // Nome com 2 caracteres + await testName(" a", + 'Opa, seu Nome está pequeno!\nacrescente mais caracteres. (Ex: Ana)'); // Nome com menos de 3 caracteres + await testName("Jo", + 'Opa, seu Nome está pequeno!\nacrescente mais um caractere. (Ex: Ana)'); // Nome com 2 caracteres await testName("João", null); // Nome válido await testName("Maria", null); // Outro nome válido }); diff --git a/test/ui/Shared/TextPassword_test.dart b/test/ui/Shared/text_password_test.dart similarity index 94% rename from test/ui/Shared/TextPassword_test.dart rename to test/ui/Shared/text_password_test.dart index 95172d9..1312436 100644 --- a/test/ui/Shared/TextPassword_test.dart +++ b/test/ui/Shared/text_password_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:aranduapp/ui/shared/TextPassword.dart'; +import 'package:aranduapp/ui/shared/text_password.dart'; void main() { // Testa a validação da senha no widget TextPassWord @@ -33,7 +33,8 @@ void main() { } // Testa senhas inválidas, válidas e campo vazio - await testPassword('12345', "Senha deve ter no mínimo 8 caracteres.\n(Ex: @abd1234)"); // Senha muito curta + await testPassword('12345', + "Senha deve ter no mínimo 8 caracteres.\n(Ex: @abd1234)"); // Senha muito curta await testPassword('validPassword123', null); // Senha válida await testPassword('', 'Senha Obrigatória.'); // Campo vazio }); diff --git a/test/ui/login/view/login_view_test.dart b/test/ui/login/view/login_view_test.dart index ce87e46..8f53867 100644 --- a/test/ui/login/view/login_view_test.dart +++ b/test/ui/login/view/login_view_test.dart @@ -1,7 +1,7 @@ import 'package:aranduapp/ui/login/view/login_view.dart'; -import 'package:aranduapp/ui/login/viewModel/login_view_model.dart'; -import 'package:aranduapp/ui/shared/TextEmail.dart'; -import 'package:aranduapp/ui/shared/TextPassword.dart'; +import 'package:aranduapp/ui/login/view_model/login_view_model.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; +import 'package:aranduapp/ui/shared/text_password.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:mockito/annotations.dart'; @@ -95,8 +95,7 @@ void main() { expect(mockViewModel.passwordController.text, password); }); - testWidgets('Login is successful', - (WidgetTester tester) async { + testWidgets('Login is successful', (WidgetTester tester) async { when(mockViewModel.validateToken()) .thenAnswer((_) async => throw Exception('Token validation failed')); @@ -113,6 +112,6 @@ void main() { verify(mockViewModel.goToHome()).called(1); }); - testWidgets('Displays error when login fails', (WidgetTester tester) async { - }); + testWidgets( + 'Displays error when login fails', (WidgetTester tester) async {}); } diff --git a/test/ui/login/view/login_view_test.mocks.dart b/test/ui/login/view/login_view_test.mocks.dart index fa695eb..290b5ab 100644 --- a/test/ui/login/view/login_view_test.mocks.dart +++ b/test/ui/login/view/login_view_test.mocks.dart @@ -5,7 +5,7 @@ // ignore_for_file: no_leading_underscores_for_library_prefixes import 'dart:async' as _i4; -import 'package:aranduapp/ui/login/viewModel/login_view_model.dart' as _i3; +import 'package:aranduapp/ui/login/view_model/login_view_model.dart' as _i3; import 'package:flutter/material.dart' as _i2; import 'package:mockito/mockito.dart' as _i1; diff --git a/test/ui/recover_account/view/recover_account_test.dart b/test/ui/recover_account/view/recover_account_test.dart index 599ded6..6ae68a5 100644 --- a/test/ui/recover_account/view/recover_account_test.dart +++ b/test/ui/recover_account/view/recover_account_test.dart @@ -1,8 +1,8 @@ import 'package:aranduapp/core/state/command.dart'; -import 'package:aranduapp/ui/shared/TextAndLink.dart'; -import 'package:aranduapp/ui/shared/TextEmail.dart'; -import 'package:aranduapp/ui/shared/TitleSlogan.dart'; -import 'package:aranduapp/ui/shared/requestbutton.dart'; +import 'package:aranduapp/ui/shared/text_and_link.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; +import 'package:aranduapp/ui/shared/title_slogan.dart'; +import 'package:aranduapp/ui/shared/request_button.dart'; import 'package:async/async.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -10,7 +10,7 @@ import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; import 'package:aranduapp/ui/recover_account/view/recover_account_view.dart'; -import 'package:aranduapp/ui/recover_account/viewModel/recover_account_view_model.dart'; +import 'package:aranduapp/ui/recover_account/view_model/recover_account_view_model.dart'; @GenerateNiceMocks([MockSpec(), MockSpec()]) import 'recover_account_test.mocks.dart'; @@ -28,7 +28,6 @@ void main() { when(mockViewModel.formKey).thenReturn(GlobalKey()); when(mockViewModel.emailController).thenReturn(TextEditingController()); - }); Widget createLoginScreen(MockRecoverAccountViewModel mockViewModel) { @@ -42,10 +41,8 @@ void main() { ); } - testWidgets('Register Account screen displays fields and send button', (WidgetTester tester) async { - await tester.pumpWidget(createLoginScreen(mockViewModel)); await tester.pump(); @@ -55,8 +52,6 @@ void main() { expect(find.byType(TextAndLink), findsOneWidget); }); - - testWidgets('Recover account sending request', (WidgetTester tester) async { await tester.pumpWidget(createLoginScreen(mockViewModel)); @@ -68,19 +63,14 @@ void main() { verify(mockCommand0.execute()).called(1); }); - testWidgets('Recover account user input', (WidgetTester tester) async { - await tester.pumpWidget(createLoginScreen(mockViewModel)); const email = 'test@example.com'; - await tester.enterText(find.byType(TextEmail), email); await tester.pumpAndSettle(); expect(mockViewModel.emailController.text, email); }); - - } diff --git a/test/ui/recover_account/view/recover_account_test.mocks.dart b/test/ui/recover_account/view/recover_account_test.mocks.dart index 33c99e3..d7ebc75 100644 --- a/test/ui/recover_account/view/recover_account_test.mocks.dart +++ b/test/ui/recover_account/view/recover_account_test.mocks.dart @@ -6,7 +6,7 @@ import 'dart:async' as _i6; import 'package:aranduapp/core/state/command.dart' as _i3; -import 'package:aranduapp/ui/recover_account/viewModel/recover_account_view_model.dart' +import 'package:aranduapp/ui/recover_account/view_model/recover_account_view_model.dart' as _i5; import 'package:async/async.dart' as _i4; import 'package:flutter/material.dart' as _i1; diff --git a/test/ui/register_account/view/register_account_view_test.dart b/test/ui/register_account/view/register_account_view_test.dart index b770d47..1887e63 100644 --- a/test/ui/register_account/view/register_account_view_test.dart +++ b/test/ui/register_account/view/register_account_view_test.dart @@ -1,10 +1,10 @@ import 'package:aranduapp/core/state/command.dart'; import 'package:aranduapp/ui/register_account/view/register_account_view.dart'; -import 'package:aranduapp/ui/shared/ErrorPopUp.dart'; -import 'package:aranduapp/ui/shared/TextAndLink.dart'; -import 'package:aranduapp/ui/shared/TextEmail.dart'; -import 'package:aranduapp/ui/shared/TextPassword.dart'; -import 'package:aranduapp/ui/shared/TitleSlogan.dart'; +import 'package:aranduapp/ui/shared/error_pop_up.dart'; +import 'package:aranduapp/ui/shared/text_and_link.dart'; +import 'package:aranduapp/ui/shared/text_email.dart'; +import 'package:aranduapp/ui/shared/text_password.dart'; +import 'package:aranduapp/ui/shared/title_slogan.dart'; import 'package:async/async.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -13,7 +13,7 @@ import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; @GenerateNiceMocks([MockSpec(), MockSpec()]) -import 'package:aranduapp/ui/register_account/viewModel/register_view_model.dart'; +import 'package:aranduapp/ui/register_account/view_model/register_view_model.dart'; import 'register_account_view_test.mocks.dart'; @@ -129,5 +129,4 @@ void main() { expect(find.byType(ErrorPopUp), findsOneWidget); expect(find.text(error), findsOneWidget); }); - } diff --git a/test/ui/register_account/view/register_account_view_test.mocks.dart b/test/ui/register_account/view/register_account_view_test.mocks.dart index a2b45f3..1acda90 100644 --- a/test/ui/register_account/view/register_account_view_test.mocks.dart +++ b/test/ui/register_account/view/register_account_view_test.mocks.dart @@ -6,7 +6,7 @@ import 'dart:async' as _i6; import 'package:aranduapp/core/state/command.dart' as _i3; -import 'package:aranduapp/ui/register_account/viewModel/register_view_model.dart' +import 'package:aranduapp/ui/register_account/view_model/register_view_model.dart' as _i5; import 'package:async/async.dart' as _i4; import 'package:flutter/material.dart' as _i1;