Skip to content

245 모달 컴포넌트 제작 refactor #256

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.

Sign up for GitHub

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
merged 6 commits into from
May 2, 2025
Merged

245 모달 컴포넌트 제작 refactor #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a54378
chore: remove unnecessary blank lines in launch configuration
jjoonleo Apr 29, 2025
aeef3cb
refactor: enhance dialog theme with custom styles and remove unused t…
jjoonleo Apr 29, 2025
7bbdaa9
feat: implement CustomAlertDialog component and remove ModalComponent
jjoonleo May 1, 2025
04029c3
refactor: remove unnecessary padding from background container in Wid…
jjoonleo May 1, 2025
cce037c
refactor: replace ModalComponent with CustomAlertDialog in ScheduleSt…
jjoonleo May 1, 2025
d9818ec
feat: add CustomAlertDialog component and remove ModalComponent
jjoonleo May 1, 2025
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
2 changes: 0 additions & 2 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [

{
"name": "on_time_front",
"request": "launch",
Expand All @@ -14,7 +13,6 @@
".env/debug.env",
"--web-port",
"58102"

]
},
{
Expand Down
128 changes: 65 additions & 63 deletions lib/presentation/alarm/screens/schedule_start_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:go_router/go_router.dart';
import 'package:on_time_front/domain/entities/schedule_entity.dart';
import 'package:on_time_front/presentation/shared/components/button.dart';
import 'package:on_time_front/presentation/shared/components/modal_button.dart';
import 'package:on_time_front/presentation/shared/components/modal_component.dart';
import 'package:on_time_front/presentation/shared/components/custom_alert_dialog.dart';

class ScheduleStartScreen extends StatefulWidget {
final ScheduleEntity schedule;
Expand All @@ -32,76 +32,78 @@ class _ScheduleStartScreenState extends State<ScheduleStartScreen> {

@override
Widget build(BuildContext context) {
return Scaffold(
body: Stack(
children: [
Column(
children: [
Padding(
padding: const EdgeInsets.only(top: 60),
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
widget.schedule.scheduleName,
style: const TextStyle(
fontSize: 40,
fontWeight: FontWeight.bold,
color: Color(0xff5C79FB),
return SafeArea(
child: Scaffold(
body: Stack(
children: [
Column(
children: [
Padding(
padding: const EdgeInsets.only(top: 60),
child: Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
widget.schedule.scheduleName,
style: const TextStyle(
fontSize: 40,
fontWeight: FontWeight.bold,
color: Color(0xff5C79FB),
),
),
),
const SizedBox(height: 8),
Text(
widget.schedule.place.placeName,
style: const TextStyle(
fontSize: 25,
fontWeight: FontWeight.bold,
const SizedBox(height: 8),
Text(
widget.schedule.place.placeName,
style: const TextStyle(
fontSize: 25,
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 15),
Text(
'지금 준비 시작 안하면 늦어요!',
style: const TextStyle(
fontSize: 15,
const SizedBox(height: 15),
Text(
'지금 준비 시작 안하면 늦어요!',
style: const TextStyle(
fontSize: 15,
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
Padding(
padding: const EdgeInsets.only(top: 50),
child: SvgPicture.asset(
'characters/character.svg',
package: 'assets',
width: 204,
height: 269,
Padding(
padding: const EdgeInsets.only(top: 50),
child: SvgPicture.asset(
'characters/character.svg',
package: 'assets',
width: 204,
height: 269,
),
),
),
],
],
),
),
),
),
const Spacer(),
Padding(
padding: const EdgeInsets.only(bottom: 30),
child: Button(
text: '준비 시작',
onPressed: () async {
context.go('/alarmScreen', extra: widget.schedule);
},
const Spacer(),
Padding(
padding: const EdgeInsets.only(bottom: 30),
child: Button(
text: '준비 시작',
onPressed: () async {
context.go('/alarmScreen', extra: widget.schedule);
},
),
),
],
),
Positioned(
top: 10,
right: 10,
child: IconButton(
icon: const Icon(Icons.close),
onPressed: () => _showModal(context),
),
],
),
Positioned(
top: 10,
right: 10,
child: IconButton(
icon: const Icon(Icons.close),
onPressed: () => _showModal(context),
),
),
],
],
),
),
);
}
Expand All @@ -110,7 +112,7 @@ class _ScheduleStartScreenState extends State<ScheduleStartScreen> {
class _ScheduleStartScreenModal extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ModalComponent(
return CustomAlertDialog(
title: const Text(
'정말 나가시겠어요?',
),
Expand Down
Loading