Polyanka/be_happy_public
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync changes

Browse Source
This commit is contained in:
Polyanka
2026-05-12 11:25:19 +03:00
parent 3616f84556
commit fdc5aefdd2
25 changed files with 313 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/data/interceptor/auth_interceptor.dart Normal file
View File

@@ -0,0 +1,26 @@
import 'package:dio/dio.dart';
import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
import 'package:be_happy/presentation/event/spalsh_event.dart';
import '../../di/service_locator.dart';
class AuthInterceptor extends Interceptor {
AuthInterceptor();
@override
void onError(DioException err, ErrorInterceptorHandler handler) {
final String path = err.requestOptions.path;
if (err.response?.statusCode == 401) {
if (!path.contains('/auth/client/refresh') && !path.contains('/auth/client/login')) {
print('Interceptor: 401 на обычном запросе. Пытаемся обновить токен...');
getIt<SplashBloc>().add(AuthCheckRequested());
} else {
print('Interceptor: 401 на запросе авторизации. Пробрасываем ошибку дальше.');
}
}
return super.onError(err, handler);
}
}

40
lib/data/network/api_service.dart
View File

@@ -667,8 +667,22 @@ class ApiService {
return ScooterOrder.fromJson(response.data);
} on DioException catch (e) {
_handleDioError(e);
return null;
if (e.response?.statusCode == 400) {
final data = e.response?.data;
if (data is Map && data['message'] is List) {
final firstError = data['message'][0]['message'].toString();
if (firstError.contains("Wrong start zone")) {
throw WrongZoneException(message: "Некорректная зона для начала поездки.");
}
}
if (data is Map && data['message'] is String) {}
} else {
_handleDioError(e);
}
rethrow;
}
}
@@ -684,8 +698,22 @@ class ApiService {
}
return null;
} on DioException catch (e) {
_handleDioError(e);
return null;
if (e.response?.statusCode == 400) {
final data = e.response?.data;
if (data is Map && data['message'] is List) {
final firstError = data['message'][0]['message'].toString();
if (firstError.contains("Wrong start zone")) {
throw WrongZoneException(message: "Некорректная зона для начала поездки.");
}
}
if (data is Map && data['message'] is String) {}
} else {
_handleDioError(e);
}
rethrow;
}
}
@@ -762,8 +790,8 @@ class ApiService {
if (data is Map && data['message'] is List) {
final firstError = data['message'][0]['message'].toString();
if (firstError.contains("Wrong zone")) {
throw WrongZoneException(message: firstError);
if (firstError.contains("Wrong start zone")) {
throw WrongZoneException(message: "Некорректная зона для завершения поездки.");
}
}

53
lib/data/network/geocoding_remote_datasource.dart
View File

@@ -55,32 +55,47 @@ class GeocodingRemoteDataSource {
}
}
Future<List<MasstransitRoute>?> getPedestrianRoutes(Point userPosition,
Point targetPosition) async {
final (session, resultFuture) = await YandexPedestrian.requestRoutes(
points: [
RequestPoint(
point: userPosition, requestPointType: RequestPointType.wayPoint),
RequestPoint(point: targetPosition,
requestPointType: RequestPointType.wayPoint)
],
fitnessOptions: FitnessOptions(avoidSteep: false, avoidStairs: false),
timeOptions: TimeOptions()
);
Future<List<MasstransitRoute>?> getPedestrianRoutes(
Point userPosition,
Point targetPosition,
) async {
try {
print("From: ${userPosition.latitude}, ${userPosition.longitude}");
print("To: ${targetPosition.latitude}, ${targetPosition.longitude}");
final (session, resultFuture) = await YandexPedestrian.requestRoutes(
points: [
RequestPoint(point: userPosition, requestPointType: RequestPointType.wayPoint),
RequestPoint(point: targetPosition, requestPointType: RequestPointType.wayPoint)
],
fitnessOptions: const FitnessOptions(avoidSteep: false, avoidStairs: false),
timeOptions: const TimeOptions()
);
final result = await resultFuture;
final distance = result.routes?.first.metadata.weight.walkingDistance.value;
if (result.routes == null || result.routes!.isEmpty) {
print("Маршруты не найдены: список пуст или null");
return [];
}
print("Дистанция до самоката: $distance");
final route = result.routes!.first;
final distance = route.metadata.weight.walkingDistance?.value;
if (distance != null) {
print("Дистанция до самоката: $distance м");
} else {
print("Дистанция не найдена в метаданных маршрута");
}
return result.routes;
} catch (e) {
print('Error: $e');
} catch (e, stack) {
print('Pedestrian route error: $e');
print('Stack trace: $stack');
return null;
}
return null;
}
}

2
lib/data/repositories/scooter_repository_impl.dart
View File

@@ -164,6 +164,8 @@ class ScooterRepositoryImpl extends ScooterRepository {
}
} on AuthException catch (e) {
result = Failure(AuthFailure(e.attemptsLeft));
} on WrongZoneException catch (e) {
result = Failure(WrongZoneFailure(e.message));
} catch (e) {
result = Failure(UnknownFailure("Неизвестная ошибка"));
}

