diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index de6acf6..56de1df 100755 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -1,11 +1,13 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/osj/development/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/osj/development/ocg/Taxi-App" -export "FLUTTER_TARGET=/Users/osj/development/ocg/Taxi-App/lib/main.dart" +export "FLUTTER_ROOT=D:\Softwares\flutter" +export "FLUTTER_APPLICATION_PATH=E:\local disk\Applications\2023\templates\Taxi-App" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib\main.dart" export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "FLUTTER_FRAMEWORK_DIR=/Users/osj/development/flutter/bin/cache/artifacts/engine/ios" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/lib/bloc/taxi_booking_bloc.dart b/lib/bloc/taxi_booking_bloc.dart index 0adf49c..74dcbc7 100644 --- a/lib/bloc/taxi_booking_bloc.dart +++ b/lib/bloc/taxi_booking_bloc.dart @@ -1,6 +1,8 @@ +import 'dart:async'; + import 'package:bloc/bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; +import 'package:equatable/equatable.dart'; +import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:taxi_app/controllers/location_controller.dart'; import 'package:taxi_app/controllers/payment_method_controller.dart'; import 'package:taxi_app/controllers/taxi_booking_controller.dart'; @@ -9,92 +11,116 @@ import 'package:taxi_app/models/payment_method.dart'; import 'package:taxi_app/models/taxi.dart'; import 'package:taxi_app/models/taxi_booking.dart'; import 'package:taxi_app/models/taxi_driver.dart'; +import 'package:taxi_app/models/taxi_type.dart'; import 'package:taxi_app/storage/taxi_booking_storage.dart'; +part 'taxi_booking_event.dart'; +part 'taxi_booking_state.dart'; + class TaxiBookingBloc extends Bloc { - @override - TaxiBookingState get initialState => TaxiBookingNotInitializedState(); + TaxiBookingBloc() : super(TaxiBookingNotInitializedState()) { + on(_taxiBookingStarted); + on(_destinationSelected); + on(_detailsSubmitted); + on(_taxSelected); + on(_paymentMade); + on(_taxiBookingCancelled); + on(_backPressed); + } - @override - Stream mapEventToState(TaxiBookingEvent event) async* { - if (event is TaxiBookingStartEvent) { - List taxis = await TaxiBookingController.getTaxisAvailable(); - yield TaxiBookingNotSelectedState(taxisAvailable: taxis); - } - if (event is DestinationSelectedEvent) { - TaxiBookingStorage.open(); - yield TaxiBookingLoadingState( - state: DetailsNotFilledState(booking: null)); + Future _taxiBookingStarted( + TaxiBookingStartEvent event, Emitter emit) async { + List taxis = await TaxiBookingController.getTaxisAvailable(); + emit(TaxiBookingNotSelectedState(taxisAvailable: taxis)); + } - GoogleLocation source = await LocationController.getCurrentLocation(); - GoogleLocation destination = - await LocationController.getLocationfromId(event.destination); - await TaxiBookingStorage.addDetails(TaxiBooking.named( - source: source, destination: destination, noOfPersons: 1)); - TaxiBooking taxiBooking = await TaxiBookingStorage.getTaxiBooking(); - yield DetailsNotFilledState(booking: taxiBooking); - } - if (event is DetailsSubmittedEvent) { - yield TaxiBookingLoadingState(state: TaxiNotSelectedState(booking: null)); - await Future.delayed(Duration(seconds: 1)); - await TaxiBookingStorage.addDetails(TaxiBooking.named( + Future _destinationSelected( + DestinationSelectedEvent event, Emitter emit) async { + TaxiBookingStorage.open(); + emit(TaxiBookingLoadingState(state: DetailsNotFilledState(booking: null))); + GoogleLocation source = await LocationController.getCurrentLocation(); + GoogleLocation destination = + await LocationController.getLocationfromId(event.destination); + + await TaxiBookingStorage.addDetails( + TaxiBooking.named( + source: source, + destination: destination, + noOfPersons: 1, + ), + ); + + TaxiBooking taxiBooking = await TaxiBookingStorage.getTaxiBooking(); + emit(DetailsNotFilledState(booking: taxiBooking)); + } + + Future _detailsSubmitted( + DetailsSubmittedEvent event, Emitter emit) async { + emit(TaxiBookingLoadingState(state: TaxiNotSelectedState(booking: null))); + await Future.delayed(Duration(seconds: 1)); + await TaxiBookingStorage.addDetails( + TaxiBooking.named( source: event.source, destination: event.destination, noOfPersons: event.noOfPersons, bookingTime: event.bookingTime, - )); - TaxiBooking booking = await TaxiBookingStorage.getTaxiBooking(); - yield TaxiNotSelectedState( - booking: booking, - ); - } - if (event is TaxiSelectedEvent) { - yield TaxiBookingLoadingState( - state: - PaymentNotInitializedState(booking: null, methodsAvaiable: [])); - TaxiBooking prevBooking = await TaxiBookingStorage.getTaxiBooking(); - double price = await TaxiBookingController.getPrice(prevBooking); - await TaxiBookingStorage.addDetails( - TaxiBooking.named(taxiType: event.taxiType, estimatedPrice: price)); - TaxiBooking booking = await TaxiBookingStorage.getTaxiBooking(); - List methods = await PaymentMethodController.getMethods(); - yield PaymentNotInitializedState( - booking: booking, methodsAvaiable: methods); - } - if (event is PaymentMadeEvent) { - yield TaxiBookingLoadingState( - state: - PaymentNotInitializedState(booking: null, methodsAvaiable: null)); - TaxiBooking booking = await TaxiBookingStorage.addDetails( - TaxiBooking.named(paymentMethod: event.paymentMethod)); - TaxiDriver taxiDriver = - await TaxiBookingController.getTaxiDriver(booking); - yield TaxiNotConfirmedState(booking: booking, driver: taxiDriver); - await Future.delayed(Duration(seconds: 1)); - yield TaxiBookingConfirmedState(booking: booking, driver: taxiDriver); - } - if (event is TaxiBookingCancelEvent) { - yield TaxiBookingCancelledState(); - await Future.delayed(Duration(milliseconds: 500)); - List taxis = await TaxiBookingController.getTaxisAvailable(); - yield TaxiBookingNotSelectedState(taxisAvailable: taxis); - } - if (event is BackPressedEvent) { - switch (state.runtimeType) { - case DetailsNotFilledState: - List taxis = await TaxiBookingController.getTaxisAvailable(); + ), + ); + TaxiBooking booking = await TaxiBookingStorage.getTaxiBooking(); + emit(TaxiNotSelectedState(booking: booking)); + } + + Future _taxSelected( + TaxiSelectedEvent event, Emitter emit) async { + emit(TaxiBookingLoadingState( + state: + PaymentNotInitializedState(booking: null, methodsAvailable: []))); + TaxiBooking previousBooking = await TaxiBookingStorage.getTaxiBooking(); + double price = await TaxiBookingController.getPrice(previousBooking); + await TaxiBookingStorage.addDetails( + TaxiBooking.named(taxiType: event.taxiType, estimatedPrice: price)); + TaxiBooking booking = await TaxiBookingStorage.getTaxiBooking(); + List methods = await PaymentMethodController.getMethods(); + emit(PaymentNotInitializedState( + booking: booking, methodsAvailable: methods)); + } + + Future _paymentMade( + PaymentMadeEvent event, Emitter emit) async { + emit(TaxiBookingLoadingState( + state: + PaymentNotInitializedState(booking: null, methodsAvailable: null))); + TaxiBooking booking = await TaxiBookingStorage.addDetails( + TaxiBooking.named(paymentMethod: event.paymentMethod)); + TaxiDriver taxiDriver = await TaxiBookingController.getTaxiDriver(booking); + emit(TaxiNotConfirmedState(booking: booking, driver: taxiDriver)); + await Future.delayed(Duration(seconds: 1)); + emit(TaxiBookingConfirmedState(booking: booking, driver: taxiDriver)); + } + + Future _taxiBookingCancelled( + TaxiBookingCancelEvent event, Emitter emit) async { + emit(TaxiBookingCancelledState()); + await Future.delayed(Duration(milliseconds: 500)); + List taxis = await TaxiBookingController.getTaxisAvailable(); + emit(TaxiBookingNotSelectedState(taxisAvailable: taxis)); + } - yield TaxiBookingNotSelectedState(taxisAvailable: taxis); - break; - case PaymentNotInitializedState: - yield TaxiNotSelectedState( - booking: (state as PaymentNotInitializedState).booking); - break; - case TaxiNotSelectedState: - yield DetailsNotFilledState( - booking: (state as TaxiNotSelectedState).booking); - break; - } + Future _backPressed( + BackPressedEvent event, Emitter emit) async { + switch (state.runtimeType) { + case DetailsNotFilledState: + List taxis = await TaxiBookingController.getTaxisAvailable(); + emit(TaxiBookingNotSelectedState(taxisAvailable: taxis)); + break; + case PaymentNotInitializedState: + emit(TaxiNotSelectedState( + booking: (state as PaymentNotInitializedState).booking)); + break; + case TaxiNotSelectedState: + emit(DetailsNotFilledState( + booking: (state as TaxiNotSelectedState).booking)); + break; } } } diff --git a/lib/bloc/taxi_booking_event.dart b/lib/bloc/taxi_booking_event.dart index 74b8b3e..39e0020 100644 --- a/lib/bloc/taxi_booking_event.dart +++ b/lib/bloc/taxi_booking_event.dart @@ -1,9 +1,4 @@ -import 'package:equatable/equatable.dart'; -import 'package:flutter/cupertino.dart'; -import 'package:google_maps_flutter/google_maps_flutter.dart'; -import 'package:taxi_app/models/google_location.dart'; -import 'package:taxi_app/models/payment_method.dart'; -import 'package:taxi_app/models/taxi_type.dart'; +part of 'taxi_booking_bloc.dart'; abstract class TaxiBookingEvent extends Equatable { TaxiBookingEvent(); @@ -17,7 +12,7 @@ class TaxiBookingStartEvent extends TaxiBookingEvent { class DestinationSelectedEvent extends TaxiBookingEvent { final LatLng destination; - DestinationSelectedEvent({@required this.destination}); + DestinationSelectedEvent({this.destination}); @override List get props => [destination]; @@ -29,11 +24,12 @@ class DetailsSubmittedEvent extends TaxiBookingEvent { final int noOfPersons; final DateTime bookingTime; - DetailsSubmittedEvent( - {@required this.source, - @required this.destination, - @required this.noOfPersons, - @required this.bookingTime}); + DetailsSubmittedEvent({ + this.source, + this.destination, + this.noOfPersons, + this.bookingTime, + }); @override List get props => [source, destination, noOfPersons, bookingTime]; @@ -42,7 +38,7 @@ class DetailsSubmittedEvent extends TaxiBookingEvent { class TaxiSelectedEvent extends TaxiBookingEvent { final TaxiType taxiType; - TaxiSelectedEvent({@required this.taxiType}); + TaxiSelectedEvent({this.taxiType}); @override List get props => [taxiType]; @@ -51,7 +47,7 @@ class TaxiSelectedEvent extends TaxiBookingEvent { class PaymentMadeEvent extends TaxiBookingEvent { final PaymentMethod paymentMethod; - PaymentMadeEvent({@required this.paymentMethod}); + PaymentMadeEvent({this.paymentMethod}); @override List get props => [paymentMethod]; diff --git a/lib/bloc/taxi_booking_state.dart b/lib/bloc/taxi_booking_state.dart index 717bdb7..b276f02 100644 --- a/lib/bloc/taxi_booking_state.dart +++ b/lib/bloc/taxi_booking_state.dart @@ -1,9 +1,4 @@ -import 'package:equatable/equatable.dart'; -import 'package:flutter/foundation.dart'; -import 'package:taxi_app/models/payment_method.dart'; -import 'package:taxi_app/models/taxi.dart'; -import 'package:taxi_app/models/taxi_booking.dart'; -import 'package:taxi_app/models/taxi_driver.dart'; +part of 'taxi_booking_bloc.dart'; abstract class TaxiBookingState extends Equatable { TaxiBookingState(); @@ -18,7 +13,7 @@ class TaxiBookingNotInitializedState extends TaxiBookingState { class TaxiBookingNotSelectedState extends TaxiBookingState { final List taxisAvailable; - TaxiBookingNotSelectedState({@required this.taxisAvailable}); + TaxiBookingNotSelectedState({this.taxisAvailable}); @override List get props => null; @@ -27,7 +22,7 @@ class TaxiBookingNotSelectedState extends TaxiBookingState { class DetailsNotFilledState extends TaxiBookingState { final TaxiBooking booking; - DetailsNotFilledState({@required this.booking}); + DetailsNotFilledState({this.booking}); @override List get props => [booking]; } @@ -35,7 +30,7 @@ class DetailsNotFilledState extends TaxiBookingState { class TaxiNotSelectedState extends TaxiBookingState { final TaxiBooking booking; - TaxiNotSelectedState({@required this.booking}); + TaxiNotSelectedState({this.booking}); @override List get props => [booking]; @@ -43,11 +38,11 @@ class TaxiNotSelectedState extends TaxiBookingState { class PaymentNotInitializedState extends TaxiBookingState { final TaxiBooking booking; - final List methodsAvaiable; + final List methodsAvailable; PaymentNotInitializedState({ - @required this.booking, - @required this.methodsAvaiable, + this.booking, + this.methodsAvailable, }); @override @@ -58,7 +53,7 @@ class TaxiNotConfirmedState extends TaxiBookingState { final TaxiDriver driver; final TaxiBooking booking; - TaxiNotConfirmedState({@required this.driver, @required this.booking}); + TaxiNotConfirmedState({this.driver, this.booking}); @override List get props => [driver, booking]; @@ -68,7 +63,7 @@ class TaxiConfirmedState extends TaxiBookingState { final TaxiDriver driver; final TaxiBooking booking; - TaxiConfirmedState({@required this.driver, @required this.booking}); + TaxiConfirmedState({this.driver, this.booking}); @override List get props => [driver, booking]; @@ -82,7 +77,7 @@ class TaxiBookingCancelledState extends TaxiBookingState { class TaxiBookingLoadingState extends TaxiBookingState { final TaxiBookingState state; - TaxiBookingLoadingState({@required this.state}); + TaxiBookingLoadingState({this.state}); @override List get props => [state]; } @@ -91,7 +86,7 @@ class TaxiBookingConfirmedState extends TaxiBookingState { final TaxiDriver driver; final TaxiBooking booking; - TaxiBookingConfirmedState({@required this.driver, @required this.booking}); + TaxiBookingConfirmedState({this.driver, this.booking}); @override List get props => [driver]; } diff --git a/lib/controllers/user_location_controller.dart b/lib/controllers/user_location_controller.dart index 27bb355..e480f37 100644 --- a/lib/controllers/user_location_controller.dart +++ b/lib/controllers/user_location_controller.dart @@ -5,10 +5,10 @@ import 'package:location/location.dart'; class UserLocationController { static Future getCurrentLocation() async { Location location = Location(); - bool check = await location.hasPermission(); - if (!check) { - bool result = await location.requestPermission(); - if (result) { + PermissionStatus check = await location.hasPermission(); + if (check == PermissionStatus.denied) { + check = await location.requestPermission(); + if (check == PermissionStatus.granted) { LocationData position = await location.getLocation(); return LatLng(position.latitude, position.longitude); } diff --git a/lib/main.dart b/lib/main.dart index 11ffce5..07a7e49 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -20,11 +20,12 @@ class MyApp extends StatelessWidget { primaryColor: Colors.black, fontFamily: 'Ubuntu', textTheme: TextTheme( - title: TextStyle(fontSize: 16.0, fontWeight: FontWeight.w600), - subtitle: TextStyle(color: Colors.black54), - subhead: + titleMedium: + TextStyle(fontSize: 16.0, fontWeight: FontWeight.w600), + titleSmall: TextStyle(color: Colors.black54), + headlineSmall: TextStyle(color: Colors.black54, fontWeight: FontWeight.w800), - headline: + headlineMedium: TextStyle(fontSize: 18.0, fontWeight: FontWeight.w800))), home: HomeScreen(), ); diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index 0fac77a..05e243d 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -1,9 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/widgets/destination_selection_widget.dart'; import 'package:taxi_app/widgets/home_app_bar.dart'; import 'package:taxi_app/widgets/home_drawer.dart'; @@ -11,6 +8,8 @@ import 'package:taxi_app/widgets/taxi_booking_confirmed_widget.dart'; import 'package:taxi_app/widgets/taxi_booking_home_widget.dart'; import 'package:taxi_app/widgets/taxi_map.dart'; +import '../bloc/taxi_booking_bloc.dart'; + class HomeScreen extends StatefulWidget { @override _HomeScreenState createState() => _HomeScreenState(); diff --git a/lib/widgets/destination_selection_widget.dart b/lib/widgets/destination_selection_widget.dart index fda8624..8d836aa 100644 --- a/lib/widgets/destination_selection_widget.dart +++ b/lib/widgets/destination_selection_widget.dart @@ -2,7 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; import 'package:taxi_app/controllers/user_location_controller.dart'; import 'package:taxi_app/models/user_location.dart'; import 'package:taxi_app/widgets/ease_in_widget.dart'; @@ -116,7 +115,7 @@ class _DestinationSelctionWidgetState extends State ), Text( "${location.locationType.toString().replaceFirst("UserLocationType.", "")}", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), SizedBox( height: 4.0, @@ -125,7 +124,7 @@ class _DestinationSelctionWidgetState extends State "${location.minutesFar} minutes", style: Theme.of(context) .textTheme - .subtitle + .titleSmall .copyWith(fontSize: 12.0), ) ], @@ -171,15 +170,17 @@ class _DestinationSelctionWidgetState extends State ), Text( "New Ride", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), SizedBox( height: 4.0, ), Text( "Select Dest.", - style: - Theme.of(context).textTheme.subtitle.copyWith(fontSize: 12.0), + style: Theme.of(context) + .textTheme + .titleSmall + .copyWith(fontSize: 12.0), ) ], ), diff --git a/lib/widgets/home_app_bar.dart b/lib/widgets/home_app_bar.dart index 22a4406..cb949f6 100644 --- a/lib/widgets/home_app_bar.dart +++ b/lib/widgets/home_app_bar.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/controllers/user_controller.dart'; import 'package:taxi_app/models/user.dart'; import 'package:taxi_app/widgets/ease_in_widget.dart'; diff --git a/lib/widgets/rounded_button.dart b/lib/widgets/rounded_button.dart index b273f98..6e9f237 100644 --- a/lib/widgets/rounded_button.dart +++ b/lib/widgets/rounded_button.dart @@ -31,7 +31,7 @@ class RoundedButton extends StatelessWidget { child: text != null ? Text( "$text", - style: Theme.of(context).textTheme.title.copyWith( + style: Theme.of(context).textTheme.titleMedium.copyWith( color: Colors.white, ), ) diff --git a/lib/widgets/taxi_booking_cancellation_dialog.dart b/lib/widgets/taxi_booking_cancellation_dialog.dart index e59713a..9002a0a 100644 --- a/lib/widgets/taxi_booking_cancellation_dialog.dart +++ b/lib/widgets/taxi_booking_cancellation_dialog.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; + class TaxiBookingCancellationDialog extends StatelessWidget { @override @@ -10,7 +10,7 @@ class TaxiBookingCancellationDialog extends StatelessWidget { title: Text("Cancel Ride"), content: Text("Do you want to cancel ride?"), actions: [ - FlatButton( + ElevatedButton( child: Text( "Cancel", style: TextStyle(fontSize: 16.0), @@ -19,7 +19,7 @@ class TaxiBookingCancellationDialog extends StatelessWidget { Navigator.of(context).pop(); }, ), - FlatButton( + ElevatedButton( child: Text( "Ok", style: TextStyle(fontSize: 16.0), diff --git a/lib/widgets/taxi_booking_confirmed_widget.dart b/lib/widgets/taxi_booking_confirmed_widget.dart index f2ae642..3644322 100644 --- a/lib/widgets/taxi_booking_confirmed_widget.dart +++ b/lib/widgets/taxi_booking_confirmed_widget.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/models/taxi_booking.dart'; import 'package:taxi_app/models/taxi_driver.dart'; import 'package:taxi_app/widgets/taxi_booking_cancellation_dialog.dart'; @@ -62,7 +61,7 @@ class _TaxiBookingConfirmedWidgetState extends State "Ride Info", style: Theme.of(context) .textTheme - .title + .titleMedium .copyWith(color: Colors.white), ), ), @@ -124,14 +123,14 @@ class _TaxiBookingConfirmedWidgetState extends State children: [ Text( "${driver.driverName}", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), SizedBox( height: 4.0, ), Text( "${driver.taxiDetails}", - style: Theme.of(context).textTheme.subtitle, + style: Theme.of(context).textTheme.titleSmall, ) ], )), @@ -153,7 +152,7 @@ class _TaxiBookingConfirmedWidgetState extends State ), Text( "${driver.driverRating}", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), ], ), diff --git a/lib/widgets/taxi_booking_details_widget.dart b/lib/widgets/taxi_booking_details_widget.dart index 43f8aef..f102b47 100644 --- a/lib/widgets/taxi_booking_details_widget.dart +++ b/lib/widgets/taxi_booking_details_widget.dart @@ -1,8 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/models/google_location.dart'; import 'package:taxi_app/models/taxi_booking.dart'; import 'package:taxi_app/widgets/rounded_button.dart'; @@ -46,7 +44,7 @@ class _TaxiBookingDetailsWidgetState extends State { ), Text( "Address", - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headlineMedium, ), SizedBox( height: 24.0, @@ -62,7 +60,7 @@ class _TaxiBookingDetailsWidgetState extends State { ), Text( "Seat and Time", - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headlineMedium, ), SizedBox( height: 24.0, @@ -115,7 +113,7 @@ class _TaxiBookingDetailsWidgetState extends State { children: [ Text( "Need Seat", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), Row( mainAxisSize: MainAxisSize.min, @@ -143,13 +141,13 @@ class _TaxiBookingDetailsWidgetState extends State { children: [ Text( "Schedule Time", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), bookingTime == null ? Container() : Text( "${bookingTime.day}-${bookingTime.month}-${bookingTime.year}", - style: Theme.of(context).textTheme.subtitle, + style: Theme.of(context).textTheme.titleSmall, ) ], ), @@ -194,7 +192,7 @@ class _TaxiBookingDetailsWidgetState extends State { borderRadius: BorderRadius.circular(12.0)), child: Text( "$val", - style: Theme.of(context).textTheme.headline.copyWith( + style: Theme.of(context).textTheme.headlineMedium.copyWith( color: enabled ? Colors.white : Colors.black, fontSize: 15.0), )); } @@ -215,7 +213,7 @@ class _TaxiBookingDetailsWidgetState extends State { child: text != null ? Text( "$text", - style: Theme.of(context).textTheme.headline.copyWith( + style: Theme.of(context).textTheme.headlineMedium.copyWith( color: enabled ? Colors.white : Colors.black, fontSize: 15.0), ) @@ -238,7 +236,7 @@ class _TaxiBookingDetailsWidgetState extends State { text ?? hint, style: Theme.of(context) .textTheme - .title + .titleMedium .copyWith(color: text == null ? Colors.black45 : Colors.black), maxLines: 1, overflow: TextOverflow.ellipsis, diff --git a/lib/widgets/taxi_booking_home_widget.dart b/lib/widgets/taxi_booking_home_widget.dart index 7777ed2..769a772 100644 --- a/lib/widgets/taxi_booking_home_widget.dart +++ b/lib/widgets/taxi_booking_home_widget.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/widgets/loading_shimmer.dart'; import 'package:taxi_app/widgets/taxi_booking_details_widget.dart'; import 'package:taxi_app/widgets/taxi_booking_not_confirmed_widget.dart'; diff --git a/lib/widgets/taxi_booking_not_confirmed_widget.dart b/lib/widgets/taxi_booking_not_confirmed_widget.dart index 7cb112a..837adda 100644 --- a/lib/widgets/taxi_booking_not_confirmed_widget.dart +++ b/lib/widgets/taxi_booking_not_confirmed_widget.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; + import 'package:taxi_app/models/taxi_booking.dart'; import 'package:taxi_app/models/taxi_driver.dart'; import 'package:taxi_app/widgets/rounded_button.dart'; @@ -60,11 +60,11 @@ class _TaxiBookingNotConfirmedWidgetState Expanded( child: Text( "Change Pickup Location", - style: Theme.of(context).textTheme.subhead, + style: Theme.of(context).textTheme.headlineSmall, )), Text( "Edit", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ) ], ), @@ -125,14 +125,14 @@ class _TaxiBookingNotConfirmedWidgetState children: [ Text( "${driver.driverName}", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), SizedBox( height: 4.0, ), Text( "${driver.taxiDetails}", - style: Theme.of(context).textTheme.subtitle, + style: Theme.of(context).textTheme.titleSmall, ) ], )), @@ -154,7 +154,7 @@ class _TaxiBookingNotConfirmedWidgetState ), Text( "${driver.driverRating}", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), ], ), @@ -196,7 +196,7 @@ class _TaxiBookingNotConfirmedWidgetState ), Text( " $text", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ) ], ); diff --git a/lib/widgets/taxi_booking_payments_widget.dart b/lib/widgets/taxi_booking_payments_widget.dart index 1d5d562..3166b65 100644 --- a/lib/widgets/taxi_booking_payments_widget.dart +++ b/lib/widgets/taxi_booking_payments_widget.dart @@ -1,8 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; + import 'package:taxi_app/models/payment_method.dart'; import 'package:taxi_app/widgets/rounded_button.dart'; @@ -21,7 +20,7 @@ class _TaxiBookingPaymentsWidgetState extends State { super.initState(); methods = (BlocProvider.of(context).state as PaymentNotInitializedState) - .methodsAvaiable; + .methodsAvailable; } @override @@ -40,7 +39,7 @@ class _TaxiBookingPaymentsWidgetState extends State { children: [ Text( "Select Payment", - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headlineMedium, ), ListView.separated( itemBuilder: (context, index) { @@ -56,7 +55,7 @@ class _TaxiBookingPaymentsWidgetState extends State { ), Text( "Promo Code", - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headlineMedium, ), SizedBox( height: 18.0, @@ -129,14 +128,14 @@ class _TaxiBookingPaymentsWidgetState extends State { children: [ Text( "${method.title}", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), SizedBox( height: 4.0, ), Text( "${method.description}", - style: Theme.of(context).textTheme.subtitle, + style: Theme.of(context).textTheme.titleSmall, ), ], ), @@ -167,7 +166,7 @@ class _TaxiBookingPaymentsWidgetState extends State { text ?? hint, style: Theme.of(context) .textTheme - .title + .titleMedium .copyWith(color: text == null ? Colors.black45 : Colors.black), maxLines: 1, overflow: TextOverflow.ellipsis, diff --git a/lib/widgets/taxi_booking_state_widget.dart b/lib/widgets/taxi_booking_state_widget.dart index 4bfb530..6a37865 100644 --- a/lib/widgets/taxi_booking_state_widget.dart +++ b/lib/widgets/taxi_booking_state_widget.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/widgets/dashed_line.dart'; import 'package:taxi_app/widgets/taxi_booking_cancellation_dialog.dart'; @@ -47,7 +46,7 @@ class TaxiBookingStateWidget extends StatelessWidget { children: [ Text( title, - style: Theme.of(context).textTheme.title.copyWith( + style: Theme.of(context).textTheme.titleMedium.copyWith( color: Colors.white, fontWeight: FontWeight.normal), ), IconButton( @@ -103,7 +102,7 @@ class TaxiBookingStateWidget extends StatelessWidget { borderRadius: BorderRadius.circular(12.0)), child: Text( "$val", - style: Theme.of(context).textTheme.headline.copyWith( + style: Theme.of(context).textTheme.headlineMedium.copyWith( color: enabled ? Colors.black : Colors.white, fontSize: 15), )); } diff --git a/lib/widgets/taxi_booking_taxis_widget.dart b/lib/widgets/taxi_booking_taxis_widget.dart index 4982eb7..4d52b67 100644 --- a/lib/widgets/taxi_booking_taxis_widget.dart +++ b/lib/widgets/taxi_booking_taxis_widget.dart @@ -1,12 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/models/taxi_booking.dart'; import 'package:taxi_app/models/taxi_type.dart'; import 'package:taxi_app/widgets/rounded_button.dart'; +import '../bloc/taxi_booking_bloc.dart'; + class TaxiBookingTaxisWidget extends StatefulWidget { @override _TaxiBookingTaxisWidgetState createState() => _TaxiBookingTaxisWidgetState(); @@ -48,7 +47,7 @@ class _TaxiBookingTaxisWidgetState extends State { ), Text( "Choose Taxi", - style: Theme.of(context).textTheme.headline, + style: Theme.of(context).textTheme.headlineMedium, maxLines: 1, overflow: TextOverflow.ellipsis, ), @@ -138,7 +137,7 @@ class _TaxiBookingTaxisWidgetState extends State { ), Text( val.toString().replaceFirst("TaxiType.", ""), - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ), ], ), @@ -182,7 +181,7 @@ class _TaxiBookingTaxisWidgetState extends State { ), Text( " $text", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ) ], ); @@ -209,7 +208,7 @@ class _TaxiBookingTaxisWidgetState extends State { ), Text( "$area", - style: Theme.of(context).textTheme.title, + style: Theme.of(context).textTheme.titleMedium, ) ], ), diff --git a/lib/widgets/taxi_map.dart b/lib/widgets/taxi_map.dart index c0947fc..0c306a7 100644 --- a/lib/widgets/taxi_map.dart +++ b/lib/widgets/taxi_map.dart @@ -5,8 +5,6 @@ import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:taxi_app/bloc/taxi_booking_bloc.dart'; -import 'package:taxi_app/bloc/taxi_booking_event.dart'; -import 'package:taxi_app/bloc/taxi_booking_state.dart'; import 'package:taxi_app/controllers/location_controller.dart'; import 'package:taxi_app/models/google_location.dart'; import 'package:taxi_app/models/taxi.dart';