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

update

Browse Source
This commit is contained in:
Felipe
2023-11-14 12:37:09 -05:00
parent e5aa47c199
commit 043c3c580c
7 changed files with 620 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/components/bottom_sheet.dart
+51
View File
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:animate_do/animate_do.dart';
class BottomSheetExpanded extends StatelessWidget {
final List<Widget> children;
@@ -12,6 +13,56 @@ class BottomSheetExpanded extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Container(
width: double.infinity,
decoration: const BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topCenter,
colors: [
Color.fromARGB(255, 87, 210, 255),
Color.fromARGB(255, 137, 224, 255),
Color(0xFFD6F4FF),
],
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
const SizedBox(height: 50),
Center(
child: FadeInLeft(
duration: const Duration(milliseconds: 1000),
child: const Image(
image: AssetImage('images/logo_prosapp.png'),
),
),
),
const SizedBox(height: 30),
Expanded(
child: FadeInUpBig(
duration: const Duration(milliseconds: 1000),
child: Container(
decoration: const BoxDecoration(
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),
),
),
),
)
],
),
),
);
return SafeArea(
child: Scaffold(
backgroundColor: const Color(0xFFD6F4FF),
lib/src/presentation/screens/login/login.dart
+5 -5
View File
@@ -5,7 +5,7 @@ import 'package:flutter/services.dart';
import 'package:get/get.dart';
import 'package:intl_phone_field/intl_phone_field.dart';
import 'package:prosappco/src/components/bottom_sheet.dart';
import 'package:prosappco/src/components/primary_btn.dart';
import 'package:prosappco/src/presentation/widgets/shared/primary_button.dart';
import 'package:prosappco/src/controllers/phone_auth_controller.dart';
import 'package:prosappco/src/models/setting_model.dart';
import 'package:prosappco/src/providers/user_provider.dart';
@@ -180,7 +180,7 @@ class _LoginScreenState extends State<LoginScreen> {
],
),
),
PrimaryButtom(
PrimaryButton(
onPressed: () async {
if (_formKey.currentState!.validate()) {
PhoneAuthController.instance.phoneAuthentication(
@@ -196,8 +196,8 @@ class _LoginScreenState extends State<LoginScreen> {
.initUserProvider();
}
},
text: 'Enviar código',
isEnabled: _isChecked,
label: 'Enviar código',
),
const SizedBox(height: 20),
GestureBottom(clearPhoneNumber: _clearPhoneNumber),
@@ -353,7 +353,7 @@ class _LoginScreenState extends State<LoginScreen> {
],
),
),
PrimaryButtom(
PrimaryButton(
onPressed: () async {
if (_formKey.currentState!.validate()) {
PhoneAuthController.instance.phoneAuthentication(
@@ -369,8 +369,8 @@ class _LoginScreenState extends State<LoginScreen> {
.initUserProvider();
}
},
text: 'Enviar código',
isEnabled: _isChecked,
label: 'Enviar código',
),
const SizedBox(height: 20),
GestureBottom(clearPhoneNumber: _clearPhoneNumber),
lib/src/presentation/screens/login/login_email.dart
+17 -48
View File
@@ -3,7 +3,8 @@ import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:get/get.dart';
import 'package:prosappco/src/authentication/authentication_repository.dart';
import 'package:prosappco/src/components/primary_btn.dart';
import 'package:prosappco/src/components/bottom_sheet.dart';
import 'package:prosappco/src/presentation/widgets/shared/primary_button.dart';
import 'package:prosappco/src/controllers/login_email_controller.dart';
import 'package:prosappco/src/models/setting_model.dart';
import 'package:prosappco/src/providers/user_provider.dart';
@@ -47,39 +48,10 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
Widget _mobileView(BuildContext context) {
bool isIOS = Theme.of(context).platform == TargetPlatform.iOS;
return SafeArea(
child: Scaffold(
backgroundColor: const Color(0xFFD6F4FF),
body: SingleChildScrollView(
reverse: true,
child: Stack(
return BottomSheetExpanded(
horizontalPadding: 10,
children: [
Container(
margin: const EdgeInsets.only(top: 130),
width: double.infinity,
height: 700,
decoration: const BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topRight: Radius.circular(50),
topLeft: Radius.circular(50))),
),
Container(
margin: const EdgeInsets.only(top: 20, left: 30),
child: const Image(
image: AssetImage('images/logo_prosapp.png'),
width: 180,
height: 100,
),
),
Container(
padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(
top: 125,
left: 25,
),
child: Row(
Row(
children: <Widget>[
IconButton(
icon: const Icon(
@@ -101,13 +73,12 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
),
],
),
),
Form(
Padding(
padding: const EdgeInsets.symmetric(horizontal: 25),
child: Form(
key: _formKey,
child: Container(
padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 210, left: 50, right: 50),
padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
child: Column(
children: [
!isIOS && !kIsWeb && settings?.google == true
@@ -160,8 +131,7 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
),
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(horizontal: 10),
child: Text("ó"),
),
Expanded(
@@ -219,8 +189,8 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
Radius.circular(50),
)),
errorBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Color.fromARGB(255, 184, 0, 0)),
borderSide:
BorderSide(color: Color.fromARGB(255, 184, 0, 0)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
@@ -267,10 +237,8 @@ class _LoginEmailScreenState extends State<LoginEmailScreen> {
),
),
),
),
],
),
),
),
);
}
@@ -519,7 +487,7 @@ class PaddingButtomBottom extends StatelessWidget {
return Padding(
padding: const EdgeInsets.only(bottom: 40),
child: Center(
child: PrimaryButtom(
child: PrimaryButton(
onPressed: () {
if (_formKey.currentState!.validate()) {
LoginEmailController.instance
@@ -533,8 +501,9 @@ class PaddingButtomBottom extends StatelessWidget {
});
}
},
label: 'Iniciar',
)),
text: 'Iniciar',
),
),
);
}
}
lib/src/presentation/screens/register/register.dart
+35 -92
View File
@@ -1,16 +1,15 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:get/get.dart';
import 'package:prosappco/main.dart';
import 'package:prosappco/src/authentication/authentication_repository.dart';
import 'package:prosappco/src/components/primary_btn.dart';
import 'package:prosappco/src/components/bottom_sheet.dart';
import 'package:prosappco/src/components/column_padding.dart';
import 'package:prosappco/src/presentation/widgets/shared/primary_button.dart';
import 'package:prosappco/src/controllers/register_controller.dart';
import 'package:prosappco/src/models/setting_model.dart';
import 'package:prosappco/src/providers/user_provider.dart';
import 'package:prosappco/src/presentation/screens/login/login.dart';
import 'package:prosappco/src/presentation/screens/web_view.dart';
import 'package:provider/provider.dart';
import 'package:responsive_builder/responsive_builder.dart';
@@ -62,41 +61,10 @@ class _RegisterScreenState extends State<RegisterScreen> {
Widget _mobileView(BuildContext context) {
bool isIOS = Theme.of(context).platform == TargetPlatform.iOS;
return SafeArea(
child: Scaffold(
backgroundColor: const Color(0xFFD6F4FF),
body: GestureDetector(
onTap: () => FocusScope.of(context).unfocus(),
child: SingleChildScrollView(
reverse: true,
child: Stack(
return BottomSheetExpanded(
horizontalPadding: 10,
children: [
Container(
margin: const EdgeInsets.only(top: 130),
width: double.infinity,
height: 700,
decoration: const BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.only(
topRight: Radius.circular(50),
topLeft: Radius.circular(50))),
),
Container(
margin: const EdgeInsets.only(top: 20, left: 30),
child: const Image(
image: AssetImage('images/logo_prosapp.png'),
width: 180,
height: 100,
),
),
Container(
padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(
top: 125,
left: 25,
),
child: Row(
Row(
children: <Widget>[
IconButton(
icon: const Icon(
@@ -118,12 +86,9 @@ class _RegisterScreenState extends State<RegisterScreen> {
),
],
),
),
Container(
padding:
const EdgeInsets.symmetric(horizontal: 0, vertical: 20),
margin: const EdgeInsets.only(top: 200, left: 50, right: 50),
child: Column(
ColumnPadding(
alineacion: MainAxisAlignment.start,
padding: const EdgeInsets.symmetric(horizontal: 25, vertical: 20),
children: [
!isIOS && !kIsWeb && settings?.google == true
? Padding(
@@ -170,8 +135,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
),
),
Padding(
padding:
EdgeInsets.symmetric(horizontal: 10),
padding: EdgeInsets.symmetric(horizontal: 10),
child: Text("ó"),
),
Expanded(
@@ -194,8 +158,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
alignment: Alignment.topLeft,
child: Text('Email',
style: TextStyle(
fontSize: 18.0,
color: Color(0xFF65676B))),
fontSize: 18.0, color: Color(0xFF65676B))),
)),
Padding(
padding: const EdgeInsets.only(bottom: 18),
@@ -205,8 +168,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
if (value == null || value.isEmpty) {
return 'Por favor ingresa un email';
}
final RegExp emailRegExp = RegExp(
r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
final RegExp emailRegExp =
RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
if (!emailRegExp.hasMatch(value)) {
return 'Por favor ingresa un email válido';
}
@@ -214,27 +177,23 @@ class _RegisterScreenState extends State<RegisterScreen> {
},
decoration: const InputDecoration(
border: OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderSide: BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
enabledBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderSide: BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderSide: BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
errorBorder: OutlineInputBorder(
borderSide: BorderSide(
color:
Color.fromARGB(255, 184, 0, 0)),
color: Color.fromARGB(255, 184, 0, 0)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
@@ -254,8 +213,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
alignment: Alignment.topLeft,
child: Text('Password',
style: TextStyle(
fontSize: 18.0,
color: Color(0xFF65676B))),
fontSize: 18.0, color: Color(0xFF65676B))),
)),
Padding(
padding: const EdgeInsets.only(bottom: 25),
@@ -274,26 +232,22 @@ class _RegisterScreenState extends State<RegisterScreen> {
decoration: InputDecoration(
errorBorder: const OutlineInputBorder(
borderSide: BorderSide(
color:
Color.fromARGB(255, 184, 0, 0)),
color: Color.fromARGB(255, 184, 0, 0)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
enabledBorder: const OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderSide: BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
border: const OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderSide: BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
focusedBorder: const OutlineInputBorder(
borderSide:
BorderSide(color: Color(0xFFECECEC)),
borderSide: BorderSide(color: Color(0xFFECECEC)),
borderRadius: BorderRadius.all(
Radius.circular(50),
)),
@@ -301,8 +255,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
hintStyle: const TextStyle(
color: Colors.grey,
),
fillColor:
const Color.fromARGB(255, 239, 239, 239),
fillColor: const Color.fromARGB(255, 239, 239, 239),
filled: true,
prefixIcon: const Icon(Icons.lock_outline),
suffixIcon: IconButton(
@@ -327,8 +280,8 @@ class _RegisterScreenState extends State<RegisterScreen> {
Padding(
padding: const EdgeInsets.only(bottom: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment
.center, // Centra horizontalmente
mainAxisAlignment:
MainAxisAlignment.center, // Centra horizontalmente
children: <Widget>[
Checkbox(
value: _isChecked,
@@ -341,8 +294,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
GestureDetector(
onTap: () {
if (kIsWeb) {
_launchURL(
settings?.terminosCondiciones ?? '');
_launchURL(settings?.terminosCondiciones ?? '');
} else {
Navigator.push(
context,
@@ -350,8 +302,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
builder: (BuildContext context) {
return WebViewScreen(
label: 'Políticas de privacidad',
link: settings?.terminosCondiciones ??
'',
link: settings?.terminosCondiciones ?? '',
);
},
),
@@ -372,7 +323,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
Padding(
padding: const EdgeInsets.only(bottom: 25),
child: Center(
child: PrimaryButtom(
child: PrimaryButton(
onPressed: () {
if (_formKey.currentState!.validate()) {
RegisterController.instance
@@ -380,13 +331,12 @@ class _RegisterScreenState extends State<RegisterScreen> {
controller.email.text.trim(),
controller.password.text.trim(),
)
.then((value) => Provider.of<UserProvider>(
context,
listen: false)
.then((value) =>
Provider.of<UserProvider>(context, listen: false)
.initUserProvider());
}
},
label: 'Registrarme',
text: 'Registrarme',
isEnabled: _isChecked,
),
),
@@ -403,8 +353,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
WidgetSpan(
child: GestureDetector(
onTap: () {
Navigator.pushReplacementNamed(
context, '/login');
Navigator.pushReplacementNamed(context, '/login');
},
child: const Text(
'Iniciar Sesión',
@@ -421,12 +370,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
)
],
),
),
],
),
),
),
),
);
}
@@ -684,7 +628,7 @@ class _RegisterScreenState extends State<RegisterScreen> {
Padding(
padding: const EdgeInsets.only(bottom: 25),
child: Center(
child: PrimaryButtom(
child: PrimaryButton(
onPressed: () {
if (_formKey.currentState!.validate()) {
RegisterController.instance
@@ -698,10 +642,9 @@ class _RegisterScreenState extends State<RegisterScreen> {
.initUserProvider());
}
},
text: 'Registrarme',
isEnabled: _isChecked,
label: 'Registrarme',
),
),
)),
),
RichText(
text: TextSpan(
lib/src/presentation/widgets/shared/primary_button.dart
+12 -8
View File
@@ -5,20 +5,23 @@ class PrimaryButton extends StatelessWidget {
final String text;
final double? minWidth;
final double? minHeight;
final bool isEnabled;
const PrimaryButton(
{super.key,
const PrimaryButton({
super.key,
required this.onPressed,
required this.text,
this.minWidth = 200,
this.minHeight = 50});
this.minHeight = 50,
this.isEnabled = true,
});
@override
Widget build(BuildContext context) {
return ElevatedButton(
onPressed: onPressed,
onPressed: isEnabled ? onPressed : null,
style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF2BA4EC),
backgroundColor: isEnabled ? const Color(0xFF2BA4EC) : Colors.grey,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(50),
),
@@ -27,11 +30,12 @@ class PrimaryButton extends StatelessWidget {
),
child: Text(
text,
style: const TextStyle(
color: Colors.white,
style: TextStyle(
color: isEnabled ? Colors.white : Colors.black,
fontWeight: FontWeight.bold,
fontSize: 17,
),
));
),
);
}
}
pubspec.lock
+8
View File
@@ -25,6 +25,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.13.0"
animate_do:
dependency: "direct main"
description:
name: animate_do
sha256: "9aeacc1a7238f971c039bdf45d13c628be554a242e0251c4ddda09d19a1a923f"
url: "https://pub.dev"
source: hosted
version: "3.0.2"
animated_splash_screen:
dependency: "direct main"
description:
pubspec.yaml
+1
View File
@@ -68,6 +68,7 @@ dependencies:
universal_html: ^2.2.3
firebase_messaging: ^14.6.3
animated_splash_screen: ^1.3.0
animate_do: ^3.0.2
dev_dependencies:
flutter_test: