diff --git a/android/build.gradle b/android/build.gradle index 29438cf..c6577ca 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '1.9.0' repositories { google() mavenCentral() diff --git a/lib/main.dart b/lib/main.dart index ca34cc4..a624f57 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -28,6 +28,7 @@ import 'firebase_options.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; import 'package:flutter/foundation.dart' show kIsWeb; import 'package:provider/provider.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; Future _firebaseMessagingBackgroundHandler(RemoteMessage message) async { await Firebase.initializeApp(); @@ -91,6 +92,14 @@ class MyApp extends StatelessWidget { child: GetMaterialApp( theme: ThemeData(fontFamily: 'Poppins'), debugShowCheckedModeBanner: false, + localizationsDelegates: const [ + GlobalMaterialLocalizations.delegate, + GlobalWidgetsLocalizations.delegate, + GlobalCupertinoLocalizations.delegate, + ], + supportedLocales: const [ + Locale('es'), // Spanish + ], title: 'ProsApp', initialRoute: '/', routes: { diff --git a/lib/src/components/drawer_menu.dart b/lib/src/components/drawer_menu.dart index 09e342f..789b1ae 100644 --- a/lib/src/components/drawer_menu.dart +++ b/lib/src/components/drawer_menu.dart @@ -90,7 +90,6 @@ class DrawerMenu extends StatelessWidget { ), ListTile( onTap: () { - Navigator.pop(context); if (kIsWeb) { Navigator.push( context, @@ -406,7 +405,6 @@ class DrawerMenu extends StatelessWidget { ListTile infoUser(BuildContext context, UserModel? user) { return ListTile( onTap: () { - Navigator.pop(context); if (kIsWeb) { Navigator.push( context, diff --git a/lib/src/screens/cita.dart b/lib/src/screens/cita.dart index fa7ffee..d334bad 100644 --- a/lib/src/screens/cita.dart +++ b/lib/src/screens/cita.dart @@ -187,27 +187,25 @@ class _CitaScreenState extends State { sizeCircle: 50, sizeIcon: 35, ), - title: RichText( - text: TextSpan( - children: [ - TextSpan( - text: '$nombre, ', - style: const TextStyle( - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 16, - ), + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + nombre, + style: const TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 16, ), - TextSpan( - text: - '${DateFormat('dd MMM', 'es').format(DateTime.parse(widget.evento.day))} ${TimeOfDay.fromDateTime(DateTime.parse(widget.evento.range1Hour1)).format(context)}', - style: const TextStyle( - color: Colors.grey, - fontSize: 16, - ), + ), + Text( + '${DateFormat('dd MMMM', 'es').format(DateTime.parse(widget.evento.day))} ${DateFormat('h:mm a').format(DateTime.parse(widget.evento.range1Hour1))}', + style: const TextStyle( + color: Colors.grey, + fontSize: 16, ), - ], - ), + ) + ], ), subtitle: Row( children: [ diff --git a/lib/src/screens/my_services.dart b/lib/src/screens/my_services.dart index 3fec83f..a14ec99 100644 --- a/lib/src/screens/my_services.dart +++ b/lib/src/screens/my_services.dart @@ -10,21 +10,12 @@ import 'package:prosappco/src/models/event_model.dart'; import 'package:prosappco/src/models/scores_model.dart'; import 'package:prosappco/src/screens/cita.dart'; -class MyServicesScreen extends StatefulWidget { +class MyServicesScreen extends StatelessWidget { MyServicesScreen({super.key}); - @override - State createState() => _MyServicesScreenState(); -} - -class _MyServicesScreenState extends State { DateTime today = DateTime.now(); - final uid = AuthenticationRepository.instance.getCurrentUserUid(); - @override - void initState() { - super.initState(); - } + final uid = AuthenticationRepository.instance.getCurrentUserUid(); @override Widget build(BuildContext context) { @@ -119,7 +110,6 @@ class _MyServicesScreenState extends State { if (profSnapshot.hasError) { return const Text( 'Error al obtener los datos del profesional', - // Aquí puedes agregar un estilo de texto apropiado ); } @@ -142,55 +132,89 @@ class _MyServicesScreenState extends State { ); }, leading: event.status == 'aprobado' - ? const Icon( - Icons.check, - color: Colors.blue, - size: 40, + ? const Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.check, + color: Colors.blue, + size: 30, + ), + Text('Aceptado', + style: TextStyle(fontSize: 12)), + ], ) : event.status == 'iniciado' - ? const Icon( - Icons.access_time, - color: Colors.blue, - size: 40, + ? const Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.access_time, + color: Colors.blue, + size: 30, + ), + Text('Iniciado', + style: TextStyle(fontSize: 12)), + ], ) : event.status == 'pendiente' - ? const Icon( - Icons.access_time_outlined, - color: Colors.blue, - size: 40, + ? const Column( + children: [ + Icon( + Icons.access_time_outlined, + color: Colors.blue, + size: 30, + ), + Text('Pendiente', + style: TextStyle(fontSize: 12)), + ], ) : event.status == 'terminado' - ? const Icon( - Icons.rocket_launch, - color: Colors.blue, - size: 40, + ? const Column( + children: [ + Icon( + Icons.rocket_launch, + color: Colors.blue, + size: 30, + ), + Text('Finalizado', + style: + TextStyle(fontSize: 12)), + ], ) - : const Icon( - Icons.close, - color: Colors.red, - size: 40, + : const Column( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Icon( + Icons.close, + color: Colors.red, + size: 30, + ), + Text('Cancelado', + style: + TextStyle(fontSize: 12)), + ], ), - title: RichText( - text: TextSpan( - children: [ - TextSpan( - text: '${professionalName}, ', - style: const TextStyle( - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 16, - ), + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + '$professionalName', + style: const TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 16, ), - TextSpan( - text: - '${DateFormat('dd MMM', 'es').format(DateTime.parse(event.day))} - ${TimeOfDay.fromDateTime(DateTime.parse(event.range1Hour1)).format(context)}', - style: TextStyle( - color: Colors.grey[600], - fontSize: 16, - ), + ), + Text( + '${DateFormat('dd MMMM', 'es').format(DateTime.parse(event.day))} - ${DateFormat('h:mm a').format(DateTime.parse(event.range1Hour1))}', + style: TextStyle( + color: Colors.grey[600], + fontSize: 16, ), - ], - ), + ), + ], ), subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -221,13 +245,18 @@ class _MyServicesScreenState extends State { ], ), Text( - '" ${event.description}"', + '"${event.description}"', style: const TextStyle(fontStyle: FontStyle.italic), ), ], ), - trailing: const Icon(Icons.keyboard_arrow_right), + trailing: const Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Icon(Icons.keyboard_arrow_right), + ], + ), ); }, ), diff --git a/lib/src/screens/my_services_pro.dart b/lib/src/screens/my_services_pro.dart index c31fb89..a8094f1 100644 --- a/lib/src/screens/my_services_pro.dart +++ b/lib/src/screens/my_services_pro.dart @@ -44,8 +44,12 @@ class MyServicesProScreen extends StatelessWidget { stream: FirebaseFirestore.instance .collection('services') .where('professional_id', isEqualTo: uid) - .where('status', - whereIn: ['aprobado', 'denegado', 'iniciado', 'terminado']) + .where('status', whereIn: [ + 'aprobado', + 'denegado', + 'iniciado', + 'terminado', + ]) .snapshots() .asyncMap((snapshot) async { try { @@ -116,43 +120,61 @@ class MyServicesProScreen extends StatelessWidget { ], ) : event.status == 'iniciado' - ? const Icon( - Icons.access_time, - color: Colors.blue, - size: 40, + ? const Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.access_time, + color: Colors.blue, + size: 30, + ), + Text('Iniciado', style: TextStyle(fontSize: 12)), + ], ) : event.status == 'terminado' - ? const Icon( - Icons.rocket_launch, - color: Colors.blue, - size: 40, + ? const Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.rocket_launch, + color: Colors.blue, + size: 30, + ), + Text('Finalizado', + style: TextStyle(fontSize: 12)), + ], ) - : const Icon( - Icons.close, - color: Colors.red, - size: 40, + : const Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + Icons.close, + color: Colors.red, + size: 30, + ), + Text('Cancelado', + style: TextStyle(fontSize: 12)), + ], ), - title: RichText( - text: TextSpan( - children: [ - TextSpan( - text: '${event.title}, ', - style: const TextStyle( - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 16, - ), + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + event.title, + style: const TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 16, ), - TextSpan( - text: - '${DateFormat('dd MMM', 'es').format(DateTime.parse(event.day))} - ${TimeOfDay.fromDateTime(DateTime.parse(event.range1Hour1)).format(context)}', - style: TextStyle( - color: Colors.grey[600], - fontSize: 16, - ), + ), + Text( + '${DateFormat('dd MMMM', 'es').format(DateTime.parse(event.day))} - ${DateFormat('h:mm a').format(DateTime.parse(event.range1Hour1))}', + style: TextStyle( + color: Colors.grey[600], + fontSize: 16, ), - ], - ), + ), + ], ), subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -182,12 +204,17 @@ class MyServicesProScreen extends StatelessWidget { ], ), Text( - '" ${event.description}"', + '"${event.description}"', style: const TextStyle(fontStyle: FontStyle.italic), ), ], ), - trailing: const Icon(Icons.keyboard_arrow_right), + trailing: const Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Icon(Icons.keyboard_arrow_right), + ], + ), ), ), ], diff --git a/lib/src/screens/service.dart b/lib/src/screens/service.dart index 2fac5f6..59e2e94 100644 --- a/lib/src/screens/service.dart +++ b/lib/src/screens/service.dart @@ -168,11 +168,8 @@ class _ServiceScreenState extends State { final TimeOfDay? pickedTime = await showTimePicker( context: context, initialTime: TimeOfDay.now(), - - // builder: (context, child) { - // return Theme(data: ThemeData.dark(), child: child!); - // }, ); + if (pickedTime != null) { setState(() { _selectedTime = pickedTime; diff --git a/lib/src/screens/service_after.dart b/lib/src/screens/service_after.dart index 3373c66..6cade80 100644 --- a/lib/src/screens/service_after.dart +++ b/lib/src/screens/service_after.dart @@ -84,38 +84,25 @@ class _ServiceAfterScreenState extends State { size: 55, sizeCircle: 60, ), - title: RichText( - text: TextSpan( - children: [ - TextSpan( - text: '${user?.name}, ', - style: const TextStyle( - color: Colors.black, - fontWeight: FontWeight.w500, - fontSize: 16, - ), + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + '${user?.name}', + style: const TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 16, ), - TextSpan( - text: DateFormat('dd MMM', 'es').format(DateTime.parse( - evento?.day ?? '2023-01-01 00:00:00.000Z')), - style: const TextStyle( - color: Colors.grey, - fontSize: 16, - ), + ), + Text( + '${DateFormat('dd MMMM', 'es').format(DateTime.parse(evento?.day ?? '2023-01-01 00:00:00.000Z'))} ${evento?.range1Hour1 != null ? DateFormat('h:mm a').format(DateTime.parse(evento!.range1Hour1)) : ''}', + style: TextStyle( + color: Colors.grey[600], + fontSize: 16, ), - TextSpan( - text: evento?.range1Hour1 != null - ? TimeOfDay.fromDateTime( - DateTime.parse(evento!.range1Hour1)) - .format(context) - : '', - style: const TextStyle( - color: Colors.grey, - fontSize: 16, - ), - ), - ], - ), + ), + ], ), subtitle: Column( children: [ @@ -200,7 +187,7 @@ class _ServiceAfterScreenState extends State { ), ), Text( - '" ${evento?.description} "', + '"${evento?.description}"', style: TextStyle(color: Colors.grey[600], fontStyle: FontStyle.italic), ), diff --git a/lib/src/screens/solicitudes.dart b/lib/src/screens/solicitudes.dart index a3851aa..683b848 100644 --- a/lib/src/screens/solicitudes.dart +++ b/lib/src/screens/solicitudes.dart @@ -100,32 +100,56 @@ class SolicitudScreen extends StatelessWidget { ), ); }, - leading: Text( - TimeOfDay.fromDateTime(DateTime.parse(event.range1Hour1)) - .format(context), + leading: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text(DateFormat('h:mm a') + .format(DateTime.parse(event.range1Hour1))), + ], ), - title: RichText( - text: TextSpan( - children: [ - TextSpan( - text: '${event.title}, ', - style: const TextStyle( - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 16, - ), + title: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + event.title, + style: const TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 16, ), - TextSpan( - text: DateFormat('dd MMM', 'es') - .format(DateTime.parse(event.day)), - style: const TextStyle( - color: Colors.grey, - fontSize: 16, - ), + ), + Text( + '${DateFormat('dd MMMM', 'es').format(DateTime.parse(event.day))} - ${DateFormat('h:mm a').format(DateTime.parse(event.range1Hour1))}', + style: const TextStyle( + color: Colors.grey, + fontSize: 16, ), - ], - ), + ) + ], ), + + // RichText( + // text: TextSpan( + // children: [ + // TextSpan( + // text: '${event.title}, ', + // style: const TextStyle( + // color: Colors.black, + // fontWeight: FontWeight.bold, + // fontSize: 16, + // ), + // ), + // TextSpan( + // text: DateFormat('dd MMM', 'es') + // .format(DateTime.parse(event.day)), + // style: const TextStyle( + // color: Colors.grey, + // fontSize: 16, + // ), + // ), + // ], + // ), + // ), subtitle: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -154,7 +178,7 @@ class SolicitudScreen extends StatelessWidget { ], ), Text( - '" ${event.description}"', + '"${event.description}"', style: const TextStyle(fontStyle: FontStyle.italic), ), ], diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 819a643..d8a4062 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -7,7 +7,6 @@ #include "generated_plugin_registrant.h" #include -#include #include #include @@ -15,9 +14,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) audioplayers_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "AudioplayersLinuxPlugin"); audioplayers_linux_plugin_register_with_registrar(audioplayers_linux_registrar); - g_autoptr(FlPluginRegistrar) awesome_notifications_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "AwesomeNotificationsPlugin"); - awesome_notifications_plugin_register_with_registrar(awesome_notifications_registrar); g_autoptr(FlPluginRegistrar) file_selector_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin"); file_selector_plugin_register_with_registrar(file_selector_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 03c86af..04f81f4 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST audioplayers_linux - awesome_notifications file_selector_linux url_launcher_linux ) diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index fe2e8f9..cb7913d 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,7 +6,6 @@ import FlutterMacOS import Foundation import audioplayers_darwin -import awesome_notifications import cloud_firestore import file_selector_macos import firebase_auth @@ -22,7 +21,6 @@ import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AudioplayersDarwinPlugin.register(with: registry.registrar(forPlugin: "AudioplayersDarwinPlugin")) - AwesomeNotificationsPlugin.register(with: registry.registrar(forPlugin: "AwesomeNotificationsPlugin")) FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin")) FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin")) diff --git a/pubspec.lock b/pubspec.lock index dbf9985..5d45359 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: _flutterfire_internals - sha256: "7bcb5c5d62b3907fb4a269c0f0843df46760d38e12829a715f2ff1fb492f19ef" + sha256: "5dadadeecceac19d6a63c9d2e037bb8df58ddd4aedb94e8a056af2f39ee50f9d" url: "https://pub.dev" source: hosted - version: "1.3.10" + version: "1.3.11" analyzer: dependency: transitive description: @@ -105,14 +105,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" - awesome_notifications: - dependency: "direct main" - description: - name: awesome_notifications - sha256: "65f730f9c0e73a346039ef746384bcff1773f9f03821b859705a7ab8db977b23" - url: "https://pub.dev" - source: hosted - version: "0.8.2" boolean_selector: dependency: transitive description: @@ -149,26 +141,26 @@ packages: dependency: "direct main" description: name: cloud_firestore - sha256: "7dd7e9505e4e895c87e7bc0c4cf49a2c0b0255fae900ab7fcac3c5daa9f422d5" + sha256: "3ee12bfde22251a91e46bcb86e5ebe3f35006b8f6ed7fd5a5526cfa188ce68e9" url: "https://pub.dev" source: hosted - version: "4.12.0" + version: "4.12.2" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface - sha256: f1a9436bc0d7f49e60df33b5eb872772733646d4f211516220a1f6006c8177f5 + sha256: ed65b9d615d70c5b921e7f028ddab9b06c627d52a58d65fd84c3181f23cc9171 url: "https://pub.dev" source: hosted - version: "6.0.2" + version: "6.0.3" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web - sha256: "8df1e484d57f771242c2d8b3a534b921dfb0ba144a1cd441f23b1c7c4f33c3a1" + sha256: "17fbdc86611ed8ae414e65de7f45b19a7a2f70ce3cf9a9370ffed68844a73156" url: "https://pub.dev" source: hosted - version: "3.8.2" + version: "3.8.3" collection: dependency: transitive description: @@ -309,34 +301,34 @@ packages: dependency: "direct main" description: name: firebase_auth - sha256: ee5e4f6e79483d1b39e2fe81cdef74f4c295c9865e150aefacd615eea96d3e7b + sha256: "738c4225bf8e766750423abcaeab1dc45f1bdb8975e2b32b69d561350b124685" url: "https://pub.dev" source: hosted - version: "4.12.0" + version: "4.12.1" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface - sha256: a664a8f1dbf73e6a56fd41364bcd0ad24f8d9d57428b365199dc795ee52b7d27 + sha256: "40f759021591e3ce5741e981ae7488903dd31cab59aa19a663a8255511d58f95" url: "https://pub.dev" source: hosted - version: "7.0.2" + version: "7.0.3" firebase_auth_web: dependency: transitive description: name: firebase_auth_web - sha256: "6a3c8c09c9ffcfea83ac4ce3d18d8b4c467c77d57713b2d786fd69ece5bb4a48" + sha256: e068327d62503c32e2b3fbcc27991f6d8a687e2fdb60e9ad865835208b2a29ed url: "https://pub.dev" source: hosted - version: "5.8.5" + version: "5.8.6" firebase_core: dependency: "direct main" description: name: firebase_core - sha256: "37299e4907391d7fac8c7ea059bb3292768cc07b72b6c6c777675cc58da2ef4d" + sha256: "7706f4ade6cc2698c70074083bc262586a185047f6bfdd53938dcc35d35cbb9e" url: "https://pub.dev" source: hosted - version: "2.20.0" + version: "2.21.0" firebase_core_platform_interface: dependency: transitive description: @@ -357,50 +349,50 @@ packages: dependency: "direct main" description: name: firebase_messaging - sha256: d7b6f9c394f8575598fa94e67220cdd2097a0bc28ce20a3ef2db2da94ede5b47 + sha256: "53952a6f7860c44429bec80719c411e0ff77ce6cf31fade1515c7bdd87abe4a1" url: "https://pub.dev" source: hosted - version: "14.7.2" + version: "14.7.3" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - sha256: "825356880eb94bf16ea7ef6a71384d2c32cc88143b54ecffed8b3987f7178854" + sha256: "543390d1c76aaf3fa563de223d1732a5def5a5efe31428e43a44e9a47efc5ed3" url: "https://pub.dev" source: hosted - version: "4.5.11" + version: "4.5.12" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - sha256: "9c82e55c4b470970c77a99c90733adff6be7d5a67251007727b2a98d4f04e0cd" + sha256: ecfe4e851652dc5f40f1e42efcac0c2bc6bf5ef08faca936c94e1472c247d222 url: "https://pub.dev" source: hosted - version: "3.5.11" + version: "3.5.12" firebase_storage: dependency: "direct main" description: name: firebase_storage - sha256: c00e907fe1a136a662c47d60faf971094a5441095438c065f66c2f39dff47a9a + sha256: "4cce7efd856dfb98b0e0ffe3ee22039133f940e3a3cb00bfa7ce42bfebc17311" url: "https://pub.dev" source: hosted - version: "11.4.0" + version: "11.4.1" firebase_storage_platform_interface: dependency: transitive description: name: firebase_storage_platform_interface - sha256: "387f903eb7cbe63e77197e73987c84201335c42250b7284580e3bac42ffd9dd4" + sha256: f8cd0343fbf0b53fd5d85172cdb3311206bf71500d538e29941f440cc034a0aa url: "https://pub.dev" source: hosted - version: "5.0.0" + version: "5.0.1" firebase_storage_web: dependency: transitive description: name: firebase_storage_web - sha256: "6128bfd8e03418983d457b980bf4fcc73e1fc88f51d00b3e04db8376a41d3047" + sha256: ea654cf19e2cb60acfd90e3f439aedbb36852b37b0c4521fbbd8569c80d65624 url: "https://pub.dev" source: hosted - version: "3.6.11" + version: "3.6.12" flutter: dependency: "direct main" description: flutter @@ -462,6 +454,11 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0+1" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" flutter_otp_text_field: dependency: "direct main" description: @@ -628,10 +625,10 @@ packages: dependency: transitive description: name: google_maps_flutter_android - sha256: "1a4375d0ed0e36af4a2c7a7cd97ec8c423b40bff6c4270face40d2c1cba6c8af" + sha256: "4023e79184c762e63efe04da629d876085e0c296a7ca26745fb5750d4acd0aa2" url: "https://pub.dev" source: hosted - version: "2.5.2" + version: "2.5.3" google_maps_flutter_ios: dependency: transitive description: @@ -748,10 +745,10 @@ packages: dependency: transitive description: name: image_picker_ios - sha256: c5538cacefacac733c724be7484377923b476216ad1ead35a0d2eadcdc0fc497 + sha256: "76ec722aeea419d03aa915c2c96bf5b47214b053899088c9abb4086ceecf97a7" url: "https://pub.dev" source: hosted - version: "0.8.8+2" + version: "0.8.8+4" image_picker_linux: dependency: transitive description: @@ -788,10 +785,10 @@ packages: dependency: "direct main" description: name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6 url: "https://pub.dev" source: hosted - version: "0.18.1" + version: "0.18.0" intl_phone_field: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index a615490..732839c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -30,14 +30,11 @@ environment: dependencies: flutter: sdk: flutter + intl: any + flutter_localizations: + sdk: flutter shared_preferences: ^2.0.10 - - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 - - # Google Sign In firebase_auth: ^4.6.2 firebase_core: ^2.13.1 file_picker: ^5.3.2 @@ -54,7 +51,6 @@ dependencies: flutter_animate: flutter_rating_bar: table_calendar: - intl: google_maps_flutter: ^2.2.5 http: ^0.13.5 geolocator: ^9.0.2 @@ -71,7 +67,6 @@ dependencies: firebase_messaging: ^14.6.3 audioplayers: ^4.1.0 animated_splash_screen: ^1.3.0 - awesome_notifications: ^0.8.2 dev_dependencies: flutter_test: diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index c7e1b6d..92f5f6b 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -7,7 +7,6 @@ #include "generated_plugin_registrant.h" #include -#include #include #include #include @@ -19,8 +18,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { AudioplayersWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin")); - AwesomeNotificationsPluginCApiRegisterWithRegistrar( - registry->GetRegistrarForPlugin("AwesomeNotificationsPluginCApi")); CloudFirestorePluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("CloudFirestorePluginCApi")); FileSelectorWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 9846441..aec5e54 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -4,7 +4,6 @@ list(APPEND FLUTTER_PLUGIN_LIST audioplayers_windows - awesome_notifications cloud_firestore file_selector_windows firebase_auth