diff --git a/lib/blocs/service_bloc/service_bloc.dart b/lib/blocs/service_bloc/service_bloc.dart index dda31cf..72ce225 100644 --- a/lib/blocs/service_bloc/service_bloc.dart +++ b/lib/blocs/service_bloc/service_bloc.dart @@ -243,8 +243,7 @@ class ServiceBloc extends Bloc { } final userIds = services.map((e) => e.userId); - final List users = - await _userRepository.getUsersFromIds(userIds); + final List users = await _userRepository.getUsersFromIds(userIds); final usersDir = {for (var e in users) e.id: e}; diff --git a/lib/components/general_drawer.dart b/lib/components/general_drawer.dart index 18fff28..f00977d 100644 --- a/lib/components/general_drawer.dart +++ b/lib/components/general_drawer.dart @@ -205,17 +205,12 @@ class GeneralDrawer extends StatelessWidget { onTap: () { Navigator.pop(context); }, - trailing: shouldProModeActive( - context, professionalState) - ? FutureBuilder( - builder: (context, - AsyncSnapshot snapshot) { - if (!snapshot.hasData || - snapshot.data! < 1) { + trailing: shouldProModeActive(context, professionalState) + ? FutureBuilder(builder: (context, AsyncSnapshot snapshot) { + if (!snapshot.hasData || snapshot.data! < 1) { return const SizedBox(); } - final int notificationCount = - snapshot.data!; + final int notificationCount = snapshot.data!; return Container( padding: const EdgeInsets.symmetric( horizontal: 8, @@ -223,14 +218,12 @@ class GeneralDrawer extends StatelessWidget { ), decoration: BoxDecoration( color: Colors.red, - borderRadius: - BorderRadius.circular(12), + borderRadius: BorderRadius.circular(12), ), child: Text( notificationCount > 9 ? '+9' - : notificationCount - .toString(), + : notificationCount.toString(), style: const TextStyle( color: Colors.white, fontSize: 14, @@ -242,8 +235,7 @@ class GeneralDrawer extends StatelessWidget { future: Injector.appInstance .get() .countPendingServicesForProfessional( - FirebaseAuth - .instance.currentUser!.uid), + FirebaseAuth.instance.currentUser!.uid), ) : const Icon( Icons.keyboard_arrow_right, @@ -251,8 +243,7 @@ class GeneralDrawer extends StatelessWidget { size: 25, ), title: Text( - shouldProModeActive( - context, professionalState) + shouldProModeActive(context, professionalState) ? 'Solicitudes' : 'Solicitar servicio', style: const TextStyle( @@ -278,11 +269,8 @@ class GeneralDrawer extends StatelessWidget { return ListTile( onTap: () { - final isProModeActive = (professionalState - is LoadedModeProState) && - professionalState.isProModeActive; - isProModeActive - ? Navigator.push(context, + final isProModeActive = (professionalState is LoadedModeProState) && professionalState.isProModeActive; + isProModeActive ? Navigator.push(context, CupertinoPageRoute( builder: (context) { return const ProfessionalScoreListScreen(); @@ -390,17 +378,11 @@ class GeneralDrawer extends StatelessWidget { if (myUserState.status == MyUserStatus.success) { final user = myUserState.user!; - if (user.name != null && - user.email != null && - user.city != null && - user.phone != null) { + if (user.name != null && user.email != null && user.city != null && user.phone != null) { switch (user.proState) { - case ProState.active: - Navigator.pop(context); + case ProState.active: Navigator.pop(context); - context - .read() - .add(const SwitchProModeEvent()); + context.read().add(const SwitchProModeEvent()); break; case ProState.inactive: @@ -415,8 +397,7 @@ class GeneralDrawer extends StatelessWidget { Navigator.push( context, CupertinoPageRoute( - builder: (context) => - const ProfessionalPendingScreen(), + builder: (context) => const ProfessionalPendingScreen(), ), ); break; @@ -424,8 +405,7 @@ class GeneralDrawer extends StatelessWidget { Navigator.push( context, CupertinoPageRoute( - builder: (context) => - const ProfessionalDeniedScreen(), + builder: (context) => const ProfessionalDeniedScreen(), ), ); break; diff --git a/lib/screens/lists/professional_pending_service_list.dart b/lib/screens/lists/professional_pending_service_list.dart index 88e3bf2..a4a94cb 100644 --- a/lib/screens/lists/professional_pending_service_list.dart +++ b/lib/screens/lists/professional_pending_service_list.dart @@ -28,8 +28,7 @@ class _ProfessionalPendingServiceListScreenState serviceBloc = Injector.appInstance.get(); - serviceBloc.add(LoadPendingServicesForProfessional( - FirebaseAuth.instance.currentUser!.uid)); + serviceBloc.add(LoadPendingServicesForProfessional(FirebaseAuth.instance.currentUser!.uid)); } @override diff --git a/lib/screens/lists/user_service_list_screen.dart b/lib/screens/lists/user_service_list_screen.dart index be262ef..782a9d0 100644 --- a/lib/screens/lists/user_service_list_screen.dart +++ b/lib/screens/lists/user_service_list_screen.dart @@ -26,7 +26,8 @@ class _UserServiceListScreenState extends State { serviceBloc = Injector.appInstance.get(); - serviceBloc.add(LoadServicesForUser(FirebaseAuth.instance.currentUser!.uid)); + serviceBloc + .add(LoadServicesForUser(FirebaseAuth.instance.currentUser!.uid)); } @override @@ -127,10 +128,12 @@ class _UserServiceListScreenState extends State { customStatus(service), ], ), - Text( - '"${service.description.trim()}"', - overflow: TextOverflow.ellipsis, - ), + service.description.isEmpty + ? Container() + : Text( + '"${service.description.trim()}"', + overflow: TextOverflow.ellipsis, + ), ], ), ), diff --git a/lib/screens/service/user_service_screen.dart b/lib/screens/service/user_service_screen.dart index 3ca5a76..5922cf8 100644 --- a/lib/screens/service/user_service_screen.dart +++ b/lib/screens/service/user_service_screen.dart @@ -46,6 +46,12 @@ class _UserServiceScreenState extends State { super.dispose(); } + void _startTimer() { + _timer = Timer.periodic(const Duration(minutes: 5), (timer) { + setState(() {}); + }); + } + void _loadSettings() { settingRepository.getSettings().then( (value) => setState(() { @@ -54,12 +60,6 @@ class _UserServiceScreenState extends State { ); } - void _startTimer() { - _timer = Timer.periodic(const Duration(minutes: 5), (timer) { - setState(() {}); - }); - } - @override Widget build(BuildContext context) { return BlocProvider( diff --git a/lib/screens/user/user_service_screen.dart b/lib/screens/user/user_service_screen.dart index 256ba2e..03f3da0 100644 --- a/lib/screens/user/user_service_screen.dart +++ b/lib/screens/user/user_service_screen.dart @@ -16,8 +16,7 @@ import 'package:user_repository/user_repository.dart'; class UserServiceScreen extends StatefulWidget { final String serviceId; - const UserServiceScreen({Key? key, required this.serviceId}) - : super(key: key); + const UserServiceScreen({super.key, required this.serviceId}); @override State createState() => _UserServiceScreenState(); diff --git a/packages/service_repository/lib/src/repositories/firebase_service_repository.dart b/packages/service_repository/lib/src/repositories/firebase_service_repository.dart index 20bc662..f23ddd6 100644 --- a/packages/service_repository/lib/src/repositories/firebase_service_repository.dart +++ b/packages/service_repository/lib/src/repositories/firebase_service_repository.dart @@ -5,7 +5,8 @@ class FirebaseServiceRepository { final serviceCollection = FirebaseFirestore.instance.collection('services'); Future createService(ServiceEntity entity) async { - DocumentReference> docRef = await serviceCollection.add(entity.toDocument()); + DocumentReference> docRef = + await serviceCollection.add(entity.toDocument()); return docRef.id; } @@ -79,8 +80,7 @@ class FirebaseServiceRepository { .toList()); } - Stream> getPendingServicesForProfessional( - String professionalId) { + Stream> getPendingServicesForProfessional(String professionalId) { return serviceCollection .where('professional_id', isEqualTo: professionalId) .where('status', whereIn: [0])