fix(#59) refatora telas

fga-eps-mds · Dec 10, 2024 · 5ff0185 · 5ff0185
1 parent c898afd
commit 5ff0185
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 76 deletions.
diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
@@ -0,0 +1,4 @@
+-ignorewarnings
+-keep class * {
+  public private *;
+ }
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:aranduapp/config/ThemeApp.dart';
+import 'package:aranduapp/ui/login/view/LoginView.dart';
 import 'package:aranduapp/ui/welcome/view/WelcomeView.dart';
 import 'package:flutter/material.dart';
 
@@ -15,7 +16,7 @@ class MyApp extends StatelessWidget {
       theme: ThemeApp.themeData(),
       darkTheme: ThemeApp.darkThemeData(),
       debugShowCheckedModeBanner: false,
-      home: WelcomeView(),
+      home: const Login(),
     );
   }
 }
diff --git a/lib/ui/login/view/LoginView.dart b/lib/ui/login/view/LoginView.dart
@@ -1,6 +1,6 @@
 import 'package:aranduapp/core/log/Log.dart';
 import 'package:aranduapp/ui/home/view/HomeView.dart';
-import 'package:aranduapp/ui/shared/PhraseLink.dart';
+import 'package:aranduapp/ui/shared/TextAndLink.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -104,37 +104,29 @@ class _LoginState extends State<_Login> {
 
   Widget _emailAndPassword(LoginViewModel viewModel) {
     return SingleChildScrollView(
-      child: SizedBox(
-        width: MediaQuery.of(context).size.width,
-        height: MediaQuery.of(context).size.height,
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            const Expanded(
-              child: Center(
-                child: TitleSlogan(),
-              ),
-            ),
-            Expanded(
-                child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [_formSection(viewModel), _forgotPasswordLink(context)],
-            )),
-            Expanded(
-                child: Column(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                _loginButtonSection(context, viewModel),
-                const OrDivider(),
-                _loggingInWithOther(),
-                const TextAndLink(
-                    text: 'É novo pro aqui?',
-                    link: 'Cria a sua conta',
-                    page: RegisterAccount()),
-              ],
-            )),
-          ],
-        ),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: <Widget>[
+          const SizedBox(height: 80),
+          const TitleSlogan(),
+          const SizedBox(height: 80),
+          const SizedBox(height: 10),
+          _formSection(viewModel),
+          _forgotPasswordLink(),
+          const SizedBox(height: 80),
+          _loginButtonSection(),
+          const OrDivider(),
+          _loggingInWithOther(),
+          TextAndLink(
+              text: 'É novo pro aqui?',
+              link: 'Cria a sua conta',
+              action: () {
+                Navigator.of(context).push(
+                  MaterialPageRoute(
+                      builder: (context) => const RegisterAccount()),
+                );
+              }),
+        ],
       ),
     );
   }
@@ -157,7 +149,7 @@ class _LoginState extends State<_Login> {
     );
   }
 
