Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions lib/presentation/my_page/my_page_modal/delete_user_modal.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:on_time_front/domain/use-cases/delete_user_use_case.dart';
import 'package:on_time_front/l10n/app_localizations.dart';
import 'package:on_time_front/presentation/shared/components/custom_alert_dialog.dart';
import 'package:on_time_front/presentation/shared/components/modal_wide_button.dart';
import 'package:on_time_front/presentation/shared/components/two_action_dialog.dart';
import 'package:on_time_front/presentation/shared/components/two_button_delete_dialog.dart';

class DeleteUserModal {
Expand Down Expand Up @@ -259,9 +260,21 @@ class _DeleteFeedbackDialogState extends State<_DeleteFeedbackDialog> {
return;
}

ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text(AppLocalizations.of(context)!.error)),
final l10n = AppLocalizations.of(context)!;
await showTwoActionDialog(
context,
config: TwoActionDialogConfig(
title: l10n.error,
primaryAction: DialogActionConfig(
label: l10n.ok,
variant: ModalWideButtonVariant.destructive,
),
),
);
if (!mounted) {
return;
}

setState(() {
_isDeleting = false;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import 'package:on_time_front/presentation/my_page/preparation_spare_time_edit/b
import 'package:on_time_front/l10n/app_localizations.dart';
import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/bloc/preparation_form_bloc.dart';
import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/components/preparation_form_create_list.dart';
import 'package:on_time_front/presentation/shared/components/modal_wide_button.dart';
import 'package:on_time_front/presentation/shared/components/time_stepper.dart';
import 'package:on_time_front/presentation/shared/components/two_action_dialog.dart';

class PreparationSpareTimeEditScreen extends StatelessWidget {
const PreparationSpareTimeEditScreen({super.key});
Expand Down Expand Up @@ -51,10 +53,14 @@ class _PreparationSpareTimeEditView extends StatelessWidget {
Navigator.of(context).pop();
} else if (state.status ==
DefaultPreparationSpareTimeStatus.error) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
state.errorMessage ?? AppLocalizations.of(context)!.error,
final l10n = AppLocalizations.of(context)!;
showTwoActionDialog(
context,
config: TwoActionDialogConfig(
title: state.errorMessage ?? l10n.error,
primaryAction: DialogActionConfig(
label: l10n.ok,
variant: ModalWideButtonVariant.destructive,
),
),
);
Expand Down
86 changes: 46 additions & 40 deletions lib/presentation/onboarding/screens/onboarding_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import 'package:on_time_front/presentation/onboarding/schedule_spare_time/cubit/
import 'package:on_time_front/presentation/onboarding/schedule_spare_time/screens/schedule_spare_time_form.dart';
import 'package:on_time_front/presentation/onboarding/cubit/onboarding_cubit.dart';
import 'package:on_time_front/presentation/onboarding/preparation_order/cubit/preparation_order_cubit.dart';
import 'package:on_time_front/presentation/shared/components/modal_wide_button.dart';
import 'package:on_time_front/presentation/shared/components/step_progress.dart';
import 'package:on_time_front/presentation/shared/components/two_action_dialog.dart';
import 'package:on_time_front/l10n/app_localizations.dart';

class OnboardingScreen extends StatelessWidget {
Expand All @@ -22,10 +24,7 @@ class OnboardingScreen extends StatelessWidget {
Widget build(BuildContext context) {
return BlocProvider(
create: (context) => getIt.get<OnboardingCubit>(),
child: Scaffold(
resizeToAvoidBottomInset: false,
body: _OnboardingForm(),
),
child: Scaffold(resizeToAvoidBottomInset: false, body: _OnboardingForm()),
);
}
}
Expand Down Expand Up @@ -91,47 +90,50 @@ class _OnboardingFormState extends State<_OnboardingForm>
),
),
],
child: Builder(builder: (context) {
return Column(
children: <Widget>[
_AppBar(
tabController: _tabController,
onUpdateCurrentPageIndex: _updateCurrentPageIndex,
),
Expanded(
child: PageView(
physics: const NeverScrollableScrollPhysics(),
controller: _pageViewController,
onPageChanged: _handlePageViewChanged,
children: <Widget>[
PreparationNameForm(),
PreparationOrderForm(),
PreparationTimeForm(),
ScheduleSpareTimeForm(),
],
child: Builder(
builder: (context) {
return Column(
children: <Widget>[
_AppBar(
tabController: _tabController,
onUpdateCurrentPageIndex: _updateCurrentPageIndex,
),
Expanded(
child: PageView(
physics: const NeverScrollableScrollPhysics(),
controller: _pageViewController,
onPageChanged: _handlePageViewChanged,
children: <Widget>[
PreparationNameForm(),
PreparationOrderForm(),
PreparationTimeForm(),
ScheduleSpareTimeForm(),
],
),
),
),
SizedBox(
SizedBox(
height: 58,
width: double.infinity,
child: ElevatedButton(
onPressed: !_isSubmitting &&
context.select((OnboardingCubit cubit) =>
cubit.state.isValid)
onPressed:
!_isSubmitting &&
context.select(
(OnboardingCubit cubit) => cubit.state.isValid,
)
? () => _onNextPageButtonClicked(context)
: null,
child: _isSubmitting
? const SizedBox.square(
dimension: 24,
child: CircularProgressIndicator(
strokeWidth: 2,
),
child: CircularProgressIndicator(strokeWidth: 2),
)
: Text(AppLocalizations.of(context)!.next),
)),
],
);
}),
),
),
],
);
},
),
),
),
);
Expand Down Expand Up @@ -162,9 +164,15 @@ class _OnboardingFormState extends State<_OnboardingForm>
await context.read<OnboardingCubit>().onboardingFormSubmitted();
} catch (_) {
if (!context.mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(AppLocalizations.of(context)!.error),
final l10n = AppLocalizations.of(context)!;
await showTwoActionDialog(
context,
config: TwoActionDialogConfig(
title: l10n.error,
primaryAction: DialogActionConfig(
label: l10n.ok,
variant: ModalWideButtonVariant.destructive,
),
),
);
} finally {
Expand Down Expand Up @@ -242,9 +250,7 @@ class _AppBar extends StatelessWidget {
),
),
),
SizedBox(
width: iconButtonSize,
)
SizedBox(width: iconButtonSize),
],
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ import 'package:on_time_front/presentation/schedule_create/schedule_place_moving
import 'package:on_time_front/presentation/schedule_create/schedule_place_moving_time.dart/screens/schedule_place_moving_time_form.dart';
import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/cubit/schedule_form_spare_time_cubit.dart';
import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/screens/schedule_spare_and_preparing_time_form.dart';
import 'package:on_time_front/presentation/shared/components/modal_wide_button.dart';
import 'package:on_time_front/presentation/shared/components/step_progress.dart';
import 'package:on_time_front/presentation/shared/components/two_action_dialog.dart';
import 'package:on_time_front/l10n/app_localizations.dart';

