-
Notifications
You must be signed in to change notification settings - Fork 0
feat: 신고 페이지에 대한 디자인 시스템 적용 #178
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
lib/presentation/chat_message/components/show_delete_chat_dialog.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,42 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:gds/gds.dart'; | ||
| import 'package:grimity/app/config/app_router.dart'; | ||
| import 'package:grimity/app/enum/report.enum.dart'; | ||
| import 'package:grimity/presentation/report/provider/report_argument_provider.dart'; | ||
| import 'package:grimity/presentation/common/widget/navigation/grimity_drawer.dart'; | ||
| import 'package:grimity/presentation/common/widget/navigation/grimity_title_top_navigation.dart'; | ||
| import 'package:grimity/presentation/report/report_view.dart'; | ||
| import 'package:grimity/presentation/report/widget/report_app_bar.dart'; | ||
| import 'package:grimity/presentation/report/view/report_body_view.dart'; | ||
| import 'package:grimity/presentation/report/widget/report_send_button.dart'; | ||
|
|
||
| class ReportPage extends StatelessWidget { | ||
| final ReportRefType refType; | ||
| final String refId; | ||
| const ReportPage({ | ||
| super.key, | ||
| required this.refId, | ||
| required this.refType, | ||
| }); | ||
|
|
||
| const ReportPage({super.key, required this.refType, required this.refId}); | ||
| final String refId; | ||
| final ReportRefType refType; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return ProviderScope( | ||
| overrides: [ | ||
| reportRefTypeArgumentProvider.overrideWithValue(refType), | ||
| reportRefIdArgumentProvider.overrideWithValue(refId), | ||
| ], | ||
| child: ReportView( | ||
| reportAppBar: ReportAppBar(), | ||
| reportBodyView: ReportBodyView(), | ||
| reportSendButton: ReportSendButton(), | ||
| ), | ||
| return GdsScaffold( | ||
| appBar: GrimityTitleTopNavigation(title: '신고하기', showIcons: false), | ||
| drawer: GrimityDrawer(), | ||
| body: ReportView(refId: refId, refType: refType, isModal: false), | ||
| ); | ||
| } | ||
|
|
||
| static Future<T?> push<T>( | ||
| BuildContext context, { | ||
| required String refId, | ||
| required ReportRefType refType, | ||
| }) { | ||
| if (context.isMobile) { | ||
| return ReportRoute(refType: refType, refId: refId).push(context); | ||
| } else { | ||
| final child = ReportView(refId: refId, refType: refType, isModal: true); | ||
| final modal = GdsModal(title: '신고하기', body: child); | ||
|
|
||
| return modal.open(context); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,29 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:grimity/app/enum/report.enum.dart'; | ||
| import 'package:grimity/presentation/report/provider/report_argument_provider.dart'; | ||
| import 'package:grimity/presentation/report/view/report_body_view.dart'; | ||
|
|
||
| class ReportView extends StatelessWidget { | ||
| const ReportView({ | ||
| super.key, | ||
| required this.reportAppBar, | ||
| required this.reportBodyView, | ||
| required this.reportSendButton, | ||
| required this.refId, | ||
| required this.refType, | ||
| required this.isModal, | ||
| }); | ||
|
|
||
| final PreferredSizeWidget reportAppBar; | ||
| final Widget reportBodyView; | ||
| final Widget reportSendButton; | ||
| final String refId; | ||
| final ReportRefType refType; | ||
| final bool isModal; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| return Scaffold(appBar: reportAppBar, body: reportBodyView, bottomNavigationBar: reportSendButton); | ||
| return ProviderScope( | ||
| overrides: [ | ||
| reportRefIdArgumentProvider.overrideWithValue(refId), | ||
| reportRefTypeArgumentProvider.overrideWithValue(refType), | ||
| ], | ||
| child: ReportBodyView(isModal: isModal), | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:gds/gds.dart'; | ||
| import 'package:go_router/go_router.dart'; | ||
| import 'package:grimity/presentation/report/provider/report_provider.dart'; | ||
| import 'package:grimity/presentation/report/widget/report_confirm_alert.dart'; | ||
| import 'package:grimity/presentation/report/widget/report_suceess_alert.dart'; | ||
|
|
||
| class ReportActionView extends ConsumerWidget with ReportMixin { | ||
| const ReportActionView({ | ||
| super.key, | ||
| required this.isModal, | ||
| }); | ||
|
|
||
| final bool isModal; | ||
|
|
||
| @override | ||
| Widget build(BuildContext context, WidgetRef ref) { | ||
| final notifier = reportNotifier(ref); | ||
|
|
||
| final Widget child = Row( | ||
| mainAxisSize: MainAxisSize.min, | ||
| spacing: GdsSpacing.spacing8, | ||
| children: [ | ||
| Expanded( | ||
| child: GdsOutlinedButton( | ||
| size: GdsOutlinedButtonSize.large, | ||
| text: '닫기', | ||
| expanded: true, | ||
| onPressed: context.pop, | ||
| ), | ||
| ), | ||
| Expanded( | ||
| child: GdsSolidButton( | ||
| size: GdsSolidButtonSize.large, | ||
| text: '신고하기', | ||
| enabled: notifier.enabled, | ||
| expanded: true, | ||
| onPressed: () async { | ||
| final isAgreed = await showConfirmReportAlert(context); | ||
|
|
||
| // 사용자가 신고하는 것을 최종적으로 동의한 경우 | ||
| if (isAgreed ?? false) { | ||
| final isSucceeded = await notifier.sendReport(); | ||
|
|
||
| // 사용자가 신고에 최종적으로 성공한 경우 | ||
| if (isSucceeded && context.mounted) { | ||
| showSuccessReportAlert(context); | ||
| } | ||
| } | ||
| }, | ||
| ), | ||
| ), | ||
| ], | ||
| ); | ||
|
|
||
| if (isModal) return child; | ||
|
|
||
| return Padding( | ||
| padding: EdgeInsets.only( | ||
| top: GdsSpacing.spacing8, | ||
| left: GdsSpacing.spacing16, | ||
| right: GdsSpacing.spacing16, | ||
| bottom: GdsSpacing.spacing24, | ||
| ), | ||
| child: child, | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.