-  Widget _forgotPasswordLink(BuildContext context) {
+  Widget _forgotPasswordLink() {
     return GestureDetector(
       onTap: () {
         Navigator.of(context).push(
@@ -182,21 +174,21 @@ class _LoginState extends State<_Login> {
     );
   }
 
-  Widget _loginButtonSection(BuildContext context, LoginViewModel viewModel) {
+  Widget _loginButtonSection() {
+    LoginViewModel viewModel = Provider.of<LoginViewModel>(context);
+
     return SizedBox(
       width: 291,
       height: 64,
       child: ElevatedButton(
           onPressed: () {
-            viewModel.loginWithEmailAndPassword()
-            .then((_) {
+            viewModel.loginWithEmailAndPassword().then((_) {
               Navigator.of(context).pushReplacement(
                 MaterialPageRoute(
                   builder: (context) => const HomeView(),
                 ),
               );
-            })
-            .catchError((e) => showDialog<Object>(
+            }).catchError((e) => showDialog<Object>(
                   context: context,
                   builder: (BuildContext context) =>
                       ErrorPopUp(content: Text('$e')),

diff --git a/lib/ui/register_account/view/RegisterAccount.dart b/lib/ui/register_account/view/RegisterAccount.dart
@@ -1,6 +1,6 @@
 import 'package:aranduapp/ui/login/view/LoginView.dart';
 import 'package:aranduapp/ui/shared/OrDivider.dart';
-import 'package:aranduapp/ui/shared/PhraseLink.dart';
+import 'package:aranduapp/ui/shared/TextAndLink.dart';
 import 'package:aranduapp/ui/shared/TextName.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -42,26 +42,23 @@ class _RegisterAccountState extends State<_RegisterAccount> {
   }
 
   Widget _buildForm() {
-    return Expanded(
-      child: SingleChildScrollView(
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 16.0),
-          child: SingleChildScrollView(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                const TitleSlogan(),
-                const SizedBox(height: 30),
-                _formSection(),
-                const OrDivider(),
-                _buildGoogleLoginButton(),
-                const SizedBox(height: 20),
-                const TextAndLink(
-                    text: 'Já tem uma conta?', link: 'faça login', page: Login()),
-              ],
-            ),
-          ),
-        ),
+    return SingleChildScrollView(
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          const SizedBox(height: 80),
+          const TitleSlogan(),
+          const SizedBox(height: 10),
+          _formSection(),
+          const OrDivider(),
+          _buildGoogleLoginButton(),
+          TextAndLink(
+              text: 'Já tem uma conta?',
+              link: 'faça login',
+              action: () {
+                Navigator.of(context).pop();
+              }),
+        ],
       ),
     );
   }
@@ -76,16 +73,16 @@ class _RegisterAccountState extends State<_RegisterAccount> {
         TextName(
             label: 'Nome',
             controller: viewModel.nameController,
-            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 0)),
+            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20)),
         TextName(
             label: 'Nome de Usuário',
             controller: viewModel.userNameController,
-            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 0)),
+            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20)),
         TextEmail(
-            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 0),
+            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20),
             controller: viewModel.emailController),
         TextPassWord(
-            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 0),
+            padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 20),
             controller: viewModel.passwordController),
         _buildTermsCheckbox(),
         const SizedBox(height: 20),
@@ -139,7 +136,6 @@ class _RegisterAccountState extends State<_RegisterAccount> {
     );
   }
 
-
   Widget _buildGoogleLoginButton() {
     return GestureDetector(
       onTap: () => Log.d(""),
@@ -160,4 +156,3 @@ class _RegisterAccountState extends State<_RegisterAccount> {
     );
   }
 }
-
diff --git a/lib/ui/shared/PhraseLink.dart → lib/ui/shared/TextAndLink.dart b/lib/ui/shared/PhraseLink.dart → lib/ui/shared/TextAndLink.dart
@@ -3,13 +3,14 @@ import 'package:flutter/material.dart';
 class TextAndLink extends StatelessWidget {
   final String text;
   final String link;
-  final Widget page;
+  final VoidCallback
+      action; 
 
   const TextAndLink({
     super.key,
     required this.text,
     required this.link,
-    required this.page,
+    required this.action,
   });
 
   @override
@@ -24,13 +25,7 @@ class TextAndLink extends StatelessWidget {
             style: Theme.of(context).textTheme.bodySmall,
           ),
           GestureDetector(
-            onTap: () {
-              Navigator.of(context).push(
-                MaterialPageRoute(
-                  builder: (context) => page,
-                ),
-              );
-            },
+            onTap: action,
             child: Text(
               ' $link',
               style: Theme.of(context).textTheme.bodySmall?.copyWith(
@@ -43,4 +38,3 @@ class TextAndLink extends StatelessWidget {
     );
   }
 }
-