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