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:
Felipe
2023-11-03 15:56:02 -05:00
parent 97b0ae939b
commit b40c989a86
4 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/main.dart
+1 -1
View File
@@ -98,7 +98,7 @@ class MyApp extends StatelessWidget {
GlobalCupertinoLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
], ],
supportedLocales: const [ supportedLocales: const [
Locale('es'), // Spanish Locale('es', 'US'),
], ],
title: 'ProsApp', title: 'ProsApp',
initialRoute: '/', initialRoute: '/',
lib/src/screens/cita.dart
+6 -18
View File
@@ -4,6 +4,7 @@ import 'package:firebase_storage/firebase_storage.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_rating_bar/flutter_rating_bar.dart'; import 'package:flutter_rating_bar/flutter_rating_bar.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.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';
@@ -289,7 +290,7 @@ class _CitaScreenState extends State<CitaScreen> {
// Text('${widget.evento.range1Hour1} - ${DateTime.now()}'), // Text('${widget.evento.range1Hour1} - ${DateTime.now()}'),
Text( Text(
textAlign: TextAlign.center, textAlign: TextAlign.center,
'" ${widget.evento.description?.trim()} "', '"${widget.evento.description?.trim()}"',
style: const TextStyle( style: const TextStyle(
color: Colors.grey, fontStyle: FontStyle.italic), color: Colors.grey, fontStyle: FontStyle.italic),
), ),
@@ -476,24 +477,11 @@ class _CitaScreenState extends State<CitaScreen> {
// ); // );
// } // }
else { else {
final snackBar = SnackBar( Get.snackbar(
backgroundColor: Colors.blue, 'El profesional aun no ha aceptado tu solicitud',
content: const Text( 'Debes esperar a que el profesional acepte tu solicitud para poder iniciar un chat.',
'El profesional no ha aceptado tu solicitud', snackPosition: SnackPosition.BOTTOM,
style: TextStyle(
color: Colors.white,
fontWeight: FontWeight.bold,
),
),
elevation: 8.0,
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(10.0),
),
); );
ScaffoldMessenger.of(context)
.showSnackBar(snackBar);
} }
}, },
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
lib/src/screens/login/login.dart
+22 -15
View File
@@ -29,6 +29,12 @@ class _LoginScreenState extends State<LoginScreen> {
bool _isChecked = false; bool _isChecked = false;
SettingModel? settings; SettingModel? settings;
void _clearPhoneNumber() {
setState(() {
controller.phoneNo.text = '';
});
}
void _launchURL(String url) async { void _launchURL(String url) async {
if (await canLaunch(url)) { if (await canLaunch(url)) {
await launch(url, forceSafariVC: false, forceWebView: false); await launch(url, forceSafariVC: false, forceWebView: false);
@@ -181,7 +187,7 @@ class _LoginScreenState extends State<LoginScreen> {
phoneNumber: completePhoneNumber.trim(), phoneNumber: completePhoneNumber.trim(),
), ),
); );
completePhoneNumber = ''; _clearPhoneNumber();
Provider.of<UserProvider>(context, listen: false) Provider.of<UserProvider>(context, listen: false)
.initUserProvider(); .initUserProvider();
} }
@@ -190,7 +196,7 @@ class _LoginScreenState extends State<LoginScreen> {
label: 'Enviar código', label: 'Enviar código',
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
const GestureBottom(), GestureBottom(clearPhoneNumber: _clearPhoneNumber),
const SizedBox(height: 20), const SizedBox(height: 20),
const RichTxTBottom(), const RichTxTBottom(),
const SizedBox(height: 20), const SizedBox(height: 20),
@@ -344,29 +350,26 @@ class _LoginScreenState extends State<LoginScreen> {
), ),
), ),
PrimaryButtom( PrimaryButtom(
onPressed: () { onPressed: () async {
if (_formKey.currentState!.validate()) { if (_formKey.currentState!.validate()) {
PhoneAuthController.instance PhoneAuthController.instance.phoneAuthentication(
.phoneAuthentication( completePhoneNumber.trim(),
completePhoneNumber.trim(), );
) await Get.to(
.then((value) => {
Provider.of<UserProvider>(context,
listen: false)
.initUserProvider()
});
Get.to(
() => CodeValidationScreen( () => CodeValidationScreen(
phoneNumber: completePhoneNumber.trim(), phoneNumber: completePhoneNumber.trim(),
), ),
); );
_clearPhoneNumber();
Provider.of<UserProvider>(context, listen: false)
.initUserProvider();
} }
}, },
isEnabled: _isChecked, isEnabled: _isChecked,
label: 'Enviar código', label: 'Enviar código',
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
const GestureBottom(), GestureBottom(clearPhoneNumber: _clearPhoneNumber),
const SizedBox(height: 20), const SizedBox(height: 20),
const RichTxTBottom(), const RichTxTBottom(),
], ],
@@ -381,14 +384,18 @@ class _LoginScreenState extends State<LoginScreen> {
} }
class GestureBottom extends StatelessWidget { class GestureBottom extends StatelessWidget {
const GestureBottom({ final VoidCallback clearPhoneNumber;
GestureBottom({
super.key, super.key,
required this.clearPhoneNumber,
}); });
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return GestureDetector(
onTap: () { onTap: () {
clearPhoneNumber();
Navigator.pushNamed(context, '/login'); Navigator.pushNamed(context, '/login');
}, },
child: const Text( child: const Text(
lib/src/screens/my_services.dart
+4
View File
@@ -159,6 +159,8 @@ class MyServicesScreen extends StatelessWidget {
) )
: event.status == 'pendiente' : event.status == 'pendiente'
? const Column( ? const Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
Icon( Icon(
Icons.access_time_outlined, Icons.access_time_outlined,
@@ -171,6 +173,8 @@ class MyServicesScreen extends StatelessWidget {
) )
: event.status == 'terminado' : event.status == 'terminado'
? const Column( ? const Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [ children: [
Icon( Icon(
Icons.rocket_launch, Icons.rocket_launch,