onlinces/hackathon-sfc-a9a4cee23109413188ee35ceac01dc07
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Resuelto conflicto de fusión

Browse Source
This commit is contained in:
25030248hasel
2026-05-23 04:29:05 -06:00
parent 9fdb51f622 c560fb09fb
commit 6638f471e1
8 changed files with 251 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
lib/core/router/app_router.dart
View File

@@ -1,25 +1,22 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter_application_1/features/auth/presentation/screens/register_screen.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import '../../features/auth/presentation/bloc/auth_bloc.dart'; import '../../features/auth/presentation/bloc/auth_bloc.dart';
import '../../features/auth/presentation/bloc/auth_state.dart'; import '../../features/auth/presentation/bloc/auth_state.dart';
import '../../features/auth/presentation/screens/login_screen.dart'; import '../../features/auth/presentation/screens/login_screen.dart';
import '../../features/auth/presentation/screens/register_screen.dart';
import '../../features/auth/presentation/screens/home_screen_placeholder.dart'; import '../../features/auth/presentation/screens/home_screen_placeholder.dart';
/// Rutas nombradas de la aplicación. /// Rutas nombradas de la aplicación.
abstract final class AppRoutes { abstract final class AppRoutes {
static const String splash = '/'; static const String splash = '/';
static const String login = '/login'; static const String login = '/login';
static const String register = '/register'; // 📍 Agregada constante oficial
static const String home = '/home'; static const String home = '/home';
} }
/// Configuración central de navegación con go_router. /// Configuración central de navegación con go_router.
///
/// La redirección basada en estado de autenticación garantiza que
/// rutas protegidas sean inaccesibles sin sesión válida.
GoRouter createRouter(AuthBloc authBloc) { GoRouter createRouter(AuthBloc authBloc) {
return GoRouter( return GoRouter(
initialLocation: AppRoutes.splash, initialLocation: AppRoutes.splash,
@@ -27,8 +24,7 @@ GoRouter createRouter(AuthBloc authBloc) {
redirect: (BuildContext context, GoRouterState state) { redirect: (BuildContext context, GoRouterState state) {
final authState = authBloc.state; final authState = authBloc.state;
final isAuthenticated = authState is AuthAuthenticated; final isAuthenticated = authState is AuthAuthenticated;
final isCheckingSession = final isCheckingSession = authState is AuthCheckingSession || authState is AuthInitial;
authState is AuthCheckingSession || authState is AuthInitial;
final currentLocation = state.uri.path; final currentLocation = state.uri.path;
// Mientras se verifica la sesión, mostrar splash. // Mientras se verifica la sesión, mostrar splash.
@@ -36,15 +32,17 @@ GoRouter createRouter(AuthBloc authBloc) {
return currentLocation == AppRoutes.splash ? null : AppRoutes.splash; return currentLocation == AppRoutes.splash ? null : AppRoutes.splash;
} }
// Si no está autenticado, ir a login. // 📍 SOLUCCIÓN: Permitir acceso a rutas públicas sin estar autenticado
final publicRoutes = [AppRoutes.login, AppRoutes.register];
final isPublicRoute = publicRoutes.contains(currentLocation);
if (!isAuthenticated) { if (!isAuthenticated) {
return currentLocation == AppRoutes.login ? null : AppRoutes.login; // Si no está autenticado y no está en una ruta pública, mandarlo a login
return isPublicRoute ? null : AppRoutes.login;
} }
// Si está autenticado y en splash o login, ir a home. // Si está autenticado e intenta ir a login o registro, mandarlo a home
if (isAuthenticated && if (isAuthenticated && isPublicRoute) {
(currentLocation == AppRoutes.login ||
currentLocation == AppRoutes.splash)) {
return AppRoutes.home; return AppRoutes.home;
} }
@@ -60,21 +58,13 @@ GoRouter createRouter(AuthBloc authBloc) {
builder: (context, state) => const LoginScreen(), builder: (context, state) => const LoginScreen(),
), ),
GoRoute( GoRoute(
path: AppRoutes.home, path: AppRoutes.register, // 📍 Usando la constante limpia
builder: (context, state) => const HomeScreenPlaceholder(),
),
// 📍 Agrega el import arriba si te lo pide:
// import 'package:flutter_application_1/features/auth/presentation/screens/register_screen.dart';
GoRoute(
path: AppRoutes.home,
builder: (context, state) => const HomeScreenPlaceholder(),
),
// 📍 CORRECCIÓN: Usamos la constante oficial del proyecto en lugar del texto a mano
GoRoute(
path: '/register', // 📍 CORRECCIÓN: Texto plano limpio entre comillas
builder: (context, state) => const RegisterScreen(), builder: (context, state) => const RegisterScreen(),
), // GoRoute ),
GoRoute(
path: AppRoutes.home,
builder: (context, state) => const HomeScreenPlaceholder(),
),
], ],
); );
} }
@@ -91,11 +81,7 @@ class _SplashScreen extends StatelessWidget {
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
const Icon( const Icon(Icons.recycling_rounded, size: 72, color: Colors.white),
Icons.recycling_rounded,
size: 72,
color: Colors.white,
),
const SizedBox(height: 24), const SizedBox(height: 24),
Text( Text(
'WasteNotify', 'WasteNotify',
@@ -117,7 +103,6 @@ class _SplashScreen extends StatelessWidget {
} }
/// Notificador que conecta el estado del BLoC con go_router. /// Notificador que conecta el estado del BLoC con go_router.
/// Permite que el router reaccione automáticamente a cambios de sesión.
class GoRouterAuthNotifier extends ChangeNotifier { class GoRouterAuthNotifier extends ChangeNotifier {
final AuthBloc _authBloc; final AuthBloc _authBloc;
late final StreamSubscription<AuthState> _subscription; late final StreamSubscription<AuthState> _subscription;

6
lib/core/theme/app_theme.dart
View File

@@ -55,7 +55,7 @@ abstract final class AppTheme {
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
), ),
elevation: 3, elevation: 3,
shadowColor: leafGreen.withOpacity(0.4), shadowColor: leafGreen.withValues(alpha: 0.4),
textStyle: const TextStyle( textStyle: const TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.w700, fontWeight: FontWeight.w700,
@@ -89,12 +89,12 @@ abstract final class AppTheme {
borderSide: const BorderSide(color: errorRed, width: 2), borderSide: const BorderSide(color: errorRed, width: 2),
), ),
labelStyle: const TextStyle(color: midGray), labelStyle: const TextStyle(color: midGray),
hintStyle: TextStyle(color: midGray.withOpacity(0.7)), hintStyle: TextStyle(color: midGray.withValues(alpha: 0.7)),
), ),
cardTheme: CardThemeData( cardTheme: CardThemeData(
color: Colors.white, color: Colors.white,
elevation: 2, elevation: 2,
shadowColor: Colors.black.withOpacity(0.08), shadowColor: Colors.black.withValues(alpha: 0.08),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
), ),

10
lib/features/auth/presentation/screens/home_screen_placeholder.dart
View File

@@ -122,7 +122,7 @@ class _WelcomeCard extends StatelessWidget {
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: AppTheme.leafGreen.withOpacity(0.3), color: AppTheme.leafGreen.withValues(alpha: 0.3),
blurRadius: 16, blurRadius: 16,
offset: const Offset(0, 6), offset: const Offset(0, 6),
), ),
@@ -134,7 +134,7 @@ class _WelcomeCard extends StatelessWidget {
width: 52, width: 52,
height: 52, height: 52,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(0.2), color: Colors.white.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(13), borderRadius: BorderRadius.circular(13),
), ),
child: const Icon( child: const Icon(
@@ -169,7 +169,7 @@ class _WelcomeCard extends StatelessWidget {
padding: padding:
const EdgeInsets.symmetric(horizontal: 10, vertical: 3), const EdgeInsets.symmetric(horizontal: 10, vertical: 3),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(0.2), color: Colors.white.withValues(alpha: 0.2),
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
), ),
child: Text( child: Text(
@@ -307,10 +307,10 @@ class _PreventiveMessageCard extends StatelessWidget {
return Container( return Container(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppTheme.alertAmber.withOpacity(0.08), color: AppTheme.alertAmber.withValues(alpha: 0.08),
borderRadius: BorderRadius.circular(14), borderRadius: BorderRadius.circular(14),
border: Border.all( border: Border.all(
color: AppTheme.alertAmber.withOpacity(0.3), color: AppTheme.alertAmber.withValues(alpha: 0.3),
), ),
), ),
child: Column( child: Column(

158
lib/features/auth/presentation/screens/login_screen.dart
View File

@@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import '../../../../core/router/app_router.dart'; // 📍 Importación de rutas verificada
import '../../../../core/theme/app_theme.dart'; import '../../../../core/theme/app_theme.dart';
import '../bloc/auth_bloc.dart'; import '../bloc/auth_bloc.dart';
@@ -20,6 +22,7 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
final _passwordController = TextEditingController(); final _passwordController = TextEditingController();
bool _obscurePassword = true; bool _obscurePassword = true;
late final AnimationController _animController; late final AnimationController _animController;
late final Animation<double> _fadeAnim; late final Animation<double> _fadeAnim;
late final Animation<Offset> _slideAnim; late final Animation<Offset> _slideAnim;
@@ -31,17 +34,10 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
vsync: this, vsync: this,
duration: const Duration(milliseconds: 700), duration: const Duration(milliseconds: 700),
); );
_fadeAnim = CurvedAnimation( _fadeAnim = CurvedAnimation(parent: _animController, curve: Curves.easeOut);
parent: _animController, _slideAnim = Tween<Offset>(begin: const Offset(0, 0.06), end: Offset.zero)
curve: Curves.easeOut, .animate(CurvedAnimation(
); parent: _animController, curve: Curves.easeOutCubic));
_slideAnim = Tween<Offset>(
begin: const Offset(0, 0.06),
end: Offset.zero,
).animate(CurvedAnimation(
parent: _animController,
curve: Curves.easeOutCubic,
));
_animController.forward(); _animController.forward();
} }
@@ -57,7 +53,7 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
if (_formKey.currentState?.validate() ?? false) { if (_formKey.currentState?.validate() ?? false) {
context.read<AuthBloc>().add( context.read<AuthBloc>().add(
AuthLoginRequested( AuthLoginRequested(
identifier: _identifierController.text, identifier: _identifierController.text.trim(),
password: _passwordController.text, password: _passwordController.text,
), ),
); );
@@ -73,7 +69,8 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
SnackBar( SnackBar(
content: Row( content: Row(
children: [ children: [
const Icon(Icons.error_outline, color: Colors.white, size: 18), const Icon(Icons.error_outline,
color: Colors.white, size: 18),
const SizedBox(width: 10), const SizedBox(width: 10),
Expanded(child: Text(state.message)), Expanded(child: Text(state.message)),
], ],
@@ -86,8 +83,6 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
child: Scaffold( child: Scaffold(
backgroundColor: AppTheme.warmWhite, backgroundColor: AppTheme.warmWhite,
body: SafeArea( body: SafeArea(
child: Form(
key: _formKey,
child: CustomScrollView( child: CustomScrollView(
slivers: [ slivers: [
SliverFillRemaining( SliverFillRemaining(
@@ -99,23 +94,65 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 28), padding: const EdgeInsets.symmetric(horizontal: 28),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const SizedBox(height: 48), const SizedBox(height: 48),
_buildHeader(), _buildHeader(),
const SizedBox(height: 32),
_buildForm(context),
const SizedBox(height: 24),
const PrivacyNoticeCard(),
const SizedBox(height: 32),
_buildDemoHint(),
const Spacer(),
const SizedBox(height: 8), const SizedBox(height: 8),
Text( Center(
child: Text(
'Sistema Municipal de Recolección Residencial\nCelaya, Guanajuato', 'Sistema Municipal de Recolección Residencial\nCelaya, Guanajuato',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 12, color: Colors.grey.shade600, height: 1.3), fontSize: 12,
color: Colors.grey.shade600,
height: 1.3),
), ),
const SizedBox(height: 32), ),
// Asegúrate de que este widget esté definido en tu proyecto o cámbialo por un placeholder const SizedBox(height: 48),
// const ScheduleWarningBanner(), ],
const SizedBox(height: 32), ),
),
),
),
),
],
),
),
),
);
}
// --- CAMPO: EMAIL / IDENTIFICADOR --- Widget _buildHeader() {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: const [
Text(
'Bienvenido a WasteNotify',
style: TextStyle(fontSize: 26, fontWeight: FontWeight.bold),
),
SizedBox(height: 8),
Text(
'Inicia sesión para continuar',
style: TextStyle(fontSize: 14, color: Colors.grey),
),
],
);
}
Widget _buildForm(BuildContext context) {
return Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TextFormField( TextFormField(
controller: _identifierController, controller: _identifierController,
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
@@ -125,39 +162,40 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(12))), borderRadius: BorderRadius.all(Radius.circular(12))),
), ),
validator: (value) => validator: (value) => (value == null || value.trim().isEmpty)
(value == null || value.trim().isEmpty)
? 'Por favor, ingresa tus datos de acceso' ? 'Por favor, ingresa tus datos de acceso'
: null, : null,
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
// --- CAMPO: CONTRASEÑA ---
TextFormField( TextFormField(
controller: _passwordController, controller: _passwordController,
obscureText: _obscurePassword, obscureText: _obscurePassword,
decoration: InputDecoration( decoration: InputDecoration(
labelText: 'Contraseña de Acceso', labelText: 'Contraseña de Acceso',
prefixIcon: const Icon(Icons.lock_outline_rounded), prefixIcon: const Icon(Icons.lock_outline_rounded),
suffixIcon: IconButton(
icon: Icon(_obscurePassword ? Icons.visibility_off : Icons.visibility),
onPressed: () => setState(() => _obscurePassword = !_obscurePassword),
),
border: const OutlineInputBorder( border: const OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(12))), borderRadius: BorderRadius.all(Radius.circular(12))),
suffixIcon: IconButton(
icon: Icon(
_obscurePassword ? Icons.visibility : Icons.visibility_off),
onPressed: () =>
setState(() => _obscurePassword = !_obscurePassword),
),
), ),
validator: (value) => (value == null || value.isEmpty) validator: (value) => (value == null || value.isEmpty)
? 'Por favor, introduce tu contraseña' ? 'Por favor, introduce tu contraseña'
: null, : null,
), ),
const SizedBox(height: 32), const SizedBox(height: 32),
// --- CONTENEDOR REACTIVO DE BOTONES ---
BlocBuilder<AuthBloc, AuthState>( BlocBuilder<AuthBloc, AuthState>(
builder: (context, state) { builder: (context, state) {
final isLoading = state is AuthLoading; final isLoading = state is AuthLoading;
return AnimatedContainer( return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
AnimatedContainer(
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 200),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
@@ -165,7 +203,8 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
? [] ? []
: [ : [
BoxShadow( BoxShadow(
color: AppTheme.leafGreen.withOpacity(0.3), color:
AppTheme.leafGreen.withValues(alpha: 0.3),
blurRadius: 16, blurRadius: 16,
offset: const Offset(0, 6), offset: const Offset(0, 6),
), ),
@@ -175,38 +214,45 @@ class _LoginScreenState extends State<LoginScreen> with SingleTickerProviderStat
onPressed: isLoading ? null : () => _submit(context), onPressed: isLoading ? null : () => _submit(context),
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: isLoading backgroundColor: isLoading
? AppTheme.mintGreen.withOpacity(0.7) ? AppTheme.mintGreen.withValues(alpha: 0.7)
: AppTheme.leafGreen, : AppTheme.leafGreen,
disabledBackgroundColor: AppTheme.mintGreen.withOpacity(0.6), disabledBackgroundColor:
AppTheme.mintGreen.withValues(alpha: 0.6),
padding: const EdgeInsets.symmetric(vertical: 16), padding: const EdgeInsets.symmetric(vertical: 16),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)),
), ),
child: isLoading child: isLoading
? const CircularProgressIndicator(color: Colors.white) ? const SizedBox(
: const Text('Iniciar Sesión', style: TextStyle(color: Colors.white)), height: 20,
width: 20,
child: CircularProgressIndicator(
color: Colors.white, strokeWidth: 2),
)
: const Text('Iniciar Sesión',
style: TextStyle(color: Colors.white)),
), ),
),
const SizedBox(height: 16),
// 📍 BOTÓN DE REGISTRO CORREGIDO (child al final)
TextButton(
onPressed: () => context.push(AppRoutes.register),
style: TextButton.styleFrom(
foregroundColor: AppTheme.leafGreen,
textStyle: const TextStyle(
fontSize: 14, fontWeight: FontWeight.w500),
),
child: const Text('¿No tienes cuenta? Regístrate aquí'),
),
],
); );
}, },
), ),
const SizedBox(height: 24),
const PrivacyNoticeCard(),
const SizedBox(height: 32),
_buildDemoHint(),
const SizedBox(height: 24),
], ],
), ),
),
),
),
),
],
),
),
),
),
); );
} }
// Métodos auxiliares creados como placeholders para evitar errores de compilación // Placeholders para evitar errores si no están definidos
Widget _buildHeader() => const Center(child: Text("WasteNotify", style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold))); Widget _buildDemoHint() => const SizedBox.shrink();
Widget _buildDemoHint() => const Center(child: Text("Demo: ciudadano@ejemplo.com / password123", style: TextStyle(fontSize: 12)));
} }

