FEAT Adiciona GetIt ao recover account e seu teste

lib/core/di/locator.dart

@@ -1,6 +1,10 @@
-import 'package:aranduapp/ui/edit_profile/di/di.dart';
-import 'package:aranduapp/ui/login/di/di.dart';
-import 'package:aranduapp/ui/register_account/di/di.dart';
+import 'package:aranduapp/ui/edit_password/di/di_edit_password.dart';
+import 'package:aranduapp/ui/edit_profile/di/di_edit_profile.dart';
+import 'package:aranduapp/ui/login/di/di_login.dart';
+import 'package:aranduapp/ui/navbar/di/di_navbar.dart';
+import 'package:aranduapp/ui/onboarding/di/di_onboarding.dart';
+import 'package:aranduapp/ui/recover_account/di/di_recover_account.dart';
+import 'package:aranduapp/ui/register_account/di/di_register_account.dart';
 import 'package:get_it/get_it.dart';
 
 final GetIt locator = GetIt.instance;
@@ -9,4 +13,9 @@ void setupLocator() {
   setupLoginDI();
   setupRegisterDI();
   setupEditProfileDI();
+  setupRecoverAccountDI();
+  setupEditPasswordDI();
+  setupNavBarDI();
+  setupOnboardingDI();
+  setupLoginDI();
 }

lib/ui/edit_password/di/di_edit_password.dart

@@ -0,0 +1,9 @@
+import 'package:aranduapp/ui/edit_password/service/edit_password_service.dart';
+import 'package:aranduapp/ui/edit_password/viewmodel/edit_password_viewmodel.dart';
+import 'package:get_it/get_it.dart';
+
+void setupEditPasswordDI() {
+  GetIt.I.registerLazySingleton(() => EditPasswordService());
+
+  GetIt.I.registerFactory(() => EditPasswordViewModel());
+}

lib/ui/edit_password/service/edit_password_service.dart

