fix(#59): correção de cores e caminhos

Co-authored-by: zDrNz <[email protected]>
fga-eps-mds · Dec 18, 2024 · 7fd2366 · 7fd2366
1 parent 291d1a7
commit 7fd2366
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/lib/ui/login/view/LoginView.dart b/lib/ui/login/view/LoginView.dart
@@ -1,5 +1,5 @@
 import 'package:aranduapp/core/log/Log.dart';
-import 'package:aranduapp/ui/home/view/HomeView.dart';
+import 'package:aranduapp/ui/navbar/view/navBarView.dart';
 import 'package:aranduapp/ui/shared/TextAndLink.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -93,12 +93,7 @@ class _LoginState extends State<_Login> {
             child: ElevatedButton(
               onPressed: () async {
                 viewModel.loginWithDeviceAuth().then((ok) {
-                  if (ok)
-                    Navigator.of(context).pushReplacement(
-                      MaterialPageRoute(
-                        builder: (context) => const HomeView(),
-                      ),
-                    );
+                  viewModel.goNextPage();
                 });
               },
               child: const Text('Usar senha do celular'),
@@ -190,11 +185,9 @@ class _LoginState extends State<_Login> {
       child: ElevatedButton(
           onPressed: () {
             viewModel.loginWithEmailAndPassword().then((_) {
-              Navigator.of(context).pushReplacement(
-                MaterialPageRoute(
-                  builder: (context) => const HomeView(),
-                ),
-              );
+
+              viewModel.goNextPage();
+
             }).catchError((e) => showDialog<Object>(
                   context: context,
                   builder: (BuildContext context) =>

diff --git a/lib/ui/login/viewModel/LoginViewModel.dart b/lib/ui/login/viewModel/LoginViewModel.dart
@@ -1,4 +1,5 @@
 import 'package:aranduapp/core/log/Log.dart';
+import 'package:aranduapp/ui/navbar/view/navBarView.dart';
 import 'package:flutter/material.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:aranduapp/ui/login/service/LoginService.dart';
@@ -46,12 +47,22 @@ class LoginViewModel extends ChangeNotifier {
   }
 
   Future<void> getRefreshTokenFuture() async {
-    await LoginService.refreshToken();
+    await Future.delayed(const Duration(seconds: 2));
+
+    //await LoginService.refreshToken();
   }
 
   Future<bool> loginWithDeviceAuth() async {
     Log.d('init loginWithDeviceAuth');
     return await LocalAuthentication()
         .authenticate(localizedReason: 'Toque com o dedo no sensor para logar');
   }
+
+  void goNextPage() {
+    Navigator.of(context).pushReplacement(
+      MaterialPageRoute(
+        builder: (context) => const NavbarView(),
+      ),
+    );
+  }
 }
diff --git a/lib/ui/navbar/view/navBarView.dart b/lib/ui/navbar/view/navBarView.dart
@@ -1,5 +1,4 @@
 import 'package:aranduapp/ui/home/view/HomeView.dart';
-//import 'package:aranduapp/ui/profile/view/profileView.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:aranduapp/ui/navbar/model/navBarViewModel.dart';
@@ -34,8 +33,8 @@ Widget page(BuildContext context) {
     bottomNavigationBar: BottomNavigationBar(
       currentIndex: viewModel.selectedIndex,
       onTap: viewModel.changeTab,
-      selectedItemColor: Colors.cyan[400],
-      unselectedItemColor: Colors.grey,
+      selectedItemColor: Theme.of(context).colorScheme.primary,
+      unselectedItemColor:Theme.of(context).colorScheme.onSurface,
       items: const [
         BottomNavigationBarItem(
           icon: Icon(Icons.home_outlined),

diff --git a/lib/ui/welcome/view/WelcomeView.dart b/lib/ui/welcome/view/WelcomeView.dart
@@ -54,7 +54,7 @@ class WelcomeView extends StatelessWidget {
               onTap: () => {
 
 
-              Navigator.of(context).push(
+              Navigator.of(context).pushReplacement(
                 MaterialPageRoute(
                   builder: (context) => const OnboardingView(),
                 ),