some fix

# Conflicts: # lib/presentation/navigation/app_router.dart # pubspec.yaml
2026-08-11 00:14:00 +03:00
parent c9b8d143d1
commit 182be1049b
351 changed files with 24566 additions and 22898 deletions
--- a/lib/presentation/viewmodel/reserved_ride_bloc.dart
+++ b/lib/presentation/viewmodel/reserved_ride_bloc.dart
@@ -1,63 +1,63 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../../core/result.dart';
-import '../../../domain/entities/scooter_order.dart';
-import '../../../domain/usecase/cancel_ride_usecase.dart';
-import '../../../domain/usecase/start_ride_usecase.dart';
-import '../event/reserved_ride_event.dart';
-import '../state/reserved_ride_state.dart';
-
-class ReservedRideBloc extends Bloc<ReservedRideEvent, ReservedRideState> {
-  final StartRideUsecase _startRideUsecase;
-  final CancelRideUsecase _cancelRideUsecase;
-
-  ReservedRideBloc(
-    this._startRideUsecase,
-    this._cancelRideUsecase,
-  ) : super(const ReservedRideState()) {
-    on<StartRide>(_onStartRide);
-    on<CancelRide>(_onCancelRide);
-  }
-
-  Future<void> _onStartRide(
-    StartRide event,
-    Emitter<ReservedRideState> emit,
-  ) async {
-    emit(state.copyWith(status: ReservedRideStatus.loading));
-
-    final result = await _startRideUsecase(event.orderId);
-
-    if (result is Success<ScooterOrder>) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.success,
-        rideStarted: true,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.failure,
-        errorMessage: 'Не удалось начать поездку',
-      ));
-    }
-  }
-
-  Future<void> _onCancelRide(
-    CancelRide event,
-    Emitter<ReservedRideState> emit,
-  ) async {
-    emit(state.copyWith(status: ReservedRideStatus.loading));
-
-    final result = await _cancelRideUsecase(event.orderId);
-
-    if (result is Success) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.success,
-        rideCancelled: true,
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: ReservedRideStatus.failure,
-        errorMessage: 'Не удалось отменить бронирование',
-      ));
-    }
-  }
-}
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../../core/result.dart';
+import '../../../domain/entities/scooter_order.dart';
+import '../../../domain/usecase/cancel_ride_usecase.dart';
+import '../../../domain/usecase/start_ride_usecase.dart';
+import '../event/reserved_ride_event.dart';
+import '../state/reserved_ride_state.dart';
+
+class ReservedRideBloc extends Bloc<ReservedRideEvent, ReservedRideState> {
+  final StartRideUsecase _startRideUsecase;
+  final CancelRideUsecase _cancelRideUsecase;
+
+  ReservedRideBloc(
+    this._startRideUsecase,
+    this._cancelRideUsecase,
+  ) : super(const ReservedRideState()) {
+    on<StartRide>(_onStartRide);
+    on<CancelRide>(_onCancelRide);
+  }
+
+  Future<void> _onStartRide(
+    StartRide event,
+    Emitter<ReservedRideState> emit,
+  ) async {
+    emit(state.copyWith(status: ReservedRideStatus.loading));
+
+    final result = await _startRideUsecase(event.orderId);
+
+    if (result is Success<ScooterOrder>) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.success,
+        rideStarted: true,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.failure,
+        errorMessage: 'Не удалось начать поездку',
+      ));
+    }
+  }
+
+  Future<void> _onCancelRide(
+    CancelRide event,
+    Emitter<ReservedRideState> emit,
+  ) async {
+    emit(state.copyWith(status: ReservedRideStatus.loading));
+
+    final result = await _cancelRideUsecase(event.orderId);
+
+    if (result is Success) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.success,
+        rideCancelled: true,
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: ReservedRideStatus.failure,
+        errorMessage: 'Не удалось отменить бронирование',
+      ));
+    }
+  }
+}