Skip to content

Commit fe80d65

Browse files
godekagodeka
committed
[style] 커피챗 진행중 페이지 디자인 수정 #380 
1 parent 207737f commit fe80d65

File tree

2 files changed

+61
-63
lines changed

2 files changed

+61
-63
lines changed

‎frontend/assets/coffee_mug.png

8.95 KB
Loading

‎frontend/lib/screen/matching_screen.dart

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ class _MatchingWidgetState extends State<Matching> {
3636
@override
3737
Widget build(BuildContext context) {
3838
return Scaffold(
39-
backgroundColor: const Color.fromRGBO(250, 131, 88, 1.0), // 배경색 설정
39+
backgroundColor: const Color(0xFFF09676), // 배경색 설정
4040
body: Center(
4141
child: Column(
42-
mainAxisAlignment: MainAxisAlignment.center,
42+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
4343
children: [
4444
const Padding(
45-
padding: EdgeInsets.only(top: 0.0, bottom: 0),
45+
padding: EdgeInsets.only(top: 100),
4646
child: Text(
47-
'커피챗 진행중 • • • ', // 텍스트
48-
style: TextStyle(fontSize: 33, fontWeight: FontWeight.bold),
47+
'커피챗 진행중 ...', // 텍스트
48+
style: TextStyle(fontSize: 30, fontWeight: FontWeight.bold),
4949
),
5050
),
5151
Padding(
@@ -54,23 +54,23 @@ class _MatchingWidgetState extends State<Matching> {
5454
alignment: Alignment.center,
5555
children: [
5656
Image.asset(
57-
'assets/magnifier.png',
57+
'assets/coffee_mug.png',
5858
width: 400,
5959
height: 400,
6060
),
6161
Padding(
6262
padding: const EdgeInsets.only(top: 58, right: 0), // 패딩 설정
6363
child: Container(
64-
width: 310, // 원의 너비
65-
height: 310, // 원의 높이
64+
width: 200, // 원의 너비
65+
height: 200, // 원의 높이
6666
decoration: const BoxDecoration(
6767
shape: BoxShape.circle, // 원 모양 설정
68-
color: Color.fromRGBO(255, 201, 186, 1.0),
68+
color: Color(0xFFFFDED2),
6969
),
7070
),
7171
),
7272
Positioned(
73-
top: 150, // 텍스트 상위 여백 설정
73+
top: 130,
7474
child: Text(
7575
'${widget.myNickname} X ${widget.partnerNickname}',
7676
// 회사 이름이 길어졌을 때 논의 필요
@@ -81,11 +81,11 @@ class _MatchingWidgetState extends State<Matching> {
8181
),
8282
),
8383
Positioned(
84-
top: 200,
85-
left: 80,
84+
top: 180,
85+
left: 110,
8686
child: Container(
87-
width: 140,
88-
height: 140,
87+
width: 100,
88+
height: 100,
8989
decoration: const BoxDecoration(
9090
shape: BoxShape.circle,
9191
color: Colors.white,
@@ -101,11 +101,11 @@ class _MatchingWidgetState extends State<Matching> {
101101
),
102102
),
103103
Positioned(
104-
top: 200,
105-
right: 80,
104+
top: 180,
105+
right: 110,
106106
child: Container(
107-
width: 140,
108-
height: 140,
107+
width: 100,
108+
height: 100,
109109
decoration: const BoxDecoration(
110110
shape: BoxShape.circle,
111111
color: Colors.white,
@@ -124,52 +124,50 @@ class _MatchingWidgetState extends State<Matching> {
124124
],
125125
),
126126
),
127-
Padding(
128-
padding: const EdgeInsets.only(top: 80), // 버튼 주위의 패딩 설정
129-
child: SizedBox(
130-
width: 350, // 버튼의 너비 설정
131-
height: 70, // 버튼의 높이 설정
132-
child: ElevatedButton(
133-
onPressed: () async {
134-
showDialog(
135-
context: context,
136-
builder: (context) {
137-
return YesOrNoDialog(
138-
content: "커피챗을 종료하시겠습니까?",
139-
firstButton: "종료",
140-
secondButton: "닫기",
141-
handleFirstClick: () async {
142-
Navigator.push(
143-
context,
144-
MaterialPageRoute(
145-
builder: (context) => CoffeeChatRating(
146-
userId: widget.myId,
147-
partnerId: widget.partnerId,
148-
partnerNickname: widget.partnerNickname,
149-
matchId: widget.matchId,
150-
),
127+
const SizedBox(height: 100),
128+
SizedBox(
129+
width: 350, // 버튼의 너비 설정
130+
height: 70, // 버튼의 높이 설정
131+
child: ElevatedButton(
132+
onPressed: () async {
133+
showDialog(
134+
context: context,
135+
builder: (context) {
136+
return YesOrNoDialog(
137+
content: "커피챗을 종료하시겠습니까?",
138+
firstButton: "종료",
139+
secondButton: "닫기",
140+
handleFirstClick: () async {
141+
Navigator.push(
142+
context,
143+
MaterialPageRoute(
144+
builder: (context) => CoffeeChatRating(
145+
userId: widget.myId,
146+
partnerId: widget.partnerId,
147+
partnerNickname: widget.partnerNickname,
148+
matchId: widget.matchId,
151149
),
152-
);
153-
},
154-
);
155-
},
156-
);
157-
},
158-
style: ElevatedButton.styleFrom(
159-
padding: const EdgeInsets.symmetric(
160-
vertical: 10, horizontal: 20), // 버튼의 내부 패딩 설정
161-
shape: RoundedRectangleBorder(
162-
borderRadius: BorderRadius.circular(15),
163-
), // 버튼의 모양 설정
164-
backgroundColor: const Color(0xFF371D10), // 버튼의 배경색 설정
165-
),
166-
child: const Text(
167-
'커피챗 종료',
168-
style: TextStyle(
169-
fontSize: 20,
170-
color: Colors.white,
171-
), // 버튼 텍스트의 스타일 설정
172-
),
150+
),
151+
);
152+
},
153+
);
154+
},
155+
);
156+
},
157+
style: ElevatedButton.styleFrom(
158+
padding: const EdgeInsets.symmetric(
159+
vertical: 10, horizontal: 20), // 버튼의 내부 패딩 설정
160+
shape: RoundedRectangleBorder(
161+
borderRadius: BorderRadius.circular(15),
162+
), // 버튼의 모양 설정
163+
backgroundColor: const Color(0xFF371D10), // 버튼의 배경색 설정
164+
),
165+
child: const Text(
166+
'커피챗 종료',
167+
style: TextStyle(
168+
fontSize: 20,
169+
color: Colors.white,
170+
), // 버튼 텍스트의 스타일 설정
173171
),
174172
),
175173
),

0 commit comments

Comments
 (0)