diff --git a/lib/app.dart b/lib/app.dart index 2817b2c..072e52e 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -6,7 +6,6 @@ import 'package:prosappco/blocs/my_user_bloc/my_user_bloc.dart'; import 'package:prosappco/blocs/professional_bloc/professional_bloc.dart'; import 'package:prosappco/blocs/professional_profile_bloc/professional_profile_bloc.dart'; import 'package:prosappco/blocs/profile_bloc/profile_bloc.dart'; -import 'package:prosappco/blocs/score_bloc/score_bloc.dart'; import 'app_view.dart'; @@ -23,9 +22,6 @@ class MainApp extends StatelessWidget { BlocProvider( create: (context) => Injector.appInstance.get(), ), - // BlocProvider( - // create: (context) => Injector.appInstance.get(), - // ), BlocProvider( create: (context) => Injector.appInstance.get(), ), @@ -33,8 +29,7 @@ class MainApp extends StatelessWidget { create: (context) => Injector.appInstance.get(), ), BlocProvider( - create: (context) => - Injector.appInstance.get(), + create: (context) => Injector.appInstance.get(), ) ], child: BlocBuilder( diff --git a/lib/app_view.dart b/lib/app_view.dart index 57c9409..d6cd9c8 100644 --- a/lib/app_view.dart +++ b/lib/app_view.dart @@ -37,16 +37,17 @@ class MyAppView extends StatelessWidget { ), ), home: BlocBuilder( - builder: (context, state) { - return getScreen(state); - }), + builder: (context, state) { + return getScreen(state); + }, + ), ); } getScreen(AuthenticationState state) { switch (state.status) { case AuthenticationStatus.authenticated: - return const HomeScreen(); + return HomeScreen(); case AuthenticationStatus.unauthenticated: return WelcomeScreen(); diff --git a/lib/main.dart b/lib/main.dart index 6e7fed7..0634ee4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -163,12 +163,6 @@ // } // } -// // splash: 'images/splashgif.gif', -// // backgroundColor: Colors.black, -// // nextScreen: const LoginScreen(), -// // splashIconSize: 50, -// // duration: 80000, - import 'package:flutter/material.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:flutter/services.dart'; diff --git a/lib/screens/professional/components/schedule_item.dart b/lib/screens/professional/components/schedule_item.dart index d0d7b7e..0cba99e 100644 --- a/lib/screens/professional/components/schedule_item.dart +++ b/lib/screens/professional/components/schedule_item.dart @@ -62,6 +62,7 @@ class ScheduleItem extends StatelessWidget { visible: schedule.enabled, child: hoursRangesBody(context), ), + const Divider(), ], ); } diff --git a/lib/screens/user/user_map_screen.dart b/lib/screens/user/user_map_screen.dart index fad4941..580e38b 100644 --- a/lib/screens/user/user_map_screen.dart +++ b/lib/screens/user/user_map_screen.dart @@ -486,6 +486,18 @@ class _UserMapScreenState extends State { } else { // TODO: error inesperado } + + // clear inputs + fechaSeleccionada = null; + horaSeleccionada = null; + profesionalSeleccionado = null; + isClearButtonVisible = false; + _observationController.text = ''; + serviceLocationPreference = null; + + polylines.clear(); + markers.clear(); + setState(() {}); }, style: FilledButton.styleFrom( backgroundColor: Theme.of(context).colorScheme.primary, diff --git a/lib/screens/user/user_service_screen.dart b/lib/screens/user/user_service_screen.dart index 3a9df46..bfe4fbd 100644 --- a/lib/screens/user/user_service_screen.dart +++ b/lib/screens/user/user_service_screen.dart @@ -9,6 +9,7 @@ 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:prosappco/components/general_secondary_button.dart'; import 'package:service_repository/service_repository.dart'; import 'package:setting_repository/setting_repository.dart'; import 'package:user_repository/user_repository.dart'; @@ -245,8 +246,17 @@ class _UserServiceScreenState extends State { Expanded( child: customMessageStatus(service), ), - customButton(service, context), - const SizedBox(height: 20), + const Divider( + height: 1, + thickness: 0.5, + ), + Padding( + padding: const EdgeInsets.symmetric( + vertical: 10, + horizontal: 15, + ), + child: customButton(service, context), + ), ], ); } @@ -341,10 +351,10 @@ class _UserServiceScreenState extends State { ); } - GeneralPrimaryButton customButton( + GeneralSecondaryButton customButton( ServiceEntity service, BuildContext context) { if (service.status == ServiceStatus.pending) { - return GeneralPrimaryButton( + return GeneralSecondaryButton( onPressed: () { final currentState = context.read().state; if (currentState is ServiceLoaded) { @@ -361,7 +371,7 @@ class _UserServiceScreenState extends State { ); } - return GeneralPrimaryButton( + return GeneralSecondaryButton( onPressed: () { Navigator.pop(context); },