usite-sas-bic/prosappweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Juan Felipe Duarte
2023-04-14 08:53:10 -05:00
parent 232ca3df46
commit 86e3b47693
6 changed files with 1021 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/code_validation.dart
+30 -19
View File
@@ -16,14 +16,15 @@ class CodeValidationScreen extends StatelessWidget {
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFD6F4FF),
backgroundColor: Color(0xFFD6F4FF), body: SingleChildScrollView(
body: Stack( reverse: true,
child: Stack(
children: [ children: [
Container( Container(
margin: const EdgeInsets.only(top: 280), margin: const EdgeInsets.only(top: 280),
width: double.infinity, width: double.infinity,
height: 600, height: MediaQuery.of(context).size.height / 1.5,
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
@@ -32,10 +33,12 @@ class CodeValidationScreen extends StatelessWidget {
), ),
Container( Container(
margin: const EdgeInsets.only(top: 120, left: 70, right: 70), margin: const EdgeInsets.only(top: 120, left: 70, right: 70),
child: const Image(image: AssetImage('images/logo_prosapp.png')), child:
const Image(image: AssetImage('images/logo_prosapp.png')),
), ),
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 280, left: 25), margin: const EdgeInsets.only(top: 280, left: 25),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
@@ -61,9 +64,11 @@ class CodeValidationScreen extends StatelessWidget {
), ),
), ),
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 350, left: 50, right: 50), margin: const EdgeInsets.only(top: 350, left: 50, right: 50),
child: Column(children: [ child: Column(
children: [
const Padding( const Padding(
padding: EdgeInsets.only(bottom: 5), padding: EdgeInsets.only(bottom: 5),
child: Align( child: Align(
@@ -81,8 +86,8 @@ class CodeValidationScreen extends StatelessWidget {
onChanged: (value) { onChanged: (value) {
phoneNumber = value; phoneNumber = value;
}, },
controller: controller: TextEditingController(
TextEditingController(text: phoneNumber ?? ''), text: phoneNumber ?? ''),
decoration: InputDecoration( decoration: InputDecoration(
border: InputBorder.none, border: InputBorder.none,
hintText: '', hintText: '',
@@ -94,7 +99,8 @@ class CodeValidationScreen extends StatelessWidget {
child: Text('Reenviar código'), child: Text('Reenviar código'),
onPressed: () { onPressed: () {
if (phoneNumber!.isNotEmpty) { if (phoneNumber!.isNotEmpty) {
PhoneAuthController.instance.phoneAuthentication( PhoneAuthController.instance
.phoneAuthentication(
phoneNumber!, phoneNumber!,
); );
} }
@@ -109,8 +115,8 @@ class CodeValidationScreen extends StatelessWidget {
padding: const EdgeInsets.only(bottom: 5), padding: const EdgeInsets.only(bottom: 5),
child: Text('Codigo', child: Text('Codigo',
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: style: TextStyle(
TextStyle(fontSize: 18.0, color: Color(0xFF65676B))), fontSize: 18.0, color: Color(0xFF65676B))),
), ),
), ),
Padding( Padding(
@@ -145,18 +151,23 @@ class CodeValidationScreen extends StatelessWidget {
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
primary: Color(0xFF2BA4EC), // Color del botón primary: Color(0xFF2BA4EC), // Color del botón
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: borderRadius: BorderRadius.circular(
BorderRadius.circular(50), // Bordes redondeados 50), // Bordes redondeados
), ),
elevation: 0, elevation: 0,
minimumSize: Size(230, 60), // Tamaño mínimo del botón minimumSize:
Size(230, 60), // Tamaño mínimo del botón
),
), ),
)),
), ),
]),
), ),
], ],
), ),
)); ),
],
),
),
),
);
} }
} }
lib/src/screens/login.dart
+26 -14
View File
@@ -24,14 +24,15 @@ class _LoginScreenState extends State<LoginScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFD6F4FF),
backgroundColor: Color(0xFFD6F4FF), body: SingleChildScrollView(
body: Stack( reverse: true,
child: Stack(
children: [ children: [
Container( Container(
margin: const EdgeInsets.only(top: 280), margin: const EdgeInsets.only(top: 280),
width: double.infinity, width: double.infinity,
height: 600, height: MediaQuery.of(context).size.height / 1.5,
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
@@ -40,10 +41,12 @@ class _LoginScreenState extends State<LoginScreen> {
), ),
Container( Container(
margin: const EdgeInsets.only(top: 120, left: 70, right: 70), margin: const EdgeInsets.only(top: 120, left: 70, right: 70),
child: const Image(image: AssetImage('images/logo_prosapp.png')), child:
const Image(image: AssetImage('images/logo_prosapp.png')),
), ),
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 280, left: 30, right: 50), margin: const EdgeInsets.only(top: 280, left: 30, right: 50),
child: Column(children: const [ child: Column(children: const [
Align( Align(
@@ -60,9 +63,11 @@ class _LoginScreenState extends State<LoginScreen> {
]), ]),
), ),
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 350, left: 50, right: 50), margin: const EdgeInsets.only(top: 350, left: 50, right: 50),
child: Column(children: [ child: Column(
children: [
const Padding( const Padding(
padding: EdgeInsets.only(bottom: 5), padding: EdgeInsets.only(bottom: 5),
child: Align( child: Align(
@@ -83,12 +88,14 @@ class _LoginScreenState extends State<LoginScreen> {
}, },
decoration: InputDecoration( decoration: InputDecoration(
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xFFECECEC)), borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(50), Radius.circular(50),
)), )),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Color(0xFFECECEC)), borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all( borderRadius: BorderRadius.all(
Radius.circular(50), Radius.circular(50),
)), )),
@@ -100,9 +107,11 @@ class _LoginScreenState extends State<LoginScreen> {
), ),
const Padding( const Padding(
padding: EdgeInsets.only(bottom: 30), padding: EdgeInsets.only(bottom: 30),
child: Text('Un código será enviado a este numero de celular.', child: Text(
'Un código será enviado a este numero de celular.',
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle(fontSize: 13.0, color: Color(0xFF65676B))), style: TextStyle(
fontSize: 13.0, color: Color(0xFF65676B))),
), ),
Padding( Padding(
padding: const EdgeInsets.only(bottom: 30), padding: const EdgeInsets.only(bottom: 30),
@@ -166,10 +175,13 @@ class _LoginScreenState extends State<LoginScreen> {
], ],
), ),
) )
]), ],
),
), ),
], ],
), ),
)); ),
),
);
} }
} }
lib/src/screens/login_email.dart
+7 -4
View File
@@ -30,14 +30,15 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: Color(0xFFD6F4FF), backgroundColor: Color(0xFFD6F4FF),
body: Stack( body: SingleChildScrollView(
reverse: true,
child: Stack(
children: [ children: [
Container( Container(
margin: const EdgeInsets.only(top: 130), margin: const EdgeInsets.only(top: 130),
width: double.infinity, width: double.infinity,
height: 800, height: 700,
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
@@ -84,7 +85,8 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
Form( Form(
key: _formKey, key: _formKey,
child: Container( child: Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 210, left: 50, right: 50), margin: const EdgeInsets.only(top: 210, left: 50, right: 50),
child: Column(children: [ child: Column(children: [
Padding( Padding(
@@ -263,6 +265,7 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
), ),
], ],
), ),
),
)); ));
} }
} }
lib/src/screens/professional_profile.dart
+13 -7
View File
@@ -5,6 +5,7 @@ import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_storage/firebase_storage.dart'; import 'package:firebase_storage/firebase_storage.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:get/get_connect/http/src/utils/utils.dart';
import 'package:prosappco/src/authentication/authentication_repository.dart'; import 'package:prosappco/src/authentication/authentication_repository.dart';
import 'package:prosappco/src/components/photo_view.dart'; import 'package:prosappco/src/components/photo_view.dart';
import 'package:prosappco/src/components/pop_appbar.dart'; import 'package:prosappco/src/components/pop_appbar.dart';
@@ -453,17 +454,18 @@ class ProfessionalProfileScreenState extends State<ProfessionalProfileScreen> {
final User? user = FirebaseAuth.instance.currentUser; final User? user = FirebaseAuth.instance.currentUser;
String profession = _profession.toString(); String profession = _profession.toString();
double _space = 10; double _space = 10;
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false,
appBar: PopAppbar( appBar: PopAppbar(
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pop(context);
}, },
label: 'Perfil profesional'), label: 'Perfil profesional'),
body: Center( body: SingleChildScrollView(
reverse: true,
child: Center(
child: Column( child: Column(
children: [ children: [
GestureDetector( GestureDetector(
@@ -534,7 +536,8 @@ class ProfessionalProfileScreenState extends State<ProfessionalProfileScreen> {
TextFormField( TextFormField(
readOnly: true, readOnly: true,
onTap: () async { onTap: () async {
final String? profesion = (await Navigator.pushNamed( final String? profesion =
(await Navigator.pushNamed(
context, '/profession')) as String?; context, '/profession')) as String?;
if (profesion != null) { if (profesion != null) {
@@ -638,13 +641,14 @@ class ProfessionalProfileScreenState extends State<ProfessionalProfileScreen> {
), ),
Container( Container(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
margin: const EdgeInsets.only(top: 120, right: 70, left: 70), margin: const EdgeInsets.only(
top: 80, right: 70, left: 70, bottom: 30),
child: ElevatedButton( child: ElevatedButton(
onPressed: () { onPressed: () {
sendInfo(); sendInfo();
}, },
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Color(0xFF2BA4EC), backgroundColor: const Color(0xFF2BA4EC),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50), borderRadius: BorderRadius.circular(50),
), ),
@@ -670,10 +674,12 @@ class ProfessionalProfileScreenState extends State<ProfessionalProfileScreen> {
), ),
], ],
), ),
)), ),
),
], ],
), ),
), ),
),
)); ));
} }
} }
lib/src/screens/profile.dart
+9 -4
View File
@@ -350,7 +350,6 @@ class _ProfileScreenState extends State<ProfileScreen> {
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false,
appBar: AppBar( appBar: AppBar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
iconTheme: const IconThemeData( iconTheme: const IconThemeData(
@@ -369,7 +368,9 @@ class _ProfileScreenState extends State<ProfileScreen> {
userPhoneNumber: user?.phoneNumber ?? '', userPhoneNumber: user?.phoneNumber ?? '',
userCity: city, userCity: city,
userState: state), userState: state),
body: Center( body: SingleChildScrollView(
reverse: true,
child: Center(
child: Column( child: Column(
children: [ children: [
GestureDetector( GestureDetector(
@@ -427,7 +428,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
controller: _passwordController, controller: _passwordController,
obscureText: _obscureText, obscureText: _obscureText,
decoration: InputDecoration( decoration: InputDecoration(
prefixIcon: const Icon(Icons.lock_outline), prefixIcon:
const Icon(Icons.lock_outline),
suffixIcon: IconButton( suffixIcon: IconButton(
icon: Icon( icon: Icon(
_obscureText _obscureText
@@ -505,11 +507,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
elevation: 0, elevation: 0,
minimumSize: Size(200, 50), minimumSize: Size(200, 50),
), ),
)), ),
padding: EdgeInsets.only(bottom: 30),
),
], ],
), ),
), ),
), ),
),
); );
} }
} }
lib/src/screens/register.dart
+9 -5
View File
@@ -26,16 +26,17 @@ class _RegisterScreenState extends State<RegisterScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return SafeArea(
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false, backgroundColor: const Color(0xFFD6F4FF),
backgroundColor: Color(0xFFD6F4FF),
body: GestureDetector( body: GestureDetector(
onTap: () => FocusScope.of(context).unfocus(), onTap: () => FocusScope.of(context).unfocus(),
child: SingleChildScrollView(
reverse: true,
child: Stack( child: Stack(
children: [ children: [
Container( Container(
margin: const EdgeInsets.only(top: 130), margin: const EdgeInsets.only(top: 130),
width: double.infinity, width: double.infinity,
height: 800, height: 700,
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
@@ -51,7 +52,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
), ),
), ),
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only( margin: const EdgeInsets.only(
top: 125, top: 125,
left: 25, left: 25,
@@ -80,7 +82,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
), ),
), ),
Container( Container(
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20), padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 200, left: 50, right: 50), margin: const EdgeInsets.only(top: 200, left: 50, right: 50),
child: Column(children: [ child: Column(children: [
Padding( Padding(
@@ -270,6 +273,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
], ],
), ),
), ),
),
)); ));
} }
} }