24
lib/di/service_locator.dart
View File

@@ -78,6 +78,7 @@ import 'package:get_it/get_it.dart';
import 'package:http/http.dart' as http;
import 'package:shared_preferences/shared_preferences.dart';
import '../data/interceptor/auth_interceptor.dart';
import '../data/network/api_service.dart';
import '../data/network/geocoding_remote_datasource.dart';
import '../data/repositories/auth_repository_impl.dart';
@@ -110,6 +111,7 @@ Future<void> setupDependencies() async {
final sharedPreferences = await SharedPreferences.getInstance();
final dio = Dio();
dio.interceptors.add(LogInterceptor(responseBody: true, requestBody: true));
dio.interceptors.add(AuthInterceptor());
// HTTP
getIt.registerSingleton<http.Client>(http.Client());
//SecureStorage
@@ -132,7 +134,7 @@ Future<void> setupDependencies() async {
getIt.registerSingleton<AppSettingsService>(AppSettingsService(getIt()));
getIt.registerLazySingleton<NewsApiService>(
() => NewsApiService(getIt<ApiService>()),
() => NewsApiService(getIt<ApiService>()),
);
// Repository
@@ -163,7 +165,7 @@ Future<void> setupDependencies() async {
);
getIt.registerLazySingleton<NewsRepository>(
() => NewsRepositoryImpl(getIt<NewsApiService>()),
() => NewsRepositoryImpl(getIt<NewsApiService>()),
);
getIt.registerSingleton<NotificationRepository>(
@@ -295,11 +297,11 @@ Future<void> setupDependencies() async {
getIt.registerFactory<ProfileBloc>(() => ProfileBloc(getIt(), getIt(), getIt()));
getIt.registerFactory<EditProfileBloc>(
() => EditProfileBloc(getIt(), getIt()),
() => EditProfileBloc(getIt(), getIt()),
);
getIt.registerFactory<MapBloc>(
() => MapBloc(
() => MapBloc(
getIt(),
getIt(),
getIt(),
@@ -314,24 +316,24 @@ Future<void> setupDependencies() async {
getIt.registerFactory<ScooterDetailBloc>(() => ScooterDetailBloc(getIt()));
getIt.registerFactory<MapSettingsModalBloc>(
() => MapSettingsModalBloc(getIt(), getIt()),
() => MapSettingsModalBloc(getIt(), getIt()),
);
getIt.registerFactory<AddCardBloc>(() => AddCardBloc(getIt()));
getIt.registerFactory<PaymentMethodSheetBloc>(
() => PaymentMethodSheetBloc(getIt()),
() => PaymentMethodSheetBloc(getIt()),
);
getIt.registerFactory<CurrentRidesBloc>(() => CurrentRidesBloc(getIt()));
getIt.registerFactory<ActiveRideBloc>(
() => ActiveRideBloc(getIt(), getIt(), getIt(), getIt(), getIt()),
() => ActiveRideBloc(getIt(), getIt(), getIt(), getIt(), getIt()),
);
getIt.registerFactory<ReservedRideBloc>(
() => ReservedRideBloc(getIt(), getIt()),
() => ReservedRideBloc(getIt(), getIt()),
);
getIt.registerFactory<NewsBloc>(() => NewsBloc(getIt<NewsRepository>()));
@@ -340,7 +342,7 @@ Future<void> setupDependencies() async {
getIt.registerFactory<SendPhotoBloc>(() => SendPhotoBloc(getIt(), getIt()));
getIt.registerFactory<SubscriptionListBloc>(
() => SubscriptionListBloc(
() => SubscriptionListBloc(
getAvailableSubscriptionsUsecase: getIt(),
getClientSubscriptionsUsecase: getIt(),
),
@@ -365,10 +367,10 @@ Future<void> setupDependencies() async {
// Bloc
getIt.registerFactory<OrderHistoryBloc>(
() => OrderHistoryBloc(getIt<GetScooterOrderHistoryUsecase>()),
() => OrderHistoryBloc(getIt<GetScooterOrderHistoryUsecase>()),
);
getIt.registerFactory<ScooterCodeBloc>(
() => ScooterCodeBloc(getScooterByTitleUsecase: getIt<GetScooterByTitleUsecase>()),
() => ScooterCodeBloc(getScooterByTitleUsecase: getIt<GetScooterByTitleUsecase>()),
);
}

4
lib/domain/entities/tariff.dart
View File

@@ -8,8 +8,8 @@ class Tariff {
final double drivePrice; // Цена минуты
final double pausePrice; // Пауза
final double startPrice; // Старт цена
final double cashback; // Процент кэшбэка
final double insurance; // Страховка
final double cashback; // Процент кэшбэка
final double insurance; // Страховка
Tariff({
required this.id,

6
lib/presentation/components/sheet/active_ride_sheet.dart
View File

@@ -36,7 +36,6 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
_bloc = getIt<ActiveRideBloc>();
_bloc.add(LoadScooterOrder(widget.orderId));
// Локальный таймер для обновления UI каждую секунду
_localTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
if (mounted && !_bloc.state.isPaused) {
setState(() {});
@@ -60,7 +59,6 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
listener: (context, state) {
if (!state.inZone) {
BotToast.showCustomNotification(
// duration: const Duration(seconds: 4),
toastBuilder: (_) {
return NotificationToast(
@@ -125,8 +123,7 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
? state.elapsedTime
: state.elapsedTime + (DateTime.now().difference(DateTime.now().subtract(const Duration(seconds: 1))));
// Для отображения текущего времени в реальном времени
final effectiveElapsedTime = state.isPaused
final effectiveElapsedTime = state.isPaused
? state.elapsedTime
: DateTime.now().difference(state.order?.startAt ?? state.order?.createdAt ?? DateTime.now());
@@ -189,7 +186,6 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
const SizedBox(height: 20),
// 🔹 ТАЙМЕР
Container(
width: double.infinity,
margin: const EdgeInsets.symmetric(horizontal: 20),

19
lib/presentation/components/sheet/tariff_info_sheet.dart
View File

@@ -5,15 +5,23 @@ import 'package:flutter/cupertino.dart';
class TariffInfoSheet extends StatefulWidget {
final Tariff tariff;
final bool isInsurance;
final Function(bool) onChanged;
const TariffInfoSheet({super.key, required this.tariff});
const TariffInfoSheet({super.key, required this.tariff, required this.isInsurance, required this.onChanged});
@override
State<TariffInfoSheet> createState() => _TariffInfoSheetState();
}
class _TariffInfoSheetState extends State<TariffInfoSheet> {
bool _isInsuranceEnabled = true;
late bool _isInsuranceEnabled;
@override
void initState() {
super.initState();
_isInsuranceEnabled = widget.isInsurance;
}
@override
Widget build(BuildContext context) {
@@ -80,7 +88,6 @@ class _TariffInfoSheetState extends State<TariffInfoSheet> {
const Divider(color: Colors.white24, height: 40),
// Страховка
Row(
children: [
const Text(
@@ -100,7 +107,10 @@ class _TariffInfoSheetState extends State<TariffInfoSheet> {
child: CupertinoSwitch(
value: _isInsuranceEnabled,
activeColor: const Color(0xFF66E3C4),
onChanged: (val) => setState(() => _isInsuranceEnabled = val),
onChanged: (val) {
setState(() => _isInsuranceEnabled = val);
widget.onChanged(val);
},
),
),
],
@@ -108,7 +118,6 @@ class _TariffInfoSheetState extends State<TariffInfoSheet> {
const Divider(color: Colors.white24, height: 40),
// Список правил (Bullet points)
_buildInfoBullet('Оплата страховки осуществляется только по банковской карте отдельным платежом'),
_buildInfoBullet('В режиме паузы время тарифа приостанавливается'),
_buildInfoBullet('При старте заказа будет заблокирована сумма в размере 7 рублей для проверки платежеспособности. Сумма разблокируется по факту списания средств за поездку.'),

43
lib/presentation/components/sheet/tariff_sheet.dart
View File

@@ -30,7 +30,6 @@ class TariffSheet extends StatefulWidget {
class _TariffSheetState extends State<TariffSheet> {
int? _selectedTariffIndex;
bool _hasPaymentCard = true;
@override
void initState() {
@@ -40,7 +39,27 @@ class _TariffSheetState extends State<TariffSheet> {
@override
Widget build(BuildContext context) {
return BlocBuilder<TariffSheetBloc, TariffSheetState>(
return BlocConsumer<TariffSheetBloc, TariffSheetState>(
listener: (context, state) {
if (state.status == TariffSheetStatus.failure && state.errorMessage != null) {
ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
state.errorMessage!,
style: const TextStyle(color: Colors.white),
),
backgroundColor: Colors.redAccent.withOpacity(0.9),
behavior: SnackBarBehavior.floating,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
margin: const EdgeInsets.all(20),
duration: const Duration(seconds: 3),
),
);
}
},
builder: (context, state) {
if (state.status == TariffSheetStatus.loading) {
return Align(
@@ -193,7 +212,7 @@ class _TariffSheetState extends State<TariffSheet> {
bottom: 0,
child: Center(
child: Text(
'${widget.scooter.batteryLevel.toInt()}%', // ✅ Цифры
'${widget.scooter.batteryLevel.toInt()}%',
style: const TextStyle(
color: Colors.white,
fontSize: 10,
@@ -245,6 +264,7 @@ class _TariffSheetState extends State<TariffSheet> {
'Минута на паузе ${tariff.pausePrice.toStringAsFixed(0)} ${tariff.currency}',
],
isSelected: _selectedTariffIndex == index,
isInsurance: state.isInsurance,
tariff: tariff,
onTap: () {
setState(() {
@@ -380,7 +400,7 @@ class _TariffSheetState extends State<TariffSheet> {
0,
state.useBalance ? null : state.selectedCard?.id,
state.useBalance,
false
state.isInsurance
)
);
context.pushReplacement('/home/current-rides-sheet');
@@ -421,6 +441,7 @@ class _TariffCard extends StatelessWidget {
final String currency;
final String subtitle;
final List<String> details;
final bool isInsurance;
final bool isSelected;
final VoidCallback onTap;
@@ -432,6 +453,7 @@ class _TariffCard extends StatelessWidget {
required this.subtitle,
required this.details,
required this.isSelected,
required this.isInsurance,
required this.onTap,
});
@@ -448,14 +470,11 @@ class _TariffCard extends StatelessWidget {
: Colors.white.withOpacity(0.19),
borderRadius: BorderRadius.circular(20),
),
// Используем Stack, чтобы наложить кнопку поверх контента
child: Stack(
children: [
// Основной контент карточки
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Заголовок с иконкой часов
Row(
children: [
const Icon(
@@ -531,8 +550,16 @@ class _TariffCard extends StatelessWidget {
context: context,
isScrollControlled: true,
backgroundColor: Colors.transparent,
builder: (context) => TariffInfoSheet(tariff: tariff),
builder: (context) => TariffInfoSheet(
tariff: tariff,
isInsurance: isInsurance,
onChanged: (val) {
context.read<TariffSheetBloc>().add(InsuranceToggled(val));
}),
);
print('Info pressed for $title');
},
child: Image.asset(

5
lib/presentation/event/tariff_sheet_event.dart
View File

@@ -14,6 +14,11 @@ class PaymentCardChanged extends TariffSheetEvent {
PaymentCardChanged(this.card);
}
class InsuranceToggled extends TariffSheetEvent {
final bool isEnabled;
InsuranceToggled(this.isEnabled);
}
class SelectBalancePressed extends TariffSheetEvent {}
class BookScooterPressed extends TariffSheetEvent {

15
lib/presentation/screens/add_card_screen.dart
View File

@@ -1,3 +1,4 @@
import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -6,6 +7,7 @@ import '../../core/app_colors.dart';
import '../components/custom_app_bar.dart';
import '../components/card_input_field.dart'; // ← новый импорт
import '../components/utils/card_formatter.dart';
import '../event/payment_methods_event.dart';
import '../viewmodel/add_card_bloc.dart';
import '../event/add_card_event.dart';
import '../state/add_card_state.dart';
@@ -28,7 +30,6 @@ class AddCardScreen extends StatelessWidget {
child: SafeArea(
child: Column(
children: [
// 🔹 ВЕРХНЯЯ ЧАСТЬ (шапка + форма)
Expanded(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -37,7 +38,6 @@ class AddCardScreen extends StatelessWidget {
const CustomAppBar(title: 'Добавление карты'),
const SizedBox(height: 24),
// 🔹 ОСНОВНОЙ КОНТЕЙНЕР С ПОЛЯМИ
Container(
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
@@ -46,7 +46,6 @@ class AddCardScreen extends StatelessWidget {
),
child: Column(
children: [
// Номер карты
BlocBuilder<AddCardBloc, AddCardState>(
builder: (context, state) {
return CardInputField(
@@ -60,7 +59,6 @@ class AddCardScreen extends StatelessWidget {
],
letterSpacing: 2,
onChanged: (value) {
// Очищаем от пробелов перед отправкой в BLoC
final cleanValue = value.replaceAll(' ', '');
context.read<AddCardBloc>().add(CardNumberChanged(cleanValue));
},
@@ -137,7 +135,6 @@ class AddCardScreen extends StatelessWidget {
const SizedBox(height: 20),
// 🔹 КНОПКА "ДОБАВИТЬ КАРТУ"
BlocBuilder<AddCardBloc, AddCardState>(
builder: (context, state) {
return Container(
@@ -153,7 +150,8 @@ class AddCardScreen extends StatelessWidget {
? () => {
context.read<AddCardBloc>().add(
AddCardSubmitted()),
context.go("/home/payment-methods")
context.read<PaymentMethodsBloc>()..add(PaymentMethodsStarted()),
context.pop()
}
: null,
borderRadius: BorderRadius.circular(
@@ -205,7 +203,6 @@ class AddCardScreen extends StatelessWidget {
horizontal: 20, vertical: 24),
child: Column(
children: [
// Текст о безопасности
const Text(
'Мы не сохраняем данные карты у себя. Оплата происходит '
'через сертифицированный провайдер Беларуси bePaid. '
@@ -221,10 +218,6 @@ class AddCardScreen extends StatelessWidget {
),
const SizedBox(height: 24),
// Логотипы платёжных систем
const SizedBox(height: 24),
],
),
),

4
lib/presentation/screens/order_history_detail_screen.dart
View File

@@ -178,7 +178,7 @@ class OrderHistoryDetailScreen extends StatelessWidget {
padding: EdgeInsets.all(4),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.3),
borderRadius: BorderRadius.circular(12), // Опционально: скругление углов
borderRadius: BorderRadius.circular(12),
),
child: Text(
order.status == 'Paid' ? 'ОПЛАЧЕН' : 'НЕ ОПЛАЧЕН',
@@ -262,7 +262,7 @@ class OrderHistoryDetailScreen extends StatelessWidget {
const SizedBox(height: 12),
_DetailRow(
label: 'Страховка',
value: order.isInsurance ? '1 руб' : '—',
value: order.isInsurance ? "${order.insurancePrice} руб." : '—',
),
],
),

20
lib/presentation/screens/pin_login_screen.dart
View File

@@ -3,7 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import '../../core/app_colors.dart';
import '../components/code_dots.dart';
import '../event/map_event.dart';
import '../event/spalsh_event.dart';
import '../viewmodel/map_bloc.dart';
import '../viewmodel/pin_bloc.dart';
import '../event/pin_event.dart';
import '../state/pin_state.dart';
@@ -143,6 +145,24 @@ class _PinLoginScreenState extends State<PinLoginScreen> {
style: const TextStyle(color: AppColors.white70),
),
const SizedBox(height: 20),
if (state is! PinCreateInProgress)
TextButton(
onPressed: () {
context.read<MapBloc>().add(LogoutPressed());
context.read<SplashBloc>().add(AuthCheckRequested());
},
child: const Text(
"Забыли PIN-код?",
style: TextStyle(
color: AppColors.whiteText,
decoration: TextDecoration.underline,
fontSize: 14,
),
),
),
const SizedBox(height: 40),
],

41
lib/presentation/screens/top_up_screen.dart
View File

@@ -2,9 +2,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import '../../core/app_colors.dart';
import '../../di/service_locator.dart';
import '../../domain/entities/payment_card.dart';
import '../../domain/usecase/get_payment_cards_usecase.dart';
import '../components/app_checkbox.dart';
import '../components/custom_app_bar.dart'; // ✅ Уже есть
import '../components/gradient_button.dart';
import '../components/payment_option.dart';
@@ -51,7 +53,6 @@ class TopUpScreen extends StatelessWidget {
),
const SizedBox(height: 15),
_buildCardSelector(state, context),
_buildAddCardButton(() => context.push("/home/payment-methods/add-card")),
const SizedBox(height: 20),
_buildAgreement(state, context),
const Spacer(),
@@ -159,7 +160,6 @@ class TopUpScreen extends StatelessWidget {
subtitle: '****${state.selectedCard!.cardLastNumber}',
isSelected: true,
onTap: () async {
// Открываем модалку как вложенную, не закрывая текущую
final selectedCard = await showModalBottomSheet<PaymentCard>(
context: context,
isScrollControlled: true,
@@ -236,18 +236,22 @@ class TopUpScreen extends StatelessWidget {
Widget _buildAgreement(TopUpState state, BuildContext context) {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Checkbox(
AppCheckbox(
value: state.isAgreed,
onChanged: (v) =>
context.read<TopUpBloc>().add(ToggleAgreement(v ?? false)),
side: const BorderSide(color: Colors.white54),
),
const Expanded(
child: Text(
'Я принимаю условия покупки бонусного пакета, при котором денежные средства не подлежат возврату...',
style: TextStyle(color: Colors.white54, fontSize: 12),
const SizedBox(width: 12),
Flexible(
child: Text.rich(
TextSpan(
text: 'Я принимаю условия покупки бонусного пакета, при котором денежные средства не подлежат возврату... ',
style: const TextStyle(
color: AppColors.white70,
fontSize: 12,
),
),
),
),
],
@@ -266,23 +270,4 @@ class TopUpScreen extends StatelessWidget {
);
}
Widget _buildAddCardButton(VoidCallback onPressed) {
return Padding(
padding: const EdgeInsets.only(top: 10),
child: OutlinedButton.icon(
onPressed: onPressed,
icon: const Icon(Icons.add, color: Colors.white),
label: const Text(
'Добавить платежную карту',
style: TextStyle(color: Colors.white),
),
style: OutlinedButton.styleFrom(
side: const BorderSide(color: Colors.white54),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(30),
),
),
),
);
}
}

4
lib/presentation/state/tariff_sheet_state.dart
View File

@@ -9,6 +9,7 @@ class TariffSheetState {
final List<Tariff> tariffs;
final String? errorMessage;
final PaymentCard? selectedCard;
final bool isInsurance;
final int userBalance;
final bool useBalance ;
@@ -16,6 +17,7 @@ class TariffSheetState {
this.status = TariffSheetStatus.initial,
this.tariffs = const [],
this.selectedCard,
this.isInsurance = false,
this.errorMessage,
this.userBalance = 0,
this.useBalance = false,
@@ -26,6 +28,7 @@ class TariffSheetState {
List<Tariff>? tariffs,
PaymentCard? selectedCard,
String? errorMessage,
bool? isInsurance,
int? userBalance,
bool? useBalance,
@@ -35,6 +38,7 @@ class TariffSheetState {
selectedCard: selectedCard ?? this.selectedCard,
useBalance: useBalance ?? this.useBalance,
userBalance: userBalance ?? this.userBalance,
isInsurance: isInsurance ?? this.isInsurance,
errorMessage: errorMessage ?? this.errorMessage,
);
}

3
lib/presentation/viewmodel/active_ride_bloc.dart
View File

@@ -57,8 +57,6 @@ class ActiveRideBloc extends Bloc<ActiveRideEvent, ActiveRideState> {
if (orderResult is Success<ScooterOrder>) {
final order = orderResult.data;
// Пытаемся достать доп. данные, если они Success
final orderData = activeOrderData is Success<ActiveScooterOrder>
? activeOrderData.data
: null;
@@ -80,7 +78,6 @@ class ActiveRideBloc extends Bloc<ActiveRideEvent, ActiveRideState> {
inZone: orderData?.zone,
));
//synchronize
_syncTimer?.cancel();
_syncTimer = Timer.periodic(const Duration(seconds: 5), (timer) {
add(SyncScooterOrder(event.orderId));

2
lib/presentation/viewmodel/current_rides_bloc.dart
View File

@@ -20,6 +20,8 @@ class CurrentRidesBloc extends Bloc<CurrentRidesEvent, CurrentRidesState> {
) async {
emit(state.copyWith(status: CurrentRidesStatus.loading));
await Future.delayed(const Duration(seconds: 2));
final result = await _getClientOrdersUsecase();
if (result is Success<List<ScooterOrder>>) {

3
lib/presentation/viewmodel/scooter_detail_modal_bloc.dart
View File

@@ -55,10 +55,11 @@ class ScooterDetailModalBloc
final routes = await _getPedestrianRoutesUsecase(
Point(latitude: event.userLatitude, longitude: event.userLongitude),
Point(latitude: scooter.latitude, longitude: scooter.longitude),
Point(latitude: scooter.longitude, longitude: scooter.latitude),
);
final distance = routes?.firstOrNull?.metadata.weight.walkingDistance.value;
print("Distance is: $distance");
final time = routes?.firstOrNull?.metadata.weight.time.value;
if (result is Success<Scooter>) {

31
lib/presentation/viewmodel/tariff_sheet_bloc.dart
View File

@@ -1,4 +1,6 @@
import 'dart:async';
import 'package:be_happy/core/failures.dart';
import 'package:be_happy/domain/entities/scooter_order.dart';
import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
import 'package:collection/collection.dart';
@@ -29,6 +31,7 @@ class TariffSheetBloc extends Bloc<TariffSheetEvent, TariffSheetState> {
on<PaymentCardChanged>(_onPaymentCardChanged);
on<BookScooterPressed>(_onBookScooterPressed);
on<SelectBalancePressed>(_onSelectBalancePressed);
on<InsuranceToggled>(_onInsuranceToggled);
}
Future<void> _onStarted(
@@ -92,12 +95,12 @@ class TariffSheetBloc extends Bloc<TariffSheetEvent, TariffSheetState> {
}
}
FutureOr<void> _onBookScooterPressed(
FutureOr<void> _onBookScooterPressed (
BookScooterPressed event,
Emitter<TariffSheetState> emit,
) {
) async {
try {
_bookScooterUsecase(
final result = await _bookScooterUsecase(
scooterId: event.scooterId,
planId: event.planId,
cardId: event.cardId,
@@ -105,7 +108,23 @@ class TariffSheetBloc extends Bloc<TariffSheetEvent, TariffSheetState> {
isBalance: event.isBalance,
isInsurance: event.isInsurance,
);
Future.delayed(const Duration(milliseconds: 300));
switch (result) {
case Success<ScooterOrder>():
// TODO: Handle this case.
throw UnimplementedError();
case Failure<ScooterOrder>():
if (result is WrongZoneFailure) {
emit(
state.copyWith(
status: TariffSheetStatus.failure,
errorMessage: result.failure.message,
),
);
}
}
} catch (e) {
emit(
state.copyWith(
@@ -125,4 +144,8 @@ class TariffSheetBloc extends Bloc<TariffSheetEvent, TariffSheetState> {
selectedCard: null,
));
}
FutureOr<void> _onInsuranceToggled(InsuranceToggled event, Emitter<TariffSheetState> emit) async {
emit(state.copyWith(isInsurance: event.isEnabled));
}
}