This commit is contained in:
Felipe
2024-04-05 11:56:45 -05:00
parent f46450e5db
commit e82c7c3afd
18 changed files with 1297 additions and 546 deletions
+1 -1
View File
@@ -350,7 +350,7 @@ class UserCalendarScreenState extends State<UserCalendarScreen> {
),
),
title: Text(
time.format(context),
ScheduleEntity.getFormatTime(time) ?? '',
style: const TextStyle(fontSize: 15, fontWeight: FontWeight.bold),
),
subtitle: const Text(
+286 -139
View File
@@ -1,17 +1,25 @@
import 'dart:async';
import 'dart:developer';
import 'dart:io';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_polyline_points/flutter_polyline_points.dart';
import 'package:geocoding/geocoding.dart';
import 'package:geolocator/geolocator.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:injector/injector.dart';
import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/my_user_bloc/my_user_bloc.dart';
import 'package:prosappco/blocs/professional_list_bloc/professional_list_bloc.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/constansts.dart';
import 'package:prosappco/screens/lists/city_list_screen.dart';
import 'package:prosappco/screens/lists/professional_list_screen.dart';
import 'package:prosappco/screens/user/user_service_screen.dart';
import 'package:prosappco/screens/web/web_view_screen.dart';
import 'package:prosappco/utils/time_of_day_extension.dart';
import 'package:service_repository/service_repository.dart';
import 'package:setting_repository/setting_repository.dart';
@@ -42,13 +50,42 @@ class _UserMapScreenState extends State<UserMapScreen> {
ServiceLocationPreferences? serviceLocationPreference;
UserProfessional? profesionalSeleccionado;
Map<PolylineId, Polyline> polylines = {};
bool isClearButtonVisible = false;
bool isLoading = false;
Set<Marker> markers = {};
BitmapDescriptor? _markerIcon;
@override
void initState() {
super.initState();
_loadSettings();
getLocation();
if (Platform.isAndroid) {
BitmapDescriptor.fromAssetImage(
const ImageConfiguration(size: Size(2, 2)),
'images/pro_marke_android.png',
).then((icon) {
setState(() {
_markerIcon = icon;
});
});
} else {
BitmapDescriptor.fromAssetImage(
const ImageConfiguration(size: Size(1, 1)),
'images/pro_marke.png',
).then((icon) {
setState(() {
_markerIcon = icon;
});
});
}
}
void _loadSettings() {
@@ -63,115 +100,143 @@ class _UserMapScreenState extends State<UserMapScreen> {
Widget build(BuildContext context) {
return BlocProvider<ServiceBloc>(
create: (context) => Injector.appInstance.get<ServiceBloc>(),
child: BlocBuilder<MyUserBloc, MyUserState>(
child: BlocConsumer<ServiceBloc, ServiceState>(
listener: (context, serviceState) {
if (serviceState is CreateServiceLoading) {
isLoading = true;
}
if (serviceState is CreateServiceFailure) {
isLoading = false;
}
if (serviceState is CreateServiceSuccess) {
isLoading = false;
Navigator.push(
context,
CupertinoPageRoute(
builder: (BuildContext context) {
return UserServiceScreen(serviceId: serviceState.serviceId);
},
),
);
}
},
builder: (context, state) {
return Column(
children: [
Expanded(
child: Stack(
children: [
GoogleMap(
myLocationEnabled: true,
// polylines: Set<Polyline>.of(polylines.values),
onMapCreated: (GoogleMapController controller) {
_mapController.complete(controller);
},
onCameraIdle: () {
getLocationName(
coordenadas.latitude, coordenadas.longitude)
.then((value) => setState(() {
_addressController.text = value;
}));
},
onCameraMove: (position) {
if (serviceLocationPreference !=
ServiceLocationPreferences.office) {
coordenadas = position.target;
}
},
initialCameraPosition: const CameraPosition(
target: LatLng(7.1253900, -73.1198000),
zoom: 16,
),
myLocationButtonEnabled: false,
),
Positioned(
top: 10,
left: 0,
child: Builder(
builder: (context) {
return ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Colors.white,
shape: const CircleBorder(),
elevation: 3,
minimumSize: const Size(50, 50),
return BlocBuilder<MyUserBloc, MyUserState>(
builder: (context, myUserState) {
return Column(
children: [
Expanded(
child: Stack(
children: [
GoogleMap(
myLocationEnabled: true,
polylines: Set<Polyline>.of(polylines.values),
onMapCreated: (GoogleMapController controller) {
_mapController.complete(controller);
},
markers: {
...markers,
Marker(
markerId: const MarkerId('currentLocation'),
position: _currentP ?? const LatLng(0, 0),
),
child: const Icon(
Icons.menu,
color: Colors.black,
size: 35,
),
onPressed: () {
Scaffold.of(context).openDrawer();
},
);
},
),
),
const Positioned(
bottom: 30,
right: 0,
left: 0,
top: 0,
child: Icon(
Icons.location_on,
size: 40,
color: Color(0xFFFF0000),
),
),
Positioned(
top: 10,
right: 10,
child: FloatingActionButton(
onPressed: () async {
try {
Position position = await _determinePosition();
if (mounted) {
setState(() {
_currentP = LatLng(
position.latitude,
position.longitude,
);
});
_animateCameraToPosition(_currentP!);
},
onCameraIdle: () {
getLocationName(
coordenadas.latitude, coordenadas.longitude)
.then((value) => setState(() {
_addressController.text = value;
}));
},
onCameraMove: (position) {
if (serviceLocationPreference !=
ServiceLocationPreferences.office) {
coordenadas = position.target;
}
} catch (e) {
ScaffoldMessenger.of(context).clearSnackBars();
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Por favor activa la ubicacion'),
),
);
}
},
elevation: 0,
child: const Icon(
Icons.gps_fixed,
size: 30,
},
initialCameraPosition: const CameraPosition(
target: LatLng(7.1253900, -73.1198000),
zoom: 16,
),
myLocationButtonEnabled: false,
),
),
Positioned(
top: 10,
left: 0,
child: Builder(
builder: (context) {
return ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: Colors.white,
shape: const CircleBorder(),
elevation: 3,
minimumSize: const Size(50, 50),
),
child: const Icon(
Icons.menu,
color: Colors.black,
size: 35,
),
onPressed: () {
Scaffold.of(context).openDrawer();
},
);
},
),
),
const Positioned(
bottom: 30,
right: 0,
left: 0,
top: 0,
child: Icon(
Icons.location_on,
size: 40,
color: Color(0xFFFF0000),
),
),
Positioned(
top: 10,
right: 10,
child: FloatingActionButton(
onPressed: () async {
try {
Position position = await _determinePosition();
setState(() {
_currentP = LatLng(
position.latitude,
position.longitude,
);
});
_animateCameraToPosition(_currentP!);
} catch (e) {
ScaffoldMessenger.of(context).clearSnackBars();
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content:
Text('Por favor activa la ubicacion'),
),
);
}
},
elevation: 0,
child: const Icon(
Icons.gps_fixed,
size: 30,
),
),
),
],
),
],
),
),
BlocListener<ServiceBloc, ServiceState>(
listener: (context, state) {},
child: buildBottom(context, state),
),
],
),
buildBottom(context, myUserState),
],
);
},
);
},
),
@@ -199,6 +264,8 @@ class _UserMapScreenState extends State<UserMapScreen> {
}));
if (datos != null) {
polylines.clear();
fechaSeleccionada = datos[0];
horaSeleccionada = datos[1];
serviceLocationPreference = datos[2];
@@ -220,6 +287,31 @@ class _UserMapScreenState extends State<UserMapScreen> {
profesionalSeleccionado!.professionalInfo.latitude,
profesionalSeleccionado!.professionalInfo.longitude,
);
if (_currentP != null) {
getPolylinePoints(
_currentP!,
LatLng(
profesionalSeleccionado!.professionalInfo.latitude,
profesionalSeleccionado!.professionalInfo.longitude,
)).then(
(coordinates) => {
generatePolyLineFromPoints(coordinates),
},
);
}
markers.add(
Marker(
icon: _markerIcon!,
markerId: MarkerId(
profesionalSeleccionado!.professionalInfo.id),
position: LatLng(
profesionalSeleccionado!.professionalInfo.latitude,
profesionalSeleccionado!.professionalInfo.longitude,
),
),
);
} else {}
isClearButtonVisible = true;
@@ -267,7 +359,7 @@ class _UserMapScreenState extends State<UserMapScreen> {
controller: TextEditingController(
text: horaSeleccionada == null
? ''
: horaSeleccionada!.format(context),
: ScheduleEntity.getFormatTime(horaSeleccionada),
),
decoration: const InputDecoration(
prefixIcon: Icon(Icons.watch_later_outlined),
@@ -278,9 +370,9 @@ class _UserMapScreenState extends State<UserMapScreen> {
],
),
const SizedBox(height: 15),
const TextField(
// controller: _observacionController,
decoration: InputDecoration(
TextField(
controller: _observationController,
decoration: const InputDecoration(
prefixIcon: Icon(Icons.message_outlined),
hintText: 'Observaciones',
),
@@ -293,37 +385,39 @@ class _UserMapScreenState extends State<UserMapScreen> {
children: [
Expanded(
child: FilledButton(
onPressed: () {
if (serviceLocationPreference ==
ServiceLocationPreferences.office) {
context.read<ServiceBloc>().add(
CreateService(
professionalId:
profesionalSeleccionado!.professionalInfo.id,
userId: state.user!.id,
address: profesionalSeleccionado!
.professionalInfo.address,
aditionalAddress: profesionalSeleccionado!
.professionalInfo.address,
latitude: profesionalSeleccionado!
.professionalInfo.latitude,
longitude: profesionalSeleccionado!
.professionalInfo.longitude,
day: fechaSeleccionada.toString(),
createdAt: Timestamp.now(),
description: _observationController.text,
range1Hour1: horaSeleccionada!,
range1Hour2: horaSeleccionada!.add(hour: 2),
rate: '0',
location: serviceLocationPreference!,
),
);
} else if (serviceLocationPreference ==
ServiceLocationPreferences.delivery) {
} else {
// TODO: error inesperado
}
},
onPressed: isLoading
? null
: () {
if (serviceLocationPreference ==
ServiceLocationPreferences.office) {
context.read<ServiceBloc>().add(
CreateService(
professionalId: profesionalSeleccionado!
.professionalInfo.id,
userId: state.user!.id,
address: profesionalSeleccionado!
.professionalInfo.address,
aditionalAddress: profesionalSeleccionado!
.professionalInfo.aditionalAddress,
latitude: profesionalSeleccionado!
.professionalInfo.latitude,
longitude: profesionalSeleccionado!
.professionalInfo.longitude,
day: fechaSeleccionada.toString(),
createdAt: Timestamp.now(),
description: _observationController.text,
range1Hour1: horaSeleccionada!,
range1Hour2: horaSeleccionada!.add(hour: 2),
rate: '0',
location: serviceLocationPreference!,
),
);
} else if (serviceLocationPreference ==
ServiceLocationPreferences.delivery) {
} else {
// TODO: error inesperado
}
},
style: FilledButton.styleFrom(
backgroundColor: Theme.of(context).colorScheme.primary,
padding: const EdgeInsets.symmetric(vertical: 15),
@@ -351,6 +445,9 @@ class _UserMapScreenState extends State<UserMapScreen> {
isClearButtonVisible = false;
_observationController.text = '';
serviceLocationPreference = null;
polylines.clear();
markers.clear();
setState(() {});
},
style: FilledButton.styleFrom(
@@ -387,6 +484,56 @@ class _UserMapScreenState extends State<UserMapScreen> {
);
}
Future<List<LatLng>> getPolylinePoints(
LatLng originP, LatLng destinationP) async {
List<LatLng> polylineCoordinates = [];
PolylinePoints polylinePoints = PolylinePoints();
PolylineResult result = await polylinePoints.getRouteBetweenCoordinates(
GOOGLE_MAPS_API_KEY,
PointLatLng(originP.latitude, originP.longitude),
PointLatLng(destinationP.latitude, destinationP.longitude),
travelMode: TravelMode.driving,
);
if (result.points.isNotEmpty) {
for (var point in result.points) {
polylineCoordinates.add(LatLng(point.latitude, point.longitude));
}
} else {
print(result.errorMessage);
}
return polylineCoordinates;
}
void getLocation() async {
try {
Position position = await _determinePosition();
setState(() {
_currentP = LatLng(
position.latitude,
position.longitude,
);
});
_animateCameraToPosition(_currentP!);
} catch (e) {
log(e.toString());
}
}
void generatePolyLineFromPoints(List<LatLng> polylineCoordinates) async {
PolylineId id = const PolylineId("poly");
Polyline polyline = Polyline(
polylineId: id,
color: Colors.blue,
points: polylineCoordinates,
width: 6,
);
setState(() {
polylines[id] = polyline;
});
}
Future<String> getLocationName(double latitude, double longitude) async {
String address;
List<Placemark> placemarks =
+380
View File
@@ -0,0 +1,380 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:injector/injector.dart';
import 'package:intl/intl.dart';
import 'package:professional_repository/professional_repository.dart';
import 'package:prosappco/blocs/service_bloc/service_bloc.dart';
import 'package:prosappco/components/general_primary_button.dart';
import 'package:service_repository/service_repository.dart';
import 'package:setting_repository/setting_repository.dart';
import 'package:user_repository/user_repository.dart';
class UserServiceScreen extends StatefulWidget {
final String serviceId;
const UserServiceScreen({Key? key, required this.serviceId})
: super(key: key);
@override
State<UserServiceScreen> createState() => _UserServiceScreenState();
}
class _UserServiceScreenState extends State<UserServiceScreen> {
final settingRepository = Injector.appInstance.get<SettingRepository>();
SettingEntity? settings;
@override
void initState() {
super.initState();
_loadSettings();
}
void _loadSettings() {
settingRepository.getSettings().then(
(value) => setState(() {
settings = value;
}),
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Servicio'),
),
body: BlocBuilder<ServiceBloc, ServiceState>(
builder: (context, state) {
if (state is ServiceLoaded) {
final service = state.service;
return FutureBuilder(
future: _getUserAndProfessionalInfo(service),
builder: (BuildContext context,
AsyncSnapshot<List<dynamic>> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(child: CircularProgressIndicator());
} else {
if (snapshot.hasError) {
return Center(
child: Text('Error inesperado: ${snapshot.error}'),
);
} else {
final userInfo = snapshot.data![0] as MyUser;
final professionalInfo =
snapshot.data![1] as ProfessionalEntity;
return Column(
children: [
ListTile(
leading: Container(
width: 60,
height: 60,
decoration: BoxDecoration(
color: Colors.grey.shade300,
shape: BoxShape.circle,
image: userInfo.picture == null
? null
: DecorationImage(
image: NetworkImage(userInfo.picture!),
fit: BoxFit.contain,
),
),
child: userInfo.picture == null
? Icon(
CupertinoIcons.person,
color: Colors.grey.shade400,
size: 40,
)
: null,
),
title: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${userInfo.name}',
style: const TextStyle(
fontWeight: FontWeight.bold),
),
const SizedBox(width: 5),
Text(
'${DateFormat('dd MMMM', 'es').format(DateTime.parse(service.day))} - ${ScheduleEntity.getFormatTime(service.range1Hour1)}',
style: TextStyle(
color: Colors.grey[600],
),
),
],
),
subtitle: const Text('Rating: 5.0'),
),
Container(
margin: const EdgeInsets.only(
left: 40, right: 40, top: 20, bottom: 20),
padding: const EdgeInsets.symmetric(
horizontal: 20, vertical: 15),
decoration: BoxDecoration(
color: const Color(0xFFD6F4FF),
borderRadius: BorderRadius.circular(20),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 1,
blurRadius: 5,
offset: const Offset(1, 3),
),
],
),
child: Row(
children: [
const Icon(
Icons.error_outline,
size: 27,
color: Colors.black54,
),
const SizedBox(width: 15),
service.location ==
ServiceLocationPreferences.delivery
? const Text(
'Servicio a su domicilio.',
style: TextStyle(
color: Colors.black, fontSize: 14),
)
: const Text(
'Servicio en sitio / consultorio',
style: TextStyle(
color: Colors.black, fontSize: 14),
),
],
),
),
Visibility(
visible: settings?.tarifas ?? false,
child: Column(
children: [
Text(
formatCurrency(int.tryParse(service.rate) ?? 0),
style: const TextStyle(
fontWeight: FontWeight.w600, fontSize: 25),
),
const Text('Tarifa de consulta'),
const SizedBox(height: 15),
const Text(
'Metodos de pago',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
professionalInfo.paymentMethods.datafono ||
professionalInfo.paymentMethods.nequi ||
professionalInfo
.paymentMethods.transferencia
? Wrap(
spacing: 8,
runSpacing: 8,
alignment: WrapAlignment.center,
children: [
Visibility(
visible: professionalInfo
.paymentMethods.datafono,
child: const Chip(
label: Text('Datafono')),
),
Visibility(
visible: professionalInfo
.paymentMethods.nequi,
child:
const Chip(label: Text('Nequi')),
),
Visibility(
visible: professionalInfo
.paymentMethods.transferencia,
child: const Chip(
label: Text(
'Transferencia Bancaria')),
),
],
)
: const Text(
'No hay metodos de pago registrados',
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 15,
color: Colors.black45,
),
),
],
),
),
ListTile(
leading: const Icon(Icons.near_me),
title: Text(
service.address,
style: TextStyle(
fontSize: 15, color: Colors.grey[600]),
),
subtitle: service.aditionalAddress.isEmpty
? null
: Text(
service.aditionalAddress,
style: TextStyle(
fontSize: 15, color: Colors.grey[600]),
),
),
service.description.isEmpty
? const SizedBox()
: SizedBox(
width: MediaQuery.of(context).size.width * 0.8,
child: Text(
'"${service.description.trim()}"',
style: TextStyle(
color: Colors.grey[600],
fontStyle: FontStyle.italic,
),
),
),
Expanded(
child: customMessageStatus(service),
),
customButton(service, context),
const SizedBox(height: 20),
],
);
}
}
},
);
} else {
BlocProvider.of<ServiceBloc>(context)
.add(LoadService(widget.serviceId));
return const Center(
child: CircularProgressIndicator(),
);
}
},
),
);
}
Center customMessageStatus(ServiceEntity service) {
if (service.status == ServiceStatus.cancelled) {
return const Center(
child: Column(
children: [
Padding(
padding: EdgeInsets.symmetric(vertical: 20),
child: Icon(
CupertinoIcons.xmark_circle,
color: Color(0xFF35A8ED),
size: 70,
),
),
Text(
'Servicio cancelado exitosamente',
style: TextStyle(
color: Color(0xFF35A8ED),
fontSize: 17,
fontWeight: FontWeight.w600,
),
),
],
),
);
}
if (service.status == ServiceStatus.completed) {
return const Center(
child: Column(
children: [
Padding(
padding: EdgeInsets.symmetric(vertical: 20),
child: Icon(
Icons.favorite_outline_sharp,
color: Color(0xFF35A8ED),
size: 70,
),
),
Text(
'Servicio terminado exitosamente',
style: TextStyle(
color: Color(0xFF35A8ED),
fontSize: 17,
fontWeight: FontWeight.w600,
),
),
],
),
);
}
return const Center(
child: Column(
children: [
Padding(
padding: EdgeInsets.symmetric(vertical: 20),
child: Icon(
Icons.check_circle_outline_rounded,
color: Color(0xFF35A8ED),
size: 70,
),
),
Text(
'Servicio solicitado exitosamente',
style: TextStyle(
color: Color(0xFF35A8ED),
fontSize: 17,
fontWeight: FontWeight.w600,
),
),
],
),
);
}
GeneralPrimaryButton customButton(
ServiceEntity service, BuildContext context) {
if (service.status == ServiceStatus.pending) {
return GeneralPrimaryButton(
onPressed: () {
final currentState = context.read<ServiceBloc>().state;
if (currentState is ServiceLoaded) {
context.read<ServiceBloc>().add(
UpdateServiceStatus(
widget.serviceId,
ServiceStatus.cancelled,
),
);
}
},
color: Colors.red,
label: 'Cancelar Servicio',
);
}
return GeneralPrimaryButton(
onPressed: () {
Navigator.pop(context);
},
label: 'Volver',
);
}
String formatCurrency(int number) {
final formatter =
NumberFormat.currency(locale: 'es_CO', decimalDigits: 0, symbol: '');
return '\$${formatter.format(number)}';
}
Future<List<dynamic>> _getUserAndProfessionalInfo(
ServiceEntity service) async {
final userRepo = FirebaseUserRepository(FirebaseAuth.instance);
final userInfo = await userRepo.getMyUser(service.professionalId);
final professionalRepo = FirebaseProfessionalRepository();
final professionalInfo =
await professionalRepo.getProInfo(service.professionalId);
return [userInfo, professionalInfo];
}
}