@@ -2,11 +2,8 @@ import 'package:aranduapp/core/network/base_api.dart';
 import 'package:aranduapp/ui/edit_password/model/edit_password_request.dart';
 
 class EditPasswordService {
-
-  static Future<void> edit(EditPasswordRequest editPasswordRequest) async {
+  Future<void> edit(EditPasswordRequest editPasswordRequest) async {
     await BaseApi.getInstance(auth: true)
         .put(path: '/auth/change-password', data: editPasswordRequest.toJson());
   }
-
-
 }

lib/ui/edit_password/view/edit_password_view.dart

@@ -2,16 +2,16 @@ import 'package:aranduapp/ui/edit_password/viewmodel/edit_password_viewmodel.dar
 import 'package:aranduapp/ui/shared/request_button.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-
+import 'package:get_it/get_it.dart';
 import 'package:aranduapp/ui/shared/text_password.dart';
 
 class EditPassword extends StatelessWidget {
   const EditPassword({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return ChangeNotifierProvider(
-      create: (context) => EditPasswordViewModel(),
+    return ChangeNotifierProvider<EditPasswordViewModel>.value(
+      value: GetIt.instance<EditPasswordViewModel>(),
       child: const EditPasswordScreen(),
     );
   }

lib/ui/edit_password/viewmodel/edit_password_viewmodel.dart

@@ -3,6 +3,7 @@ import 'package:aranduapp/ui/edit_password/model/edit_password_request.dart';
 import 'package:aranduapp/ui/edit_password/service/edit_password_service.dart';
 import 'package:async/async.dart';
 import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
 
 class EditPasswordViewModel extends ChangeNotifier {
   final GlobalKey<FormState> formKey;
@@ -27,7 +28,7 @@ class EditPasswordViewModel extends ChangeNotifier {
         oldPassword: oldPasswordController.text,
         newPassword: newPasswordController.text);
 
-    await EditPasswordService.edit(request);
+    await GetIt.instance<EditPasswordService>().edit(request);
 
     return Result.value(null);
   }

lib/ui/navbar/view/navbar_view.dart

@@ -1,28 +1,23 @@
 import 'package:aranduapp/ui/home/view/home_view.dart';
 import 'package:aranduapp/ui/profile/view/profile_view.dart';
-//import 'package:aranduapp/ui/profile/view/profileView.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+import 'package:get_it/get_it.dart';
 import 'package:aranduapp/ui/navbar/viewmodel/navbar_viewmodel.dart';
 
 class NavbarView extends StatelessWidget {
   const NavbarView({super.key});
 
   @override
   Widget build(BuildContext context) {
+    final NavbarViewModel viewModel = GetIt.I<NavbarViewModel>();
+
     return Scaffold(
-      body: ChangeNotifierProvider(
-          create: (context) => NavbarViewModel(),
-          builder: (context, child) {
-            return page(context);
-          }),
+      body: page(context, viewModel),
     );
   }
 }
 
-Widget page(BuildContext context) {
-  NavbarViewModel viewModel = Provider.of<NavbarViewModel>(context);
-
+Widget page(BuildContext context, NavbarViewModel viewModel) {
   final List<Widget> pages = [
     const HomeView(),
     const Center(child: Text('Friends', style: TextStyle(fontSize: 20))),

lib/ui/navbar/viewmodel/navbar_viewmodel.dart

@@ -1,6 +1,8 @@
+import 'package:aranduapp/core/state/command.dart';
 import 'package:flutter/material.dart';
 
 class NavbarViewModel extends ChangeNotifier {
+  late Command0<void> navbarCommand;
   int _selectedIndex = 0;
 
   int get selectedIndex => _selectedIndex;

lib/ui/onboarding/view/onboarding_view.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+import 'package:get_it/get_it.dart';
 import '../viewmodel/onboarding_viewmodel.dart';
 
 class OnboardingView extends StatelessWidget {
@@ -9,48 +9,44 @@ class OnboardingView extends StatelessWidget {
     {
       'title': 'Bem-Vindo(a)!',
       'description':
-          'Seja bem vindo ao Arandu!!! Sou um ambiente voltado para aprendizado de forma gratuita',
+          'Seja bem-vindo ao Arandu!!! Sou um ambiente voltado para aprendizado de forma gratuita',
       'imageAsset': 'assets/images/Component1.png',
     },
     {
-      'title': 'o que você encontra?',
+      'title': 'O que você encontra?',
       'description':
-          'Aqui você encontrará livros interativos de diversas disciplinas com objetivo de entregar praticidade e qualidade no aprendizado.',
+          'Aqui você encontrará livros interativos de diversas disciplinas com o objetivo de entregar praticidade e qualidade no aprendizado.',
       'imageAsset': 'assets/images/Component2.png',
     },
     {
       'title': 'Como funciona?',
       'description':
-          'Para acessar uma trilha basta se inscrever na disciplina de sua preferência e ter acesso aos materiais. \n Bons estudos !!!',
+          'Para acessar uma trilha basta se inscrever na disciplina de sua preferência e ter acesso aos materiais. \n Bons estudos!!!',
       'imageAsset': 'assets/images/Component3.png',
     },
   ];
 
   @override
   Widget build(BuildContext context) {
-    return ChangeNotifierProvider(
-      create: (_) => OnboardingViewModel(),
-      child: Consumer<OnboardingViewModel>(
-        builder: (context, viewModel, _) {
-          return Scaffold(
-            appBar: null,
-            body: LayoutBuilder(
-              builder: (context, constraints) {
-                final double imageHeight = constraints.maxHeight * 0.60;
-                final double contentHeight = constraints.maxHeight * 0.55;
-                final double buttonHeight = constraints.maxHeight * 0.15;
+    // Pegando a instância do OnboardingViewModel do GetIt
+    final onboardingViewModel = GetIt.I<OnboardingViewModel>();
 
-                return Stack(
-                  children: [
-                    _buildSemicirclePage(context),
-                    _buildImageSection(viewModel, steps, imageHeight),
-                    _buildContentSection(viewModel, steps, contentHeight),
-                    _buildNavigationButtons(
-                        context, viewModel, steps, buttonHeight),
-                  ],
-                );
-              },
-            ),
+    return Scaffold(
+      appBar: null,
+      body: LayoutBuilder(
+        builder: (context, constraints) {
+          final double imageHeight = constraints.maxHeight * 0.60;
+          final double contentHeight = constraints.maxHeight * 0.55;
+          final double buttonHeight = constraints.maxHeight * 0.15;
+
+          return Stack(
+            children: [
+              _buildSemicirclePage(context),
+              _buildImageSection(onboardingViewModel, steps, imageHeight),
+              _buildContentSection(onboardingViewModel, steps, contentHeight),
+              _buildNavigationButtons(
+                  context, onboardingViewModel, steps, buttonHeight),
+            ],
           );
         },
       ),

lib/ui/profile/view/profile_view.dart

@@ -1,20 +1,23 @@
-import 'package:aranduapp/ui/edit_password/view/edit_password_view.dart';
-import 'package:provider/provider.dart';
 import 'package:flutter/material.dart';
-
+import 'package:provider/provider.dart';
+import 'package:get_it/get_it.dart';
 import 'package:aranduapp/ui/shared/profile_header.dart';
 import 'package:aranduapp/ui/profile/viewmodel/profile_viewmodel.dart';
 import 'package:aranduapp/ui/edit_profile/view/edit_profile_view.dart';
+import 'package:aranduapp/ui/edit_password/view/edit_password_view.dart';
 
 class Profile extends StatelessWidget {
   const Profile({super.key});
 
   @override
   Widget build(BuildContext context) {
+    // Usando GetIt para acessar a instância da ProfileViewModel
+    final profileViewModel = GetIt.I<ProfileViewModel>();
+
     return Scaffold(
       appBar: _buildAppBar(context),
-      body: ChangeNotifierProvider(
-        create: (context) => ProfileViewModel(context),
+      body: ChangeNotifierProvider.value(
+        value: profileViewModel,
         builder: (context, child) {
           return _buildPage(context);
         },

lib/ui/profile/viewmodel/profile_viewmodel.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 
 class ProfileViewModel extends ChangeNotifier {
-  final BuildContext context;
-
   // Controllers e Key para o formulário
   final GlobalKey<FormState> formKey = GlobalKey<FormState>();
   final TextEditingController emailController = TextEditingController();
@@ -11,7 +9,8 @@ class ProfileViewModel extends ChangeNotifier {
   bool _isLoading = false;
   bool get isLoading => _isLoading;
 
-  ProfileViewModel(this.context);
+  // ProfileViewModel não precisa mais do BuildContext
+  ProfileViewModel();
 
   // Método para simular o envio do e-mail de recuperação de senha
   Future<void> forgetPassword() async {

lib/ui/recover_account/di/di_recover_account.dart

@@ -0,0 +1,9 @@
+import 'package:aranduapp/ui/recover_account/service/recover_account_service.dart';
+import 'package:aranduapp/ui/recover_account/viewmodel/recover_account_viewmodel.dart';
+import 'package:get_it/get_it.dart';
+
+void setupRecoverAccountDI() {
+  GetIt.I.registerLazySingleton(() => RecoverAccountService());
+
+  GetIt.I.registerFactory(() => RecoverAccountViewModel());
+}

lib/ui/recover_account/service/recover_account_service.dart

@@ -2,7 +2,7 @@ import 'package:aranduapp/core/network/base_api.dart';
 import 'package:aranduapp/ui/recover_account/model/recover_account_request.dart';
 
 class RecoverAccountService {
-  static Future<void> forgetPassword(
+  Future<void> forgetPassword(
       RecoverAccountRequest recoverAccountRequest) async {
     await BaseApi.getInstance(auth: false)
         .post(path: '/auth/forgot-password', data: <String, dynamic>{

lib/ui/recover_account/view/recover_account_view.dart

@@ -1,23 +1,22 @@
-import 'package:aranduapp/core/log/log.dart';
 import 'package:aranduapp/ui/recover_account/viewmodel/recover_account_viewmodel.dart';
 import 'package:aranduapp/ui/shared/error_popup.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:get_it/get_it.dart';
 import 'package:provider/provider.dart';
 
 class RecoverAccount extends StatelessWidget {
   const RecoverAccount({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return ChangeNotifierProvider(
-        create: (context) => RecoverAccountViewModel(),
-        builder: (context, child) {
-          return const RecoverAccountScreen();
-        });
+    return ChangeNotifierProvider<RecoverAccountViewModel>.value(
+      value: GetIt.instance<RecoverAccountViewModel>(),
+      child: const RecoverAccountScreen(),
+    );
   }
 }
 

lib/ui/recover_account/viewmodel/recover_account_viewmodel.dart

@@ -1,9 +1,9 @@
-import 'package:aranduapp/core/log/log.dart';
 import 'package:aranduapp/core/state/command.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';
+import 'package:get_it/get_it.dart';
 
 class RecoverAccountViewModel extends ChangeNotifier {
   GlobalKey<FormState> formKey;
@@ -22,9 +22,8 @@ class RecoverAccountViewModel extends ChangeNotifier {
     if (!formKey.currentState!.validate()) {
       Result.error('Valores inválidos');
     }
-
-    await RecoverAccountService.forgetPassword(
-        RecoverAccountRequest(emailController.text));
+    await GetIt.instance<RecoverAccountService>()
+        .forgetPassword(RecoverAccountRequest(emailController.text));
 
     return Result.value(null);
   }

lib/ui/register_account/di/di.dart → lib/ui/register_account/di/di_register_account.dart

@@ -3,7 +3,6 @@ import 'package:aranduapp/ui/register_account/viewmodel/register_viewmodel.dart'
 import 'package:get_it/get_it.dart';
 
 void setupRegisterDI() {
-
   GetIt.I.registerLazySingleton(() => RegisterService());
 
   GetIt.I.registerFactory(() => RegisterAccountViewModel());

test/ui/navbar/view/navbar_test.dart

@@ -0,0 +1,49 @@
+import 'package:aranduapp/ui/navbar/view/navbar_view.dart';
+import 'package:aranduapp/ui/navbar/viewmodel/navbar_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:get_it/get_it.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+
+import 'navbar_test.mocks.dart';
+
+@GenerateNiceMocks([MockSpec<NavbarViewModel>()])
+void main() {
+  late MockNavbarViewModel mockNavbarViewModel;
+
+  setUp(() {
+    mockNavbarViewModel = MockNavbarViewModel();
+
+    // Define os comportamentos padrão para o mock
+    when(mockNavbarViewModel.selectedIndex).thenReturn(0);
+    when(mockNavbarViewModel.hasListeners).thenReturn(false);
+
+    // Registra o mock como a instância do ViewModel usada pelo GetIt
+    GetIt.I.registerSingleton<NavbarViewModel>(mockNavbarViewModel);
+  });
+
+  Widget createScreen() {
+    return const MaterialApp(
+      home: NavbarView(),
+    );
+  }
+
+  //testWidgets('Navbar screen displays', (WidgetTester tester) async {
+//   await tester.pumpWidget(createScreen());
+
+  // Verifique a presença do BottomNavigationBar
+  //expect(find.byType(BottomNavigationBar), findsOneWidget);
+
+  // Verifique se os itens de navegação (exceto Home) estão presentes
+  //expect(find.byKey(Key('amigosTab')), findsOneWidget);
+  //expect(find.byKey(Key('dashboardTab')), findsOneWidget);
+  //expect(find.byKey(Key('perfilTab')), findsOneWidget);
+
+  // Verifique se o índice selecionado foi chamado
+  verify(mockNavbarViewModel.selectedIndex).called(1);
+
+  // Verifique se o mock não foi chamado mais de uma vez
+  // verifyNoMoreInteractions(mockNavbarViewModel);
+  // });
+}