diff --git a/lib/src/components/bottom_sheet.dart b/lib/src/components/bottom_sheet.dart index 73a19a0..e6a1388 100644 --- a/lib/src/components/bottom_sheet.dart +++ b/lib/src/components/bottom_sheet.dart @@ -6,10 +6,10 @@ class BottomSheetExpanded extends StatelessWidget { final double horizontalPadding; const BottomSheetExpanded({ - super.key, + Key? key, required this.children, this.horizontalPadding = 35, - }); + }) : super(key: key); @override Widget build(BuildContext context) { @@ -20,8 +20,8 @@ class BottomSheetExpanded extends StatelessWidget { gradient: LinearGradient( begin: Alignment.topCenter, colors: [ - Color.fromARGB(255, 87, 210, 255), - Color.fromARGB(255, 137, 224, 255), + Color.fromARGB(255, 139, 224, 255), + Color.fromARGB(255, 152, 228, 255), Color(0xFFD6F4FF), ], ), @@ -44,54 +44,22 @@ class BottomSheetExpanded extends StatelessWidget { duration: const Duration(milliseconds: 1000), child: Container( decoration: const BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(60), - topRight: Radius.circular(60))), + color: Colors.white, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(60), + topRight: Radius.circular(60), + ), + ), child: Padding( padding: EdgeInsets.symmetric( horizontal: horizontalPadding, vertical: 15, ), - child: Column(children: children), + child: SingleChildScrollView( + child: Column(children: children)), ), ), ), - ) - ], - ), - ), - ); - - return SafeArea( - child: Scaffold( - backgroundColor: const Color(0xFFD6F4FF), - body: Column( - children: [ - const Expanded( - child: Padding( - padding: EdgeInsets.all(15.0), - child: Image( - image: AssetImage('images/logo_prosapp.png'), - ), - ), - ), - Container( - width: double.infinity, - decoration: const BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(30), - topRight: Radius.circular(30), - ), - ), - child: Padding( - padding: EdgeInsets.symmetric( - horizontal: horizontalPadding, - vertical: 15, - ), - child: Column(children: children), - ), ), ], ), diff --git a/lib/src/presentation/screens/login/login_email.dart b/lib/src/presentation/screens/login/login_email.dart index 3bbabc4..48148da 100644 --- a/lib/src/presentation/screens/login/login_email.dart +++ b/lib/src/presentation/screens/login/login_email.dart @@ -174,26 +174,30 @@ class _LoginEmailScreenState extends State { }, decoration: InputDecoration( enabledBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFECECEC)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: BorderSide(color: Color(0xFFECECEC)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), focusedBorder: const OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFECECEC)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: BorderSide(color: Color(0xFFECECEC)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), border: const OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFECECEC)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: BorderSide(color: Color(0xFFECECEC)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), errorBorder: const OutlineInputBorder( - borderSide: - BorderSide(color: Color.fromARGB(255, 184, 0, 0)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: + BorderSide(color: Color.fromARGB(255, 184, 0, 0)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), hintText: 'Contraseña', fillColor: const Color.fromARGB(255, 239, 239, 239), filled: true, @@ -217,7 +221,7 @@ class _LoginEmailScreenState extends State { ), ), Padding( - padding: const EdgeInsets.symmetric(vertical: 20), + padding: const EdgeInsets.symmetric(vertical: 10), child: TextButton( onPressed: () { Navigator.pushNamed(context, '/resetpassword'); @@ -231,7 +235,9 @@ class _LoginEmailScreenState extends State { ), ), PaddingButtomBottom( - formKey: _formKey, controller: controller), + formKey: _formKey, + controller: controller, + ), const RichTxtBottom() ], ), @@ -485,7 +491,7 @@ class PaddingButtomBottom extends StatelessWidget { @override Widget build(BuildContext context) { return Padding( - padding: const EdgeInsets.only(bottom: 40), + padding: const EdgeInsets.only(bottom: 25), child: Center( child: PrimaryButton( onPressed: () { diff --git a/lib/src/presentation/screens/register/register.dart b/lib/src/presentation/screens/register/register.dart index 61b7349..1ac06c2 100644 --- a/lib/src/presentation/screens/register/register.dart +++ b/lib/src/presentation/screens/register/register.dart @@ -177,26 +177,30 @@ class _RegisterScreenState extends State { }, decoration: const InputDecoration( border: OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFECECEC)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: BorderSide(color: Color(0xFFECECEC)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFECECEC)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: BorderSide(color: Color(0xFFECECEC)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: Color(0xFFECECEC)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: BorderSide(color: Color(0xFFECECEC)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), errorBorder: OutlineInputBorder( - borderSide: BorderSide( - color: Color.fromARGB(255, 184, 0, 0)), - borderRadius: BorderRadius.all( - Radius.circular(50), - )), + borderSide: + BorderSide(color: Color.fromARGB(255, 184, 0, 0)), + borderRadius: BorderRadius.all( + Radius.circular(50), + ), + ), hintText: 'Hello@gmail.com', fillColor: Color.fromARGB(255, 239, 239, 239), filled: true,