31
lib/features/auth/presentation/screens/register_screen.dart
View File

@@ -11,11 +11,31 @@ class RegisterScreen extends StatefulWidget {
class _RegisterScreenState extends State<RegisterScreen> { class _RegisterScreenState extends State<RegisterScreen> {
final _formKey = GlobalKey<FormState>(); final _formKey = GlobalKey<FormState>();
String _selectedColonia = 'Centro'; late String _selectedColonia; // 📍 Se mantiene late pero se inicializa abajo
final _nameController = TextEditingController(); final _nameController = TextEditingController();
final _emailController = TextEditingController(); final _emailController = TextEditingController();
final _passwordController = TextEditingController(); final _passwordController = TextEditingController();
// 📍 CORRECCIÓN CRÍTICA: Asignar el valor inicial antes del método build
@override
void initState() {
super.initState();
if (MockWasteData.schedules.isNotEmpty) {
// Evita problemas de aserción tomando el primer valor real de tus mocks
_selectedColonia = MockWasteData.schedules.first.colonia;
} else {
_selectedColonia = ''; // Respaldo por si la lista estuviera vacía
}
}
@override
void dispose() {
_nameController.dispose();
_emailController.dispose();
_passwordController.dispose();
super.dispose();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@@ -38,24 +58,24 @@ class _RegisterScreenState extends State<RegisterScreen> {
TextFormField( TextFormField(
controller: _nameController, controller: _nameController,
decoration: const InputDecoration(labelText: 'Nombre Completo', border: OutlineInputBorder()), decoration: const InputDecoration(labelText: 'Nombre Completo', border: OutlineInputBorder()),
validator: (v) => v!.isEmpty ? 'Ingresa tu nombre' : null, validator: (v) => v == null || v.isEmpty ? 'Ingresa tu nombre' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _emailController, controller: _emailController,
decoration: const InputDecoration(labelText: 'Correo o Teléfono', border: OutlineInputBorder()), decoration: const InputDecoration(labelText: 'Correo o Teléfono', border: OutlineInputBorder()),
validator: (v) => v!.isEmpty ? 'Ingresa tus datos' : null, validator: (v) => v == null || v.isEmpty ? 'Ingresa tus datos' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
TextFormField( TextFormField(
controller: _passwordController, controller: _passwordController,
obscureText: true, obscureText: true,
decoration: const InputDecoration(labelText: 'Contraseña', border: OutlineInputBorder()), decoration: const InputDecoration(labelText: 'Contraseña', border: OutlineInputBorder()),
validator: (v) => v!.length < 6 ? 'Mínimo 6 caracteres' : null, validator: (v) => v == null || v.length < 6 ? 'Mínimo 6 caracteres' : null,
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
// Dropdown para seleccionar la Colonia (Requisito MVP) // Dropdown para seleccionar la Colonia
DropdownButtonFormField<String>( DropdownButtonFormField<String>(
value: _selectedColonia, value: _selectedColonia,
decoration: const InputDecoration(labelText: 'Selecciona tu Colonia / Domicilio', border: OutlineInputBorder()), decoration: const InputDecoration(labelText: 'Selecciona tu Colonia / Domicilio', border: OutlineInputBorder()),
@@ -82,7 +102,6 @@ class _RegisterScreenState extends State<RegisterScreen> {
style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16), backgroundColor: Colors.green), style: ElevatedButton.styleFrom(padding: const EdgeInsets.symmetric(vertical: 16), backgroundColor: Colors.green),
onPressed: () { onPressed: () {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
// Simulación de Registro Exitoso: Navega al Home enviando la colonia elegida
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Cuenta creada con éxito (Modo Simulación)')), const SnackBar(content: Text('Cuenta creada con éxito (Modo Simulación)')),
); );

8
lib/features/auth/presentation/widgets/privacy_notice_card.dart
View File

@@ -17,7 +17,7 @@ class PrivacyNoticeCard extends StatelessWidget {
color: AppTheme.lightMint, color: AppTheme.lightMint,
borderRadius: BorderRadius.circular(12), borderRadius: BorderRadius.circular(12),
border: Border.all( border: Border.all(
color: AppTheme.mintGreen.withOpacity(0.3), color: AppTheme.mintGreen.withValues(alpha: 0.3),
width: 1, width: 1,
), ),
), ),
@@ -85,7 +85,7 @@ class _PrivacyPoint extends StatelessWidget {
text, text,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
color: AppTheme.forestGreen.withOpacity(0.85), color: AppTheme.forestGreen.withValues(alpha: 0.85),
height: 1.4, height: 1.4,
), ),
), ),
@@ -105,10 +105,10 @@ class ScheduleWarningBanner extends StatelessWidget {
return Container( return Container(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10), padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: AppTheme.alertAmber.withOpacity(0.10), color: AppTheme.alertAmber.withValues(alpha: 0.10),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
border: Border.all( border: Border.all(
color: AppTheme.alertAmber.withOpacity(0.35), color: AppTheme.alertAmber.withValues(alpha: 0.35),
width: 1, width: 1,
), ),
), ),

62
pubspec.lock
View File

@@ -37,26 +37,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.0" version: "1.4.1"
clock: clock:
dependency: transitive dependency: transitive
description: description:
name: clock name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.1" version: "1.1.2"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.19.0" version: "1.19.1"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -85,10 +85,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.1" version: "1.3.3"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
@@ -220,26 +220,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06" sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.7" version: "11.0.2"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379" sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.8" version: "3.0.10"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.1" version: "3.0.2"
lints: lints:
dependency: transitive dependency: transitive
description: description:
@@ -276,26 +276,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.12.16+1" version: "0.12.19"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.11.1" version: "0.13.0"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.15.0" version: "1.18.0"
mgrs_dart: mgrs_dart:
dependency: transitive dependency: transitive
description: description:
@@ -316,10 +316,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: path name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.9.0" version: "1.9.1"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
@@ -465,18 +465,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.12.0" version: "1.12.1"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.2" version: "2.1.4"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
@@ -497,10 +497,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.3" version: "0.7.11"
timezone: timezone:
dependency: transitive dependency: transitive
description: description:
@@ -529,10 +529,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.4" version: "2.2.0"
vm_service: vm_service:
dependency: transitive dependency: transitive
description: description:
@@ -574,5 +574,5 @@ packages:
source: hosted source: hosted
version: "6.5.0" version: "6.5.0"
sdks: sdks:
dart: ">=3.6.0 <4.0.0" dart: ">=3.10.0-0 <4.0.0"
flutter: ">=3.27.0" flutter: ">=3.27.0"

2
test/widget_test.dart
View File

@@ -11,7 +11,7 @@ import 'package:flutter_test/flutter_test.dart';
// Use a local test app to avoid depending on external package imports // Use a local test app to avoid depending on external package imports
// which may not exist in the test environment. // which may not exist in the test environment.
class MyApp extends StatefulWidget { class MyApp extends StatefulWidget {
const MyApp({Key? key}) : super(key: key); const MyApp({super.key});
@override @override
State<MyApp> createState() => _MyAppState(); State<MyApp> createState() => _MyAppState();