class ScheduleMultiPageForm extends StatefulWidget {
Expand Down Expand Up @@ -56,10 +58,14 @@ class _ScheduleMultiPageFormState extends State<ScheduleMultiPageForm>
Navigator.of(context).pop(true);
} else if (state.submissionStatus ==
ScheduleFormSubmissionStatus.failure) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
state.submissionError ?? AppLocalizations.of(context)!.error,
final l10n = AppLocalizations.of(context)!;
showTwoActionDialog(
context,
config: TwoActionDialogConfig(
title: state.submissionError ?? l10n.error,
primaryAction: DialogActionConfig(
label: l10n.ok,
variant: ModalWideButtonVariant.destructive,
),
),
);
Expand Down
11 changes: 10 additions & 1 deletion test/presentation/my_page/delete_user_modal_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:on_time_front/domain/repositories/user_repository.dart';
import 'package:on_time_front/domain/use-cases/delete_user_use_case.dart';
import 'package:on_time_front/l10n/app_localizations.dart';
import 'package:on_time_front/presentation/my_page/my_page_modal/delete_user_modal.dart';
import 'package:on_time_front/presentation/shared/components/two_action_dialog.dart';
import 'package:on_time_front/presentation/shared/theme/theme.dart';

void main() {
Expand Down Expand Up @@ -144,10 +145,18 @@ void main() {
await _openFeedbackDialog(tester);

await tester.tap(find.text('의견 보내고 탈퇴하기'));
await tester.pumpAndSettle();
await tester.pump();
await tester.pump(const Duration(milliseconds: 200));

expect(find.byType(TwoActionDialog), findsOneWidget);
expect(find.text('오류'), findsOneWidget);
expect(find.text('더 좋은 서비스로 다시 만나요'), findsOneWidget);

await tester.tap(find.text('확인'));
await tester.pumpAndSettle();

expect(find.byType(TwoActionDialog), findsNothing);
expect(find.text('더 좋은 서비스로 다시 만나요'), findsOneWidget);
expect(find.byType(CircularProgressIndicator), findsNothing);
expect(repository.didSignOut, isFalse);
expect(didConfirm, isFalse);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import 'package:on_time_front/presentation/app/bloc/auth/auth_bloc.dart';
import 'package:on_time_front/presentation/my_page/preparation_spare_time_edit/bloc/default_preparation_spare_time_form_bloc.dart';
import 'package:on_time_front/presentation/my_page/preparation_spare_time_edit/preparation_spare_time_edit_screen.dart';
import 'package:on_time_front/presentation/schedule_create/schedule_spare_and_preparing_time/preparation_form/bloc/preparation_form_bloc.dart';
import 'package:on_time_front/presentation/shared/components/two_action_dialog.dart';
import 'package:on_time_front/presentation/shared/theme/theme.dart';

void main() {
Expand Down Expand Up @@ -85,7 +86,7 @@ void main() {
await tester.pumpAndSettle();

expect(find.byType(PreparationSpareTimeEditScreen), findsOneWidget);
expect(find.byType(SnackBar), findsOneWidget);
expect(find.byType(TwoActionDialog), findsOneWidget);
expect(find.textContaining('save failed'), findsOneWidget);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import 'package:on_time_front/presentation/schedule_create/components/top_bar.da
import 'package:on_time_front/presentation/schedule_create/schedule_date_time/cubit/schedule_date_time_cubit.dart';
import 'package:on_time_front/presentation/schedule_create/screens/schedule_create_screen.dart';
import 'package:on_time_front/presentation/schedule_create/screens/schedule_edit_screen.dart';
import 'package:on_time_front/presentation/shared/components/two_action_dialog.dart';

class StubAuthBloc extends Mock implements AuthBloc {
StubAuthBloc(this._state);
Expand Down Expand Up @@ -471,7 +472,7 @@ void main() {
await tester.pumpAndSettle();

expect(find.byType(ScheduleMultiPageForm), findsOneWidget);
expect(find.byType(SnackBar), findsOneWidget);
expect(find.byType(TwoActionDialog), findsOneWidget);
});

testWidgets('edited name and place are submitted from form steps', (
Expand Down
Loading