Merge remote-tracking branch 'main/44-refatoracao' into 60-refatorar-…

…backend

catavento/lib/screens/Login/components/input_purple.dart

@@ -1,43 +1,80 @@
 import 'package:flutter/material.dart';
 
-class PurpleTextField extends StatelessWidget {
+class PurpleTextField extends StatefulWidget {
   final String label;
   final Icon icon;
   final TextEditingController controller;
-  final bool isPassword;
+  final bool isSecurepassword;
+
   const PurpleTextField({
     super.key,
     required this.label,
     required this.icon,
     required this.controller,
-    required this.isPassword,
+    required this.isSecurepassword,
   });
 
+  @override
+  _PurpleTextFieldState createState() => _PurpleTextFieldState();
+}
+
+class _PurpleTextFieldState extends State<PurpleTextField> {
+  late bool _securePasswordState;
+
+  @override
+  void initState() {
+    super.initState();
+    // Inicializa o estado da visibilidade da senha com o valor recebido no construtor.
+    _securePasswordState = widget.isSecurepassword;
+  }
+
   @override
   Widget build(BuildContext context) {
     return SizedBox(
       width: 324,
       height: 68,
       child: TextField(
-        obscureText: isPassword,
-        controller: controller,
+        obscureText: _securePasswordState,
+        controller: widget.controller,
         decoration: InputDecoration(
-            border: OutlineInputBorder(
-                borderSide: BorderSide(width: 2),
-                borderRadius: BorderRadius.circular(4.0)),
-            enabledBorder: OutlineInputBorder(
-                borderSide: BorderSide(width: 2, color: Color(0xFFACACAC))),
-            focusedBorder: OutlineInputBorder(
-                borderSide: BorderSide(width: 2, color: Color(0x80FC298F))),
-            prefixIcon: icon,
-            filled: true,
-            fillColor: Color(0xFFDEE1FF),
-            labelText: label,
-            labelStyle: TextStyle(
-                color: Color(0xCCACACAC),
-                fontSize: 16.0,
-                fontWeight: FontWeight.w100)),
+          border: OutlineInputBorder(
+              borderSide: BorderSide(width: 2),
+              borderRadius: BorderRadius.circular(4.0)),
+          enabledBorder: OutlineInputBorder(
+              borderSide: BorderSide(width: 2, color: Color(0xFFACACAC))),
+          focusedBorder: OutlineInputBorder(
+              borderSide: BorderSide(width: 2, color: Color(0x80FC298F))),
+          prefixIcon: widget.icon,
+          filled: true,
+          fillColor: Color(0xFFDEE1FF),
+          labelText: widget.label,
+          suffixIcon: togglePassword(),
+          labelStyle: TextStyle(
+              color: Color(0xCCACACAC),
+              fontSize: 16.0,
+              fontWeight: FontWeight.w100),
+        ),
       ),
     );
   }
+
+  // Função para alternar a visibilidade da senha
+  Widget togglePassword() {
+    return IconButton(
+      onPressed: () {
+        setState(() {
+          _securePasswordState = !_securePasswordState;
+        });
+      },
+      icon: _securePasswordState
+          ? Icon(
+              Icons.visibility,
+              color: Color(0xFFACACAC),
+            )
+          : Icon(
+              Icons.visibility_off,
+              color: Color(0xFFACACAC),
+            ),
+    );
+  }
 }

catavento/lib/screens/Login/components/input_purple_email.dart

@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+
+class PurpleTextFieldEmail extends StatefulWidget {
+  final String label;
+  final Icon icon;
+  final TextEditingController controller;
+
+  const PurpleTextFieldEmail({
+    super.key,
+    required this.label,
+    required this.icon,
+    required this.controller,
+  });
+
+  @override
+  _PurpleTextFieldEmailState createState() => _PurpleTextFieldEmailState();
+}
+
+class _PurpleTextFieldEmailState extends State<PurpleTextFieldEmail> {
+  @override
+  void initState() {
+    super.initState();
+    // Inicializa o estado da visibilidade da senha com o valor recebido no construtor.
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 324,
+      height: 68,
+      child: TextField(
+        controller: widget.controller,
+        decoration: InputDecoration(
+          border: OutlineInputBorder(
+              borderSide: BorderSide(width: 2),
+              borderRadius: BorderRadius.circular(4.0)),
+          enabledBorder: OutlineInputBorder(
+              borderSide: BorderSide(width: 2, color: Color(0xFFACACAC))),
+          focusedBorder: OutlineInputBorder(
+              borderSide: BorderSide(width: 2, color: Color(0x80FC298F))),
+          prefixIcon: widget.icon,
+          filled: true,
+          fillColor: Color(0xFFDEE1FF),
+          labelText: widget.label,
+          labelStyle: TextStyle(
+              color: Color(0xCCACACAC),
+              fontSize: 16.0,
+              fontWeight: FontWeight.w100),
+        ),
+      ),
+    );
+  }
+
+  // Função para alternar a visibilidade da senha
+}

catavento/lib/screens/Login/login.dart

@@ -1,5 +1,6 @@
 import 'package:catavento/bloc/auth/auth_bloc.dart';
 import 'package:catavento/main.dart';
+import 'package:catavento/screens/Login/components/input_purple_email.dart';
 import 'package:catavento/shared/widgets/bloc_snackbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -15,6 +16,7 @@ class Login extends StatefulWidget {
 
 class _LoginState extends State<Login> {
   bool isLoading = false;
+
   final TextEditingController _emailController = TextEditingController();
   final TextEditingController _senhaController = TextEditingController();
 
@@ -76,26 +78,25 @@ class _LoginState extends State<Login> {
                     Form(
                         child: Column(
                       children: [
-                        PurpleTextField(
-                          controller: _emailController,
+                        PurpleTextFieldEmail(
                           label: "Digite o seu email",
                           icon: Icon(
                             Icons.person_outline,
                             color: Color(0xCCACACAC),
                           ),
-                          isPassword: false,
+                          controller: _emailController,
                         ),
                         SizedBox(
                           height: 20,
                         ),
                         PurpleTextField(
                           controller: _senhaController,
+                          isSecurepassword: true,
                           label: "Digite a sua senha",
                           icon: Icon(
                             Icons.lock_outline,
                             color: Color(0xCCACACAC),
                           ),
-                          isPassword: true,
                         ),
                       ],
                     )),
@@ -114,7 +115,7 @@ class _LoginState extends State<Login> {
                               Icons.keyboard_arrow_right_rounded,
                               color: Colors.white,
                             ),
-                            onPressed: () async {
+                            onPressed: () {
                               setState(() {
                                 isLoading = !isLoading;
                               });