forked from eatvio/eatvio_app
Merge pull request 'fix: issue-1141' (#1146) from misha/eatvio_app:issue-1141 into main
Reviewed-on: eatvio/eatvio_app#1146
This commit is contained in:
@@ -30,6 +30,7 @@ import 'package:eatvio_app/features/chat/utils/chat_counterpart_utils.dart';
|
||||
import 'package:eatvio_app/features/consultations/utils/consultation_progress_mapper.dart';
|
||||
import 'package:eatvio_app/features/order_info/presentation/info_by_order_screen.dart';
|
||||
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
|
||||
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
|
||||
import 'package:eatvio_app/features/user_details/presentation/user_details_screen.dart';
|
||||
import 'package:eatvio_app/features/video_calls/managers/video_call_manager.dart';
|
||||
import 'package:eatvio_app/features/video_calls/presentation/pages/video_call_screen.dart';
|
||||
@@ -72,6 +73,10 @@ class _ChatScreenState extends State<ChatScreen> {
|
||||
|
||||
String? get conversationUuid => _effectiveUuid ?? widget.uuid;
|
||||
|
||||
bool _canStartVideoCall(ChosenPlanModel? chosenPlan) {
|
||||
return chosenPlan?.chosenPlanState.allowsVideoCall ?? false;
|
||||
}
|
||||
|
||||
void _onHide() {
|
||||
chatRoomCubit.cancelTimer();
|
||||
}
|
||||
@@ -205,6 +210,7 @@ class _ChatScreenState extends State<ChatScreen> {
|
||||
chosenPlan != null &&
|
||||
chosenPlan.chosenPlanState !=
|
||||
ChosenPlanStateEnum.stateCanceledByTheInitiator;
|
||||
final showVideoCallButton = _canStartVideoCall(chosenPlan);
|
||||
|
||||
return Scaffold(
|
||||
resizeToAvoidBottomInset: true,
|
||||
@@ -300,12 +306,14 @@ class _ChatScreenState extends State<ChatScreen> {
|
||||
),
|
||||
),
|
||||
actions: [
|
||||
Padding(
|
||||
padding: const EdgeInsetsDirectional.only(end: 8),
|
||||
child: _ChatHeaderVideoCallButton(
|
||||
onPressed: () => _openVideoCall(context, state, chatCounterpart),
|
||||
if (showVideoCallButton)
|
||||
Padding(
|
||||
padding: const EdgeInsetsDirectional.only(end: 8),
|
||||
child: _ChatHeaderVideoCallButton(
|
||||
onPressed: () =>
|
||||
_openVideoCall(context, state, chatCounterpart),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
body: SafeArea(
|
||||
@@ -324,8 +332,7 @@ class _ChatScreenState extends State<ChatScreen> {
|
||||
InfoByOrderScreen.path,
|
||||
extra: {
|
||||
'planId': chosenPlan?.id,
|
||||
'customerSlug':
|
||||
state.chatRoom.users.receiver.slug,
|
||||
'customerSlug': state.chatRoom.users.receiver.slug,
|
||||
},
|
||||
);
|
||||
return;
|
||||
@@ -1018,7 +1025,8 @@ class _ChatScreenState extends State<ChatScreen> {
|
||||
required bool? amIConsultant,
|
||||
}) {
|
||||
if (message.type == ChatMessageType.videoCallStarted &&
|
||||
!isCurrentUserAuthor) {
|
||||
!isCurrentUserAuthor &&
|
||||
_canStartVideoCall(state.chatRoom.chosenPlan)) {
|
||||
return VideoCallChatMessageWidget(
|
||||
text: message.data.trim(),
|
||||
sendTime: message.updatedAt,
|
||||
|
||||
@@ -14,6 +14,7 @@ import 'package:eatvio_app/features/diary/models/nutrition_model.dart';
|
||||
import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
|
||||
import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
|
||||
import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
|
||||
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
|
||||
import 'package:eatvio_app/features/glossary/models/glossary_model.dart';
|
||||
import 'package:eatvio_app/features/glossary/repositories/glossary_repository.dart';
|
||||
import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
|
||||
@@ -38,6 +39,8 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
final ChatRepository chatRepository;
|
||||
final SettingsRepository settingsRepository;
|
||||
int? diaryId;
|
||||
int _fetchGeneration = 0;
|
||||
|
||||
DiaryCubit({
|
||||
required this.chatRepository,
|
||||
required this.diaryRepository,
|
||||
@@ -61,14 +64,21 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
selectedDay = date;
|
||||
}
|
||||
|
||||
bool _isCurrentFetch(int generation) => generation == _fetchGeneration;
|
||||
|
||||
Future<bool> setSelectedDay(DateTime day) async {
|
||||
final prevDay = selectedDay;
|
||||
final prevMeal = selectedMeal;
|
||||
selectedDay = day;
|
||||
selectedMeal = 1;
|
||||
final canSelect = await fetchDiaryV2(needLoading: true);
|
||||
final generation = ++_fetchGeneration;
|
||||
final canSelect = await fetchDiaryV2(needLoading: true, generation: generation);
|
||||
|
||||
if (!canSelect) {
|
||||
if (!_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!canSelect && state is! DiaryStateError) {
|
||||
selectedDay = prevDay;
|
||||
selectedMeal = prevMeal;
|
||||
}
|
||||
@@ -76,22 +86,33 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
return canSelect;
|
||||
}
|
||||
|
||||
Future<bool> fetchDiaryV2({bool needLoading = false, int? diaryId}) async {
|
||||
Future<bool> fetchDiaryV2({bool needLoading = false, int? diaryId, int? generation}) async {
|
||||
final request = generation ?? ++_fetchGeneration;
|
||||
final requestedDay = selectedDay;
|
||||
final currentState = state;
|
||||
try {
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
if (needLoading) {
|
||||
emit(const DiaryState.loading());
|
||||
}
|
||||
if (diaryId != null) {
|
||||
final diaryDayById = await diaryRepository.getDiaryDay(diaryId);
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
final diaryEntity = diaryDayById.toEntity();
|
||||
if (diaryEntity != null) {
|
||||
setDiary(diaryDay: diaryEntity, diaryId: diaryId);
|
||||
return true;
|
||||
await setDiary(diaryDay: diaryEntity, diaryId: diaryId, generation: request);
|
||||
return _isCurrentFetch(request);
|
||||
}
|
||||
}
|
||||
|
||||
final diaryDay = await getDiary();
|
||||
final diaryDay = await getDiary(day: requestedDay);
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
if (diaryDay == null) {
|
||||
emit(const DiaryState.error(errorMessage: 'Diary not found'));
|
||||
return true;
|
||||
@@ -99,16 +120,26 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
|
||||
final diaryEntity = diaryDay.toEntity();
|
||||
if (diaryEntity != null) {
|
||||
setDiary(diaryDay: diaryEntity, diaryId: diaryId);
|
||||
return true;
|
||||
await setDiary(diaryDay: diaryEntity, diaryId: diaryId, generation: request);
|
||||
return _isCurrentFetch(request);
|
||||
}
|
||||
if (diaryDay.typeOfDiary.hasChosenDiet == true && diaryDay.typeOfDiary.diaryState == null) {
|
||||
setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity());
|
||||
return true;
|
||||
|
||||
if (_isUnsavedDietPreview(diaryDay)) {
|
||||
final shown = await setDiaryForDietOnly(diaryDay.toDiaryFutureDayEntity(), generation: request);
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
if (!shown && state is DiaryStateLoading) {
|
||||
emit(currentState);
|
||||
}
|
||||
return shown;
|
||||
}
|
||||
emit(currentState);
|
||||
return false;
|
||||
} catch (e, st) {
|
||||
if (!_isCurrentFetch(request)) {
|
||||
return false;
|
||||
}
|
||||
await reportFrom(e, st, this);
|
||||
log(e.toString(), stackTrace: st);
|
||||
emit(DiaryState.error(errorMessage: e.toString()));
|
||||
@@ -129,17 +160,18 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<DiaryDayModel?> getDiary() async {
|
||||
Future<DiaryDayModel?> getDiary({DateTime? day}) async {
|
||||
final requestedDay = (day ?? selectedDay).toISO8601WithTimeZoneOffset();
|
||||
try {
|
||||
await diaryRepository.createDiaryDay(day: selectedDay.toISO8601WithTimeZoneOffset());
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: selectedDay.toISO8601WithTimeZoneOffset());
|
||||
await diaryRepository.createDiaryDay(day: requestedDay);
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: requestedDay);
|
||||
return diaryDay;
|
||||
} catch (e, st) {
|
||||
await reportFrom(e, st, this);
|
||||
log(e.toString(), stackTrace: st);
|
||||
if (e is DioException) {
|
||||
if (e.response?.statusCode == 422) {
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: selectedDay.toISO8601WithTimeZoneOffset());
|
||||
final diaryDay = await diaryRepository.getDiaryDayV2(day: requestedDay);
|
||||
return diaryDay;
|
||||
}
|
||||
}
|
||||
@@ -157,92 +189,83 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay) async {
|
||||
if (!diaryDay.typeOfDiary.hasChosenDiet) {
|
||||
bool _isUnsavedDietPreview(DiaryDayModel diaryDay) {
|
||||
final diaryState = diaryDay.typeOfDiary.diaryState;
|
||||
final dayNotStarted = diaryState == null || diaryState == DiaryStateEnum.init;
|
||||
return diaryDay.typeOfDiary.hasChosenDiet && dayNotStarted;
|
||||
}
|
||||
|
||||
Future<bool> setDiaryForDietOnly(DiaryFutureDietDayEntity diaryDay, {int? generation}) async {
|
||||
final dietId = diaryDay.diet?.id;
|
||||
final dayOfChosenDiet = diaryDay.dayOfChosenDiet;
|
||||
if (!diaryDay.typeOfDiary.hasChosenDiet || dietId == null || dayOfChosenDiet == null) {
|
||||
return false;
|
||||
}
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
emit(const DiaryState.loading());
|
||||
try {
|
||||
if (diaryDay.diet?.id != null && diaryDay.dayOfChosenDiet != null) {
|
||||
final diet = await dietRepository.getDiet((diaryDay.diet?.id)!);
|
||||
final meals = diet.dailySchedule[diaryDay.dayOfChosenDiet];
|
||||
final firstMealPortions = meals?[1]?.values.map((elem) {
|
||||
return PortionModel(
|
||||
id: 0,
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
);
|
||||
}).toList();
|
||||
final diet = await dietRepository.getDiet(dietId);
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
final meals = diet.dailySchedule[dayOfChosenDiet];
|
||||
List<PortionModel> portionsOfMeal(int mealNumber) {
|
||||
return meals?[mealNumber]?.values.map(_portionFromDiet).toList() ?? [];
|
||||
}
|
||||
|
||||
final secondMealPortions = meals?[2]?.values.map((elem) {
|
||||
return PortionModel(
|
||||
id: 0,
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
);
|
||||
}).toList();
|
||||
MealModel meal(int mealNumber) {
|
||||
return MealModel(id: 0, time: '0', typeNumber: mealNumber, satiety: 0, mood: 0, portions: portionsOfMeal(mealNumber), photos: []);
|
||||
}
|
||||
|
||||
final thirdMealPortions = meals?[3]?.values.map((elem) {
|
||||
return PortionModel(
|
||||
id: 0,
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
);
|
||||
}).toList();
|
||||
|
||||
final fourthMealPortions = meals?[4]?.values.map((elem) {
|
||||
return PortionModel(
|
||||
id: 0,
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
);
|
||||
}).toList();
|
||||
|
||||
final fifthMealPortions = meals?[5]?.values.map((elem) {
|
||||
return PortionModel(
|
||||
id: 0,
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
);
|
||||
}).toList();
|
||||
final firstMeal = MealModel(id: 0, time: '0', typeNumber: 1, satiety: 0, mood: 0, portions: firstMealPortions ?? [], photos: []);
|
||||
final secondMeal = MealModel(id: 0, time: '0', typeNumber: 2, satiety: 0, mood: 0, portions: secondMealPortions ?? [], photos: []);
|
||||
final thirdMeal = MealModel(id: 0, time: '0', typeNumber: 3, satiety: 0, mood: 0, portions: thirdMealPortions ?? [], photos: []);
|
||||
final fourthMeal = MealModel(id: 0, time: '0', typeNumber: 4, satiety: 0, mood: 0, portions: fourthMealPortions ?? [], photos: []);
|
||||
final fifthMeal = MealModel(id: 0, time: '0', typeNumber: 5, satiety: 0, mood: 0, portions: fifthMealPortions ?? [], photos: []);
|
||||
emit(
|
||||
DiaryState.loadedTomorrowWithDiet(
|
||||
diary: diaryDay.copyWith(meals: [firstMeal, secondMeal, thirdMeal, fourthMeal, fifthMeal]),
|
||||
diary: diaryDay.copyWith(meals: [meal(1), meal(2), meal(3), meal(4), meal(5)]),
|
||||
selectedDay: selectedDay,
|
||||
selectedMeal: selectedMeal,
|
||||
),
|
||||
);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return true;
|
||||
} catch (e, st) {
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return false;
|
||||
}
|
||||
await reportFrom(e, st, this);
|
||||
emit(DiaryState.error(errorMessage: e.toString()));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> setDiary({int? diaryId, required DiaryDayEntity diaryDay}) async {
|
||||
PortionModel _portionFromDiet(DailySchedule elem) {
|
||||
final nutrition = elem.dailyNutrition;
|
||||
final per100 = elem.portion == Portion.grams && elem.quantity > 0 ? 100 / elem.quantity : 1.0;
|
||||
return PortionModel(
|
||||
id: 0,
|
||||
productNutritionalValueId: elem.productNutritionalValueId,
|
||||
productCaloriesInfo: nutrition == null
|
||||
? null
|
||||
: ProductCaloriesInfoModel(
|
||||
id: elem.productNutritionalValueId ?? 0,
|
||||
productName: elem.name,
|
||||
calories: nutrition.energy * per100,
|
||||
proteins: nutrition.proteins * per100,
|
||||
fats: nutrition.fats * per100,
|
||||
carbohydrates: nutrition.carbohydrates * per100,
|
||||
energyOnPortion: nutrition.energy,
|
||||
proteinsOnPortion: nutrition.proteins,
|
||||
fatsOnPortion: nutrition.fats,
|
||||
carbohydratesOnPortion: nutrition.carbohydrates,
|
||||
),
|
||||
productName: elem.name,
|
||||
quantity: elem.quantity,
|
||||
portion: elem.portion.getValue(),
|
||||
fromDiet: true,
|
||||
portionState: PortionState.filledDiet,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> setDiary({int? diaryId, required DiaryDayEntity diaryDay, int? generation}) async {
|
||||
this.diaryId ??= diaryId;
|
||||
final isConsultantView = this.diaryId != null;
|
||||
try {
|
||||
@@ -270,6 +293,9 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
currentPlanDay = consultantReview.currentPlanDay;
|
||||
}
|
||||
final nutrition = await getNutrition(diaryDay.id);
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return;
|
||||
}
|
||||
|
||||
final isDiaryFinished = diaryDay.typeOfDiary.diaryState == DiaryStateEnum.finished || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayFinished;
|
||||
|
||||
@@ -295,6 +321,9 @@ class DiaryCubit extends Cubit<DiaryState> {
|
||||
),
|
||||
);
|
||||
} catch (e, st) {
|
||||
if (generation != null && !_isCurrentFetch(generation)) {
|
||||
return;
|
||||
}
|
||||
await reportFrom(e, st, this);
|
||||
log(e.toString(), stackTrace: st);
|
||||
emit(DiaryState.error(errorMessage: e.toString()));
|
||||
|
||||
@@ -22,12 +22,26 @@ class _CalendarWidgetState extends State<CalendarWidget> {
|
||||
CalendarFormat _calendarFormat = CalendarFormat.week;
|
||||
DateTime _focusedDay = DateTime.now();
|
||||
DateTime _selectedDay = DateTime.now();
|
||||
DateTime? _dayFromState(DiaryState state) {
|
||||
if (state is DiaryStateLoaded) {
|
||||
return state.selectedDay;
|
||||
}
|
||||
if (state is DiaryStateLoadedTomorrowWithDiet) {
|
||||
return state.selectedDay;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
final selected = _dayFromState(context.read<DiaryCubit>().state);
|
||||
if (widget.date != null) {
|
||||
_selectedDay = widget.date!;
|
||||
_focusedDay = widget.date!;
|
||||
} else if (selected != null) {
|
||||
_selectedDay = selected;
|
||||
_focusedDay = selected;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,9 +61,11 @@ class _CalendarWidgetState extends State<CalendarWidget> {
|
||||
final daysOfWeekHeight = _scaledDaysOfWeekHeight(context);
|
||||
return BlocConsumer<DiaryCubit, DiaryState>(
|
||||
listener: (BuildContext context, DiaryState state) {
|
||||
if (state is DiaryStateLoaded) {
|
||||
final selected = _dayFromState(state);
|
||||
if (selected != null) {
|
||||
setState(() {
|
||||
_selectedDay = state.selectedDay;
|
||||
_selectedDay = selected;
|
||||
_focusedDay = selected;
|
||||
});
|
||||
}
|
||||
},
|
||||
@@ -77,8 +93,12 @@ class _CalendarWidgetState extends State<CalendarWidget> {
|
||||
_selectedDay = selectedDay;
|
||||
_focusedDay = focusedDay;
|
||||
});
|
||||
final canOpenNextDay = await context.read<DiaryCubit>().setSelectedDay(selectedDay);
|
||||
if (!canOpenNextDay && context.mounted) {
|
||||
final cubit = context.read<DiaryCubit>();
|
||||
final canOpenNextDay = await cubit.setSelectedDay(selectedDay);
|
||||
if (!context.mounted || cubit.state is DiaryStateError) {
|
||||
return;
|
||||
}
|
||||
if (!canOpenNextDay) {
|
||||
showErrorDialog(context, title: s.want_to_see_tomorrow, description: s.can_not_see_next_day);
|
||||
setState(() {
|
||||
_selectedDay = previousSelectedDay;
|
||||
|
||||
@@ -88,6 +88,18 @@ enum ChosenPlanStateEnum {
|
||||
}
|
||||
}
|
||||
|
||||
bool get allowsVideoCall {
|
||||
switch (this) {
|
||||
case ChosenPlanStateEnum.stateCanceledByTheInitiator:
|
||||
case ChosenPlanStateEnum.statePaymentFailed:
|
||||
case ChosenPlanStateEnum.stateDone:
|
||||
case ChosenPlanStateEnum.stateChargeWasCollected:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
static List<ChosenPlanStateEnum> getActiveStates() {
|
||||
return [
|
||||
ChosenPlanStateEnum.statePaid,
|
||||
|
||||
@@ -61,6 +61,9 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
|
||||
return;
|
||||
}
|
||||
final position = _scrollController.position;
|
||||
if (position.maxScrollExtent <= 0 || position.pixels < 0) {
|
||||
return;
|
||||
}
|
||||
if (position.pixels >= position.maxScrollExtent - 200) {
|
||||
context.read<VideoCallRecordingsCubit>().loadNextPage();
|
||||
}
|
||||
@@ -170,14 +173,29 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
|
||||
}
|
||||
|
||||
if (state.recordings.isEmpty) {
|
||||
return Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Text(
|
||||
s.video_call_recordings_empty,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyles.textMMedium.copyWith(color: appTheme.blueGray400),
|
||||
),
|
||||
return RefreshIndicator(
|
||||
onRefresh: () => context.read<VideoCallRecordingsCubit>().load(refresh: true),
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
return ListView(
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
children: [
|
||||
ConstrainedBox(
|
||||
constraints: BoxConstraints(minHeight: constraints.maxHeight),
|
||||
child: Center(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(24),
|
||||
child: Text(
|
||||
s.video_call_recordings_empty,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyles.textMMedium.copyWith(color: appTheme.blueGray400),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -186,6 +204,7 @@ class _VideoCallRecordingsViewState extends State<_VideoCallRecordingsView> {
|
||||
onRefresh: () => context.read<VideoCallRecordingsCubit>().load(refresh: true),
|
||||
child: ListView.separated(
|
||||
controller: _scrollController,
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
|
||||
itemCount: state.recordings.length + (state.isLoadingMore ? 1 : 0),
|
||||
separatorBuilder: (_, _) => const SizedBox(height: 16),
|
||||
|
||||
@@ -8,7 +8,7 @@ class PublicDownloadsSaver {
|
||||
const PublicDownloadsSaver();
|
||||
|
||||
/// Имя папки приложения в Загрузках / Files.
|
||||
static const appFolderName = 'Itvio';
|
||||
static const appFolderName = 'Eatvio';
|
||||
|
||||
Future<String> saveToDownloads({
|
||||
required String sourcePath,
|
||||
|
||||
@@ -19,7 +19,7 @@ class VideoCallRecordingFileService {
|
||||
final Dio dio;
|
||||
final PublicDownloadsSaver downloadsSaver;
|
||||
|
||||
/// Скачивает запись и сохраняет в `Загрузки/Itvio` (Android)
|
||||
/// Скачивает запись и сохраняет в `Загрузки/Eatvio` (Android)
|
||||
/// или Documents приложения (iOS, видно в Files).
|
||||
Future<String> downloadRecordingFile({
|
||||
required String fileUrl,
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:intl/message_lookup_by_library.dart';
|
||||
import 'package:intl/src/intl_helpers.dart';
|
||||
@@ -21,8 +20,8 @@ import 'messages_ru.dart' as messages_ru;
|
||||
|
||||
typedef Future<dynamic> LibraryLoader();
|
||||
Map<String, LibraryLoader> _deferredLibraries = {
|
||||
'en': () => new SynchronousFuture(null),
|
||||
'ru': () => new SynchronousFuture(null),
|
||||
'en': () => new Future.value(null),
|
||||
'ru': () => new Future.value(null),
|
||||
};
|
||||
|
||||
MessageLookupByLibrary? _findExact(String localeName) {
|
||||
@@ -37,20 +36,18 @@ MessageLookupByLibrary? _findExact(String localeName) {
|
||||
}
|
||||
|
||||
/// User programs should call this before using [localeName] for messages.
|
||||
Future<bool> initializeMessages(String localeName) {
|
||||
Future<bool> initializeMessages(String localeName) async {
|
||||
var availableLocale = Intl.verifiedLocale(
|
||||
localeName,
|
||||
(locale) => _deferredLibraries[locale] != null,
|
||||
onFailure: (_) => null,
|
||||
);
|
||||
localeName, (locale) => _deferredLibraries[locale] != null,
|
||||
onFailure: (_) => null);
|
||||
if (availableLocale == null) {
|
||||
return new SynchronousFuture(false);
|
||||
return new Future.value(false);
|
||||
}
|
||||
var lib = _deferredLibraries[availableLocale];
|
||||
lib == null ? new SynchronousFuture(false) : lib();
|
||||
await (lib == null ? new Future.value(false) : lib());
|
||||
initializeInternalMessageLookup(() => new CompositeMessageLookup());
|
||||
messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
|
||||
return new SynchronousFuture(true);
|
||||
return new Future.value(true);
|
||||
}
|
||||
|
||||
bool _messagesExistFor(String locale) {
|
||||
@@ -62,11 +59,8 @@ bool _messagesExistFor(String locale) {
|
||||
}
|
||||
|
||||
MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
|
||||
var actualLocale = Intl.verifiedLocale(
|
||||
locale,
|
||||
_messagesExistFor,
|
||||
onFailure: (_) => null,
|
||||
);
|
||||
var actualLocale =
|
||||
Intl.verifiedLocale(locale, _messagesExistFor, onFailure: (_) => null);
|
||||
if (actualLocale == null) return null;
|
||||
return _findExact(actualLocale);
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -829,7 +829,7 @@
|
||||
}
|
||||
},
|
||||
"video_call_recordings_download_error": "Could not download the recording. Please try again later.",
|
||||
"video_call_recordings_download_success": "Recording saved to Downloads/Itvio",
|
||||
"video_call_recordings_download_success": "Recording saved to Downloads/Eatvio",
|
||||
"video_call_recordings_download_success_ios": "Recording saved to the Files app",
|
||||
"video_call_recordings_player_error": "Could not play the recording",
|
||||
"video_call_recordings_card_title": "Video consultation with a nutrition specialist",
|
||||
|
||||
@@ -584,7 +584,7 @@
|
||||
}
|
||||
},
|
||||
"video_call_recordings_download_error": "Не удалось скачать запись. Попробуйте позже.",
|
||||
"video_call_recordings_download_success": "Запись сохранена в Загрузки/Itvio",
|
||||
"video_call_recordings_download_success": "Запись сохранена в Загрузки/Eatvio",
|
||||
"video_call_recordings_download_success_ios": "Запись сохранена в приложении «Файлы»",
|
||||
"video_call_recordings_player_error": "Не удалось воспроизвести запись",
|
||||
"video_call_recordings_card_title": "Видеоконсультация со специалистом по питанию",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: eatvio_app
|
||||
description: A new Flutter project.
|
||||
version: 1.3.72+161
|
||||
version: 1.3.74+163
|
||||
publish_to: 'none'
|
||||
|
||||
environment:
|
||||
|
||||
@@ -86,6 +86,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -108,6 +109,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -131,6 +133,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -153,6 +156,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -175,6 +179,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -196,6 +201,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -217,6 +223,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -237,6 +244,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -257,6 +265,7 @@ void main() {
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pump();
|
||||
await tester.tap(find.byIcon(Icons.more_horiz_rounded));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
|
||||
@@ -12,6 +12,12 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
|
||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart';
|
||||
import 'package:eatvio_app/features/chat/presentation/bloc/chats_cubit/chats_state.dart';
|
||||
import 'package:eatvio_app/features/chat/presentation/pages/chat_screen.dart';
|
||||
import 'package:eatvio_app/features/chat/presentation/widgets/video_call_chat_message_widget.dart';
|
||||
import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
|
||||
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
|
||||
import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
|
||||
import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
|
||||
import 'package:eatvio_app/generated/l10n.dart';
|
||||
import 'package:material_ui/material_ui.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
||||
@@ -55,13 +61,57 @@ void main() {
|
||||
|
||||
final fakeBundle = _FakeAssetBundle({
|
||||
'assets/icons/error_icon.svg': fakeSvg,
|
||||
'assets/icons/video_call/vc_control_enter.svg': fakeSvg,
|
||||
});
|
||||
|
||||
const plan = PlanModel(
|
||||
id: 1,
|
||||
slug: 'test-plan',
|
||||
name: 'Test Plan',
|
||||
image: 'https://example.com/image.jpg',
|
||||
duration: 30,
|
||||
state: 'active',
|
||||
type: PlanType(fit: true, slim: false, behavior: false, wellness: false),
|
||||
details: 'Test details',
|
||||
packetsCount: 3,
|
||||
author: Author(
|
||||
authorSlug: 'author',
|
||||
authorName: 'Author Name',
|
||||
authorProfileIcon: 'https://example.com/icon.jpg',
|
||||
authorIsMe: false,
|
||||
),
|
||||
totalLikes: 10,
|
||||
totalViews: 100,
|
||||
totalComments: 5,
|
||||
isFavorite: false,
|
||||
minPriceOfOptions: 1000,
|
||||
maxPriceOfOptions: 2000,
|
||||
wasLikedByMe: false,
|
||||
);
|
||||
|
||||
ChosenPlanModel chosenPlan(ChosenPlanStateEnum state) {
|
||||
return ChosenPlanModel(
|
||||
id: 7,
|
||||
optionType: 'options1',
|
||||
startDate: DateTime(2025, 1, 1),
|
||||
chosenPlanState: state,
|
||||
chatId: '1',
|
||||
consultantId: 2,
|
||||
plan: plan,
|
||||
);
|
||||
}
|
||||
|
||||
Widget wrap(Widget child, ChatsCubit chatsCubit) {
|
||||
return DefaultAssetBundle(
|
||||
bundle: fakeBundle,
|
||||
child: MaterialApp(
|
||||
theme: ThemeHelper().themeData(),
|
||||
locale: const Locale('ru'),
|
||||
localizationsDelegates: const [
|
||||
S.delegate,
|
||||
...GlobalMaterialLocalizations.delegates,
|
||||
],
|
||||
supportedLocales: S.delegate.supportedLocales,
|
||||
home: BlocProvider<ChatsCubit>.value(value: chatsCubit, child: child),
|
||||
),
|
||||
);
|
||||
@@ -202,9 +252,133 @@ void main() {
|
||||
expect(find.text('sending...'), findsOneWidget);
|
||||
expect(find.text('tap to retry'), findsOneWidget);
|
||||
expect(find.text('file.pdf'), findsOneWidget);
|
||||
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
|
||||
VisibilityDetectorController.instance.notifyNow();
|
||||
await tester.pump();
|
||||
});
|
||||
|
||||
Future<void> pumpLoadedChat(
|
||||
WidgetTester tester, {
|
||||
ChosenPlanModel? plan,
|
||||
List<ChatMessageModel> messages = const [],
|
||||
}) async {
|
||||
final chatRoomCubit = MockChatRoomCubit();
|
||||
final chatsCubit = MockChatsCubit();
|
||||
const chatRoom = ChatRoomModel(
|
||||
id: '1',
|
||||
chatRoomSettings: ChatRoomSettingsModel(name: 'room', state: 'active'),
|
||||
users: Users(
|
||||
sender: ChatUserModel(
|
||||
id: 1,
|
||||
name: 'Me',
|
||||
slug: 'me',
|
||||
profilePhotoUrl: null,
|
||||
),
|
||||
receiver: ChatUserModel(
|
||||
id: 2,
|
||||
name: 'User Two',
|
||||
slug: 'user-two',
|
||||
profilePhotoUrl: null,
|
||||
),
|
||||
),
|
||||
chosenPlanId: 7,
|
||||
chosenPlan: null,
|
||||
);
|
||||
final state = ChatRoomState.loaded(
|
||||
chatRoom: chatRoom.copyWith(chosenPlan: plan),
|
||||
chatMessages: messages,
|
||||
hasCard: false,
|
||||
isTyping: false,
|
||||
isLoading: false,
|
||||
);
|
||||
|
||||
when(chatRoomCubit.state).thenReturn(state);
|
||||
when(
|
||||
chatRoomCubit.stream,
|
||||
).thenAnswer((_) => const Stream<ChatRoomState>.empty());
|
||||
when(chatRoomCubit.close()).thenAnswer((_) async => Future<void>.value());
|
||||
when(
|
||||
chatRoomCubit.initChat(
|
||||
any,
|
||||
sendInitialMessage: anyNamed('sendInitialMessage'),
|
||||
orderId: anyNamed('orderId'),
|
||||
),
|
||||
).thenAnswer((_) async => 'uuid');
|
||||
when(chatRoomCubit.setTimer()).thenReturn(null);
|
||||
when(chatRoomCubit.refreshChat()).thenAnswer((_) async {});
|
||||
|
||||
if (sl.isRegistered<ChatRoomCubit>()) {
|
||||
sl.unregister<ChatRoomCubit>();
|
||||
}
|
||||
sl.registerFactory<ChatRoomCubit>(() => chatRoomCubit);
|
||||
|
||||
when(chatsCubit.state).thenReturn(ChatsState());
|
||||
when(chatsCubit.stream).thenAnswer((_) => const Stream.empty());
|
||||
when(chatsCubit.close()).thenAnswer((_) async => Future<void>.value());
|
||||
|
||||
await tester.pumpWidget(
|
||||
wrap(
|
||||
const ChatScreen(uuid: 'uuid', sendInitialMessage: false),
|
||||
chatsCubit,
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 200));
|
||||
}
|
||||
|
||||
ChatMessageModel incomingCallMessage() {
|
||||
return ChatMessageModel(
|
||||
id: 9,
|
||||
data: 'Видеозвонок',
|
||||
mediaData: const [],
|
||||
authorId: 2,
|
||||
updatedAt: DateTime(2025, 1, 2, 11),
|
||||
isRead: true,
|
||||
isCurrentUserAuthor: false,
|
||||
roomId: '1',
|
||||
type: ChatMessageType.videoCallStarted,
|
||||
messageState: MessageState.sent,
|
||||
uuid: 'call',
|
||||
);
|
||||
}
|
||||
|
||||
testWidgets('shows the call button for an active consultation', (
|
||||
tester,
|
||||
) async {
|
||||
await pumpLoadedChat(
|
||||
tester,
|
||||
plan: chosenPlan(ChosenPlanStateEnum.stateInProgress),
|
||||
messages: [incomingCallMessage()],
|
||||
);
|
||||
|
||||
expect(find.byIcon(Icons.videocam_rounded), findsOneWidget);
|
||||
expect(find.byType(VideoCallChatMessageWidget), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('hides the call button for a finished consultation', (
|
||||
tester,
|
||||
) async {
|
||||
await pumpLoadedChat(
|
||||
tester,
|
||||
plan: chosenPlan(ChosenPlanStateEnum.stateDone),
|
||||
messages: [incomingCallMessage()],
|
||||
);
|
||||
|
||||
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
|
||||
expect(find.byType(VideoCallChatMessageWidget), findsNothing);
|
||||
expect(find.text('Видеозвонок'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('hides the call button for a canceled consultation', (
|
||||
tester,
|
||||
) async {
|
||||
await pumpLoadedChat(
|
||||
tester,
|
||||
plan: chosenPlan(ChosenPlanStateEnum.stateCanceledByTheInitiator),
|
||||
);
|
||||
|
||||
expect(find.byIcon(Icons.videocam_rounded), findsNothing);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,11 @@ Widget _wrap(Widget child) {
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _pump(WidgetTester tester, Widget child) async {
|
||||
await tester.pumpWidget(_wrap(child));
|
||||
await tester.pump();
|
||||
}
|
||||
|
||||
void main() {
|
||||
group('ChatConsultationHeader', () {
|
||||
testWidgets('вызывает onInfoTap по тапу на info', (tester) async {
|
||||
@@ -27,13 +32,12 @@ void main() {
|
||||
hasPersonalDiet: false,
|
||||
);
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(
|
||||
ChatConsultationHeader(
|
||||
progress: progress,
|
||||
showInfoButton: true,
|
||||
onInfoTap: () => tapped++,
|
||||
),
|
||||
await _pump(
|
||||
tester,
|
||||
ChatConsultationHeader(
|
||||
progress: progress,
|
||||
showInfoButton: true,
|
||||
onInfoTap: () => tapped++,
|
||||
),
|
||||
);
|
||||
|
||||
@@ -54,13 +58,12 @@ void main() {
|
||||
expect(progress.showProgressPlank, isTrue);
|
||||
expect(progress.dietStatus, PersonalDietStatus.proposed);
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(
|
||||
ChatConsultationHeader(
|
||||
progress: progress,
|
||||
showInfoButton: false,
|
||||
onInfoTap: () {},
|
||||
),
|
||||
await _pump(
|
||||
tester,
|
||||
ChatConsultationHeader(
|
||||
progress: progress,
|
||||
showInfoButton: false,
|
||||
onInfoTap: () {},
|
||||
),
|
||||
);
|
||||
|
||||
|
||||
@@ -15,6 +15,11 @@ Widget _wrap(Widget child) {
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _pump(WidgetTester tester, Widget child) async {
|
||||
await tester.pumpWidget(_wrap(child));
|
||||
await tester.pump();
|
||||
}
|
||||
|
||||
void main() {
|
||||
group('ConsultationProgressPlank', () {
|
||||
testWidgets('не строит шаги при showProgressPlank=false', (tester) async {
|
||||
@@ -24,9 +29,7 @@ void main() {
|
||||
);
|
||||
expect(progress.showProgressPlank, isFalse);
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(ConsultationProgressPlank(progress: progress)),
|
||||
);
|
||||
await _pump(tester, ConsultationProgressPlank(progress: progress));
|
||||
|
||||
expect(
|
||||
find.descendant(
|
||||
@@ -48,9 +51,7 @@ void main() {
|
||||
);
|
||||
expect(progress.showProgressPlank, isTrue);
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(ConsultationProgressPlank(progress: progress)),
|
||||
);
|
||||
await _pump(tester, ConsultationProgressPlank(progress: progress));
|
||||
|
||||
final s = S.of(tester.element(find.byType(ConsultationProgressPlank)));
|
||||
|
||||
@@ -70,12 +71,11 @@ void main() {
|
||||
hasPersonalDiet: false,
|
||||
);
|
||||
|
||||
await tester.pumpWidget(
|
||||
_wrap(
|
||||
SizedBox(
|
||||
width: 360,
|
||||
child: ConsultationProgressPlank(progress: progress),
|
||||
),
|
||||
await _pump(
|
||||
tester,
|
||||
SizedBox(
|
||||
width: 360,
|
||||
child: ConsultationProgressPlank(progress: progress),
|
||||
),
|
||||
);
|
||||
|
||||
|
||||
@@ -15,6 +15,11 @@ Widget _wrap(Widget child) {
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _pump(WidgetTester tester, Widget child) async {
|
||||
await tester.pumpWidget(_wrap(child));
|
||||
await tester.pump();
|
||||
}
|
||||
|
||||
Widget _chip(
|
||||
ChosenPlanStateEnum state, {
|
||||
bool hasPersonalDiet = true,
|
||||
@@ -32,9 +37,7 @@ Widget _chip(
|
||||
void main() {
|
||||
group('PersonalDietStatusChip', () {
|
||||
testWidgets('notRequired + active ничего не показывает', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
_wrap(_chip(ChosenPlanStateEnum.stateInited, hasPersonalDiet: false)),
|
||||
);
|
||||
await _pump(tester, _chip(ChosenPlanStateEnum.stateInited, hasPersonalDiet: false));
|
||||
|
||||
expect(
|
||||
find.descendant(
|
||||
@@ -47,7 +50,7 @@ void main() {
|
||||
});
|
||||
|
||||
testWidgets('proposed показывает personal_diet_proposed', (tester) async {
|
||||
await tester.pumpWidget(_wrap(_chip(ChosenPlanStateEnum.stateStarted)));
|
||||
await _pump(tester, _chip(ChosenPlanStateEnum.stateStarted));
|
||||
|
||||
final s = S.of(tester.element(find.byType(PersonalDietStatusChip)));
|
||||
|
||||
@@ -55,12 +58,11 @@ void main() {
|
||||
});
|
||||
|
||||
testWidgets('proposed с названием показывает имя диеты', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
_wrap(
|
||||
_chip(
|
||||
ChosenPlanStateEnum.stateStarted,
|
||||
personalDietName: 'Индивидуальный план питания',
|
||||
),
|
||||
await _pump(
|
||||
tester,
|
||||
_chip(
|
||||
ChosenPlanStateEnum.stateStarted,
|
||||
personalDietName: 'Индивидуальный план питания',
|
||||
),
|
||||
);
|
||||
|
||||
@@ -75,7 +77,7 @@ void main() {
|
||||
testWidgets('notProposed показывает personal_diet_not_proposed', (
|
||||
tester,
|
||||
) async {
|
||||
await tester.pumpWidget(_wrap(_chip(ChosenPlanStateEnum.statePaid)));
|
||||
await _pump(tester, _chip(ChosenPlanStateEnum.statePaid));
|
||||
|
||||
final s = S.of(tester.element(find.byType(PersonalDietStatusChip)));
|
||||
|
||||
@@ -83,9 +85,7 @@ void main() {
|
||||
});
|
||||
|
||||
testWidgets('canceled показывает orderCanceled', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
_wrap(_chip(ChosenPlanStateEnum.stateCanceledByTheInitiator)),
|
||||
);
|
||||
await _pump(tester, _chip(ChosenPlanStateEnum.stateCanceledByTheInitiator));
|
||||
|
||||
final s = S.of(tester.element(find.byType(PersonalDietStatusChip)));
|
||||
|
||||
@@ -93,9 +93,7 @@ void main() {
|
||||
});
|
||||
|
||||
testWidgets('paymentFailed показывает payment_failed', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
_wrap(_chip(ChosenPlanStateEnum.statePaymentFailed)),
|
||||
);
|
||||
await _pump(tester, _chip(ChosenPlanStateEnum.statePaymentFailed));
|
||||
|
||||
final s = S.of(tester.element(find.byType(PersonalDietStatusChip)));
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -34,6 +34,7 @@ void main() {
|
||||
|
||||
testWidgets('показывает заголовок Есть промокод? и кнопки Применить/Пропустить', (tester) async {
|
||||
await tester.pumpWidget(createTestWidget());
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -44,6 +45,7 @@ void main() {
|
||||
|
||||
testWidgets('Применить с пустым полем показывает ошибку и не закрывает', (tester) async {
|
||||
await tester.pumpWidget(createTestWidget());
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -64,6 +66,7 @@ void main() {
|
||||
},
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -78,6 +81,7 @@ void main() {
|
||||
|
||||
testWidgets('Пропустить закрывает шторку', (tester) async {
|
||||
await tester.pumpWidget(createTestWidget());
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -101,6 +105,7 @@ void main() {
|
||||
onRemove: () async => true,
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -128,6 +133,7 @@ void main() {
|
||||
},
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
@@ -156,6 +162,7 @@ void main() {
|
||||
},
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('Open'));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
|
||||
@@ -98,6 +98,7 @@ void main() {
|
||||
|
||||
await tester.pumpWidget(createTestWidget(planId: planId));
|
||||
await tester.pump();
|
||||
await tester.pump();
|
||||
|
||||
expect(find.byType(Loader), findsOneWidget);
|
||||
expect(find.text('Сбербанк'), findsNothing);
|
||||
|
||||
@@ -106,6 +106,7 @@ void main() {
|
||||
|
||||
Future<void> openSheet(WidgetTester tester, {double? amount}) async {
|
||||
await pumpApp(tester, amount: amount);
|
||||
await tester.pump();
|
||||
await tester.tap(find.text('open'));
|
||||
await tester.pump();
|
||||
await tester.pump();
|
||||
|
||||
@@ -5,22 +5,70 @@ void main() {
|
||||
group('ChosenPlanStateEnum', () {
|
||||
test('has all expected values', () {
|
||||
expect(ChosenPlanStateEnum.values.length, 16);
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInited));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateStartDateHasBeenSet));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInCoordination));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateStarted));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInProgress));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePendingPayment));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateConfirmedByConsultant));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePaid));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateCanceledByTheInitiator));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateLastDayStarted));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateLastDayFinished));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateComplained));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateDone));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.personalDietSet));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateChargeWasCollected));
|
||||
expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePaymentFailed));
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateInited),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateStartDateHasBeenSet),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateInCoordination),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateStarted),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateInProgress),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.statePendingPayment),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateConfirmedByConsultant),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.statePaid),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateCanceledByTheInitiator),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateLastDayStarted),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateLastDayFinished),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateComplained),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateDone),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.personalDietSet),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.stateChargeWasCollected),
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.values,
|
||||
contains(ChosenPlanStateEnum.statePaymentFailed),
|
||||
);
|
||||
});
|
||||
|
||||
test('getShowableChatBadgeStates returns correct states', () {
|
||||
@@ -40,32 +88,77 @@ void main() {
|
||||
});
|
||||
|
||||
test('isStateAfterPaidState returns false for states before paid', () {
|
||||
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.isStateAfterPaidState(), isFalse);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateCanceledByTheInitiator.isStateAfterPaidState(),
|
||||
isFalse,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.stateInited.isStateAfterPaidState(), isFalse);
|
||||
expect(ChosenPlanStateEnum.stateInCoordination.isStateAfterPaidState(), isFalse);
|
||||
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.isStateAfterPaidState(), isFalse);
|
||||
expect(ChosenPlanStateEnum.statePendingPayment.isStateAfterPaidState(), isFalse);
|
||||
expect(ChosenPlanStateEnum.statePaymentFailed.isStateAfterPaidState(), isFalse);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateInCoordination.isStateAfterPaidState(),
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateStartDateHasBeenSet.isStateAfterPaidState(),
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.statePendingPayment.isStateAfterPaidState(),
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.statePaymentFailed.isStateAfterPaidState(),
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('isStateAfterPaidState returns true for states after paid', () {
|
||||
expect(ChosenPlanStateEnum.statePaid.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.stateStarted.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.stateInProgress.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.stateLastDayStarted.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.stateLastDayFinished.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.stateComplained.isStateAfterPaidState(), isTrue);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateInProgress.isStateAfterPaidState(),
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateLastDayStarted.isStateAfterPaidState(),
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateLastDayFinished.isStateAfterPaidState(),
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateComplained.isStateAfterPaidState(),
|
||||
isTrue,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.stateDone.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.personalDietSet.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.stateChargeWasCollected.isStateAfterPaidState(), isTrue);
|
||||
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.isStateAfterPaidState(), isTrue);
|
||||
expect(
|
||||
ChosenPlanStateEnum.personalDietSet.isStateAfterPaidState(),
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateChargeWasCollected.isStateAfterPaidState(),
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateConfirmedByConsultant.isStateAfterPaidState(),
|
||||
isTrue,
|
||||
);
|
||||
});
|
||||
|
||||
test('canShowCancelAction returns true for cancellable states', () {
|
||||
expect(ChosenPlanStateEnum.stateInited.canShowCancelAction, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateInCoordination.canShowCancelAction, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.canShowCancelAction, isTrue);
|
||||
expect(ChosenPlanStateEnum.statePendingPayment.canShowCancelAction, isTrue);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateInCoordination.canShowCancelAction,
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateStartDateHasBeenSet.canShowCancelAction,
|
||||
isTrue,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.statePendingPayment.canShowCancelAction,
|
||||
isTrue,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.statePaid.canShowCancelAction, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateStarted.canShowCancelAction, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateInProgress.canShowCancelAction, isTrue);
|
||||
@@ -73,33 +166,129 @@ void main() {
|
||||
|
||||
test('canShowCancelAction returns false for non-cancellable states', () {
|
||||
expect(ChosenPlanStateEnum.personalDietSet.canShowCancelAction, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateLastDayStarted.canShowCancelAction, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateLastDayFinished.canShowCancelAction, isFalse);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateLastDayStarted.canShowCancelAction,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateLastDayFinished.canShowCancelAction,
|
||||
isFalse,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.stateComplained.canShowCancelAction, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateDone.canShowCancelAction, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateChargeWasCollected.canShowCancelAction, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.canShowCancelAction, isFalse);
|
||||
expect(ChosenPlanStateEnum.statePaymentFailed.canShowCancelAction, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.canShowCancelAction, isFalse);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateChargeWasCollected.canShowCancelAction,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateCanceledByTheInitiator.canShowCancelAction,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.statePaymentFailed.canShowCancelAction,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateConfirmedByConsultant.canShowCancelAction,
|
||||
isFalse,
|
||||
);
|
||||
});
|
||||
|
||||
test('isCancelAfterPaidState returns true only for post-paid cancellable states', () {
|
||||
expect(ChosenPlanStateEnum.statePaid.isCancelAfterPaidState, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateStarted.isCancelAfterPaidState, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateInProgress.isCancelAfterPaidState, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateInited.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateInCoordination.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.statePendingPayment.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.statePaymentFailed.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateConfirmedByConsultant.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.personalDietSet.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateLastDayStarted.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateLastDayFinished.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateComplained.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateDone.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateChargeWasCollected.isCancelAfterPaidState, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateCanceledByTheInitiator.isCancelAfterPaidState, isFalse);
|
||||
test(
|
||||
'isCancelAfterPaidState returns true only for post-paid cancellable states',
|
||||
() {
|
||||
expect(ChosenPlanStateEnum.statePaid.isCancelAfterPaidState, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateStarted.isCancelAfterPaidState, isTrue);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateInProgress.isCancelAfterPaidState,
|
||||
isTrue,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.stateInited.isCancelAfterPaidState, isFalse);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateInCoordination.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateStartDateHasBeenSet.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.statePendingPayment.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.statePaymentFailed.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateConfirmedByConsultant.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.personalDietSet.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateLastDayStarted.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateLastDayFinished.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateComplained.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.stateDone.isCancelAfterPaidState, isFalse);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateChargeWasCollected.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
expect(
|
||||
ChosenPlanStateEnum
|
||||
.stateCanceledByTheInitiator
|
||||
.isCancelAfterPaidState,
|
||||
isFalse,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
test(
|
||||
'allowsVideoCall is false for finished and canceled consultations',
|
||||
() {
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateCanceledByTheInitiator.allowsVideoCall,
|
||||
isFalse,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.statePaymentFailed.allowsVideoCall, isFalse);
|
||||
expect(ChosenPlanStateEnum.stateDone.allowsVideoCall, isFalse);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateChargeWasCollected.allowsVideoCall,
|
||||
isFalse,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
test('allowsVideoCall is true while the consultation is not finished', () {
|
||||
expect(ChosenPlanStateEnum.stateInited.allowsVideoCall, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateInCoordination.allowsVideoCall, isTrue);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateStartDateHasBeenSet.allowsVideoCall,
|
||||
isTrue,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.statePendingPayment.allowsVideoCall, isTrue);
|
||||
expect(
|
||||
ChosenPlanStateEnum.stateConfirmedByConsultant.allowsVideoCall,
|
||||
isTrue,
|
||||
);
|
||||
expect(ChosenPlanStateEnum.statePaid.allowsVideoCall, isTrue);
|
||||
expect(ChosenPlanStateEnum.personalDietSet.allowsVideoCall, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateStarted.allowsVideoCall, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateInProgress.allowsVideoCall, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateLastDayStarted.allowsVideoCall, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateLastDayFinished.allowsVideoCall, isTrue);
|
||||
expect(ChosenPlanStateEnum.stateComplained.allowsVideoCall, isTrue);
|
||||
});
|
||||
|
||||
test('getActiveStates returns correct states', () {
|
||||
@@ -114,8 +303,10 @@ void main() {
|
||||
expect(activeStates, contains(ChosenPlanStateEnum.stateComplained));
|
||||
expect(activeStates, contains(ChosenPlanStateEnum.stateDone));
|
||||
expect(activeStates, contains(ChosenPlanStateEnum.personalDietSet));
|
||||
expect(activeStates, isNot(contains(ChosenPlanStateEnum.statePaymentFailed)));
|
||||
expect(
|
||||
activeStates,
|
||||
isNot(contains(ChosenPlanStateEnum.statePaymentFailed)),
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,162 @@
|
||||
import 'package:eatvio_app/core/locator_service.dart';
|
||||
import 'package:eatvio_app/core/models/pagination_model.dart';
|
||||
import 'package:eatvio_app/core/theme/theme_helper.dart';
|
||||
import 'package:eatvio_app/features/video_calls/recordings/models/recording_status.dart';
|
||||
import 'package:eatvio_app/features/video_calls/recordings/models/video_call_recording_model.dart';
|
||||
import 'package:eatvio_app/features/video_calls/recordings/presentation/cubit/video_call_recordings_cubit.dart';
|
||||
import 'package:eatvio_app/features/video_calls/recordings/presentation/pages/video_call_recordings_screen.dart';
|
||||
import 'package:eatvio_app/features/video_calls/recordings/repositories/video_call_recordings_repository.dart';
|
||||
import 'package:eatvio_app/generated/l10n.dart';
|
||||
import 'package:material_ui/material_ui.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:mocktail/mocktail.dart';
|
||||
import 'package:network_image_mock/network_image_mock.dart';
|
||||
|
||||
class _MockRecordingsRepository extends Mock implements VideoCallRecordingsRepository {}
|
||||
|
||||
void main() {
|
||||
late _MockRecordingsRepository repository;
|
||||
|
||||
VideoCallRecordingsPagination page(
|
||||
List<VideoCallRecordingModel> data, {
|
||||
int lastPage = 1,
|
||||
}) {
|
||||
return VideoCallRecordingsPagination(
|
||||
data: data,
|
||||
links: const Links(
|
||||
first: 'https://example.com?page=1',
|
||||
last: 'https://example.com?page=1',
|
||||
prev: null,
|
||||
next: null,
|
||||
),
|
||||
meta: Meta(
|
||||
currentPage: 1,
|
||||
from: data.isEmpty ? null : 1,
|
||||
lastPage: lastPage,
|
||||
links: const [],
|
||||
perPage: 20,
|
||||
to: data.isEmpty ? null : data.length,
|
||||
total: data.length,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
VideoCallRecordingModel recording(int id) {
|
||||
return VideoCallRecordingModel(
|
||||
id: id,
|
||||
status: RecordingStatus.ready,
|
||||
durationSeconds: 60,
|
||||
createdAt: DateTime.utc(2026, 9, 21, 10),
|
||||
previewUrl: 'https://example.com/preview.jpg',
|
||||
fileUrl: 'https://example.com/file.mp4',
|
||||
counterpart: const VideoCallRecordingCounterpartModel(name: 'Сидни', slug: 'sydney'),
|
||||
);
|
||||
}
|
||||
|
||||
setUp(() async {
|
||||
await sl.reset();
|
||||
repository = _MockRecordingsRepository();
|
||||
sl.registerFactory<VideoCallRecordingsCubit>(
|
||||
() => VideoCallRecordingsCubit(repository: repository),
|
||||
);
|
||||
});
|
||||
|
||||
tearDown(() async {
|
||||
await sl.reset();
|
||||
});
|
||||
|
||||
Widget wrap(Widget child) {
|
||||
return MaterialApp(
|
||||
theme: ThemeHelper().themeData(),
|
||||
localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
|
||||
supportedLocales: const [Locale('ru')],
|
||||
home: child,
|
||||
);
|
||||
}
|
||||
|
||||
testWidgets('short list can be pulled to refresh', (tester) async {
|
||||
await mockNetworkImagesFor(() async {
|
||||
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
|
||||
(_) async => page([recording(1)]),
|
||||
);
|
||||
|
||||
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final list = tester.widget<ListView>(find.byType(ListView));
|
||||
expect(list.physics, isA<AlwaysScrollableScrollPhysics>());
|
||||
|
||||
await tester.fling(find.byType(ListView), const Offset(0, 400), 1200);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(seconds: 1));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
verify(() => repository.getRecordings(page: 1, period: null)).called(2);
|
||||
});
|
||||
});
|
||||
|
||||
testWidgets('pull on a short list does not request the next page', (tester) async {
|
||||
await mockNetworkImagesFor(() async {
|
||||
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
|
||||
(_) async => page([recording(1)], lastPage: 2),
|
||||
);
|
||||
when(() => repository.getRecordings(page: 2, period: null)).thenAnswer(
|
||||
(_) async => page([recording(2)], lastPage: 2),
|
||||
);
|
||||
|
||||
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
await tester.fling(find.byType(ListView), const Offset(0, 400), 1200);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(seconds: 1));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
verifyNever(() => repository.getRecordings(page: 2, period: null));
|
||||
});
|
||||
});
|
||||
|
||||
testWidgets('empty state text stays visible at a large text scale', (tester) async {
|
||||
tester.view.physicalSize = const Size(320, 240);
|
||||
tester.view.devicePixelRatio = 1;
|
||||
addTearDown(tester.view.resetPhysicalSize);
|
||||
addTearDown(tester.view.resetDevicePixelRatio);
|
||||
|
||||
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
|
||||
(_) async => page(const []),
|
||||
);
|
||||
|
||||
await tester.pumpWidget(
|
||||
wrap(
|
||||
const MediaQuery(
|
||||
data: MediaQueryData(textScaler: TextScaler.linear(3)),
|
||||
child: VideoCallRecordingsScreen(),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Пока нет видеоконсультаций'), findsOneWidget);
|
||||
expect(tester.takeException(), isNull);
|
||||
});
|
||||
|
||||
testWidgets('empty list can be pulled to refresh', (tester) async {
|
||||
when(() => repository.getRecordings(page: 1, period: null)).thenAnswer(
|
||||
(_) async => page(const []),
|
||||
);
|
||||
|
||||
await tester.pumpWidget(wrap(const VideoCallRecordingsScreen()));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('Пока нет видеоконсультаций'), findsOneWidget);
|
||||
final list = tester.widget<ListView>(find.byType(ListView));
|
||||
expect(list.physics, isA<AlwaysScrollableScrollPhysics>());
|
||||
|
||||
await tester.fling(find.text('Пока нет видеоконсультаций'), const Offset(0, 400), 1200);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(seconds: 1));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
verify(() => repository.getRecordings(page: 1, period: null)).called(2);
|
||||
});
|
||||
}
|
||||
@@ -14,6 +14,7 @@ class _MockDio extends Mock implements Dio {}
|
||||
class _FakeDownloadsSaver extends Fake implements PublicDownloadsSaver {
|
||||
String? lastSourcePath;
|
||||
String? lastFileName;
|
||||
String? lastSubfolder;
|
||||
|
||||
@override
|
||||
Future<String> saveToDownloads({
|
||||
@@ -24,7 +25,8 @@ class _FakeDownloadsSaver extends Fake implements PublicDownloadsSaver {
|
||||
}) async {
|
||||
lastSourcePath = sourcePath;
|
||||
lastFileName = fileName;
|
||||
return 'content://downloads/Itvio/$fileName';
|
||||
lastSubfolder = subfolder;
|
||||
return 'content://downloads/$subfolder/$fileName';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -157,7 +159,8 @@ void main() {
|
||||
);
|
||||
|
||||
expect(downloadsSaver.lastFileName, 'recording_1.mp4');
|
||||
expect(saved, contains('Itvio'));
|
||||
expect(downloadsSaver.lastSubfolder, 'Eatvio');
|
||||
expect(saved, contains('Eatvio'));
|
||||
expect(File(downloadsSaver.lastSourcePath!).existsSync(), isFalse);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ void main() {
|
||||
testWidgets('VideoCallParticipantNameLabel renders consultant role above name', (tester) async {
|
||||
await tester.pumpWidget(
|
||||
MaterialApp(
|
||||
locale: const Locale('en'),
|
||||
localizationsDelegates: const [S.delegate, ...GlobalMaterialLocalizations.delegates],
|
||||
supportedLocales: S.delegate.supportedLocales,
|
||||
home: const Scaffold(
|
||||
@@ -26,6 +27,7 @@ void main() {
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
|
||||
expect(find.text('Alex'), findsOneWidget);
|
||||
expect(find.text('Eatvio consultant'), findsOneWidget);
|
||||
|
||||
Reference in New Issue
Block a user