Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix:Solving three problems: time picker, timer, and incorrect calculations. #10

Closed
wants to merge 1 commit into from
Closed

Fix:Solving three problems: time picker, timer, and incorrect calculations. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 80 additions & 96 deletions venom/lib/src/config/routes/router.gr.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions venom/lib/src/injectable/injectable.config.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions venom/lib/src/peresentation/ride/bloc/ride_result/ride_result_bloc.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ class RideResultBloc extends Bloc<RideResultEvent, RideResultState> {

FutureOr<void> _onAnalyzeRide(
_AnalyzeRide event, Emitter<RideResultState> emit) {
//TODO: Please check all the calculation formulas because the result becomes negative.
//
double distanceTravelled = getIt.get<double>(instanceName: 'odometer') -
getIt.get<double>(instanceName: 'odometer2');
double distanceTravelled = getIt.get<double>(instanceName: 'odometer2') -
getIt.get<double>(instanceName: 'odometer');
//

double gasUsed = (getIt.get<double>(instanceName: 'gasLevel') -
(double.tryParse(getIt.get<Vehicle>().tankCapacity!) ?? 0));
getIt.get<double>(instanceName: 'gasLevel2')) *
(double.tryParse(getIt.get<Vehicle>().tankCapacity!) ?? 0);
//
double gasPrice = gasUsed * (getIt.get<Price>().price ?? 0.0);
//
Expand Down
16 changes: 5 additions & 11 deletions venom/lib/src/peresentation/ride/pages/before_ride_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_spinner_picker/flutter_spinner_picker.dart';
import 'package:timer_picker_spinner/timer_picker_spinner.dart';
import 'package:venom/src/config/routes/router.dart';
import 'package:venom/src/injectable/injectable.dart';
import 'package:venom/src/peresentation/ride/bloc/before_ride/before_ride_bloc.dart';
Expand All @@ -26,17 +26,11 @@ class BeforeRidePage extends StatelessWidget {
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
FlutterSpinner(
TimeSelectorSpinner(
fontSize: 26.sp,
is24Hour: true,
selectedDate: getIt.get<BeforeRideBloc>().state.maybeWhen(
orElse: () {
return DateTime(1, 1, 1);
},
idle: (timeSelected) {
return timeSelected;
},
),
selectedFontColor: Colors.white,
unselectedFontColor: Colors.white38,
itemSpace: 25.w,
height: 250.h,
width: 0.9.sw,
onTimeChange: onTimeChange,
Expand Down
19 changes: 18 additions & 1 deletion venom/lib/src/peresentation/ride/pages/new_ride_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,22 @@ import 'package:venom/src/peresentation/ride/bloc/new_ride/new_ride_bloc.dart';
import 'package:venom/src/peresentation/ride/widgets/timer_widget.dart';

@RoutePage(name: 'new_ride')
class NewRidePage extends StatelessWidget {
class NewRidePage extends StatefulWidget {
NewRidePage({super.key});

@override
State<NewRidePage> createState() => _NewRidePageState();
}

class _NewRidePageState extends State<NewRidePage> {
late final CountDownController _controller = CountDownController();

@override
void initState() {
getIt.resetLazySingleton<NewRideBloc>();
super.initState();
}

@override
Widget build(BuildContext context) {
return BlocBuilder<NewRideBloc, NewRideState>(
Expand Down Expand Up @@ -43,6 +55,10 @@ class NewRidePage extends StatelessWidget {
getIt
.get<NewRideBloc>()
.add(NewRideEvent.startTimer());
} else {
if (_controller.isPaused) {
_controller.resume();
}
}
},
);
Expand Down Expand Up @@ -97,6 +113,7 @@ class NewRidePage extends StatelessWidget {
),
),
onPressed: () {
_controller.pause();
if (getIt.isRegistered<String>(
instanceName: 'timeTraveled')) {
getIt.unregister<String>(
Expand Down
Loading