Skip to content

Commit dfb9e94

Browse files
authored
style: 뒤로 가기 아이콘을 디자인에 맞게 수정 (#69)
기존 뒤로 가기 아이콘의 굵기가 디자인과 달라, 시안에 맞춘 SVG 아이콘으로 대체하고 각 화면에 적용했습니다.
1 parent 45e84c4 commit dfb9e94

File tree

5 files changed

+48
-40
lines changed

5 files changed

+48
-40
lines changed
Lines changed: 3 additions & 0 deletions
Loading

frontend/ongi/lib/screens/home/home_degree_graph.dart

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:fl_chart/fl_chart.dart';
3+
import 'package:flutter_svg/svg.dart';
34
import 'package:ongi/core/app_colors.dart';
45
import 'package:ongi/core/app_light_background.dart';
56
import 'package:ongi/screens/home/home_ourfamily_text_withoutUser.dart';
@@ -50,26 +51,34 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
5051
onTap: widget.onBack ?? () => Navigator.of(context).pop(),
5152
child: Padding(
5253
padding: EdgeInsets.only(
53-
left: 32,
54-
top: MediaQuery.of(context).size.height * 0.08,
54+
left: 40,
55+
top: MediaQuery.of(context).size.height * 0.06,
56+
),
57+
child: SizedBox(
58+
width: 36,
59+
height: 36,
60+
child: SvgPicture.asset(
61+
'assets/images/back_icon_black.svg',
62+
),
5563
),
56-
child: Icon(Icons.arrow_back_ios, color: Colors.black, size: 28),
5764
),
5865
),
66+
SizedBox(height: MediaQuery.of(context).size.height * 0.025),
5967
// 타이틀
6068
const HomeOngiTextWithoutUser(),
6169
// 카드
6270
Padding(
63-
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
71+
padding: const EdgeInsets.symmetric(
72+
horizontal: 16,
73+
vertical: 8,
74+
),
6475
child: Container(
6576
decoration: BoxDecoration(
6677
color: Colors.white,
6778
borderRadius: BorderRadius.circular(24),
6879
),
6980
padding: const EdgeInsets.all(20),
70-
child: showHistory
71-
? _buildHistoryList()
72-
: _buildGraphCard(),
81+
child: showHistory ? _buildHistoryList() : _buildGraphCard(),
7382
),
7483
),
7584
],
@@ -101,18 +110,17 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
101110
show: true,
102111
drawVerticalLine: false,
103112
horizontalInterval: 0.5,
104-
getDrawingHorizontalLine: (value) => FlLine(
105-
color: Colors.grey[300],
106-
strokeWidth: 1,
107-
),
113+
getDrawingHorizontalLine: (value) =>
114+
FlLine(color: Colors.grey[300], strokeWidth: 1),
108115
),
109116
titlesData: FlTitlesData(
110117
leftTitles: AxisTitles(
111118
sideTitles: SideTitles(
112119
showTitles: true,
113120
interval: 0.5,
114121
getTitlesWidget: (value, meta) {
115-
if (value == 35.2 || value == 40.5) return const SizedBox.shrink();
122+
if (value == 35.2 || value == 40.5)
123+
return const SizedBox.shrink();
116124
return Text(
117125
value.toStringAsFixed(1),
118126
style: const TextStyle(
@@ -131,7 +139,8 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
131139
getTitlesWidget: (value, meta) {
132140
if (value % 1 != 0) return const SizedBox.shrink();
133141
int idx = value.toInt();
134-
if (idx < 0 || idx >= dates.length) return const SizedBox.shrink();
142+
if (idx < 0 || idx >= dates.length)
143+
return const SizedBox.shrink();
135144
return Padding(
136145
padding: const EdgeInsets.only(top: 8),
137146
child: Text(
@@ -147,12 +156,14 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
147156
interval: 1,
148157
),
149158
),
150-
rightTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)),
151-
topTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)),
152-
),
153-
borderData: FlBorderData(
154-
show: false,
159+
rightTitles: AxisTitles(
160+
sideTitles: SideTitles(showTitles: false),
161+
),
162+
topTitles: AxisTitles(
163+
sideTitles: SideTitles(showTitles: false),
164+
),
155165
),
166+
borderData: FlBorderData(show: false),
156167
lineBarsData: [
157168
LineChartBarData(
158169
spots: spots,
@@ -162,12 +173,13 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
162173
isStrokeCapRound: true,
163174
dotData: FlDotData(
164175
show: true,
165-
getDotPainter: (spot, percent, bar, index) => FlDotCirclePainter(
166-
radius: 3,
167-
color: Colors.white,
168-
strokeWidth: 2.5,
169-
strokeColor: Colors.orange,
170-
),
176+
getDotPainter: (spot, percent, bar, index) =>
177+
FlDotCirclePainter(
178+
radius: 3,
179+
color: Colors.white,
180+
strokeWidth: 2.5,
181+
strokeColor: Colors.orange,
182+
),
171183
),
172184
),
173185
],
@@ -223,11 +235,7 @@ class _HomeDegreeGraph extends State<HomeDegreeGraph> {
223235
),
224236
),
225237
if (idx != history.length - 1)
226-
Container(
227-
width: 2,
228-
height: 24,
229-
color: Colors.orange,
230-
),
238+
Container(width: 2, height: 24, color: Colors.orange),
231239
],
232240
),
233241
const SizedBox(width: 8),

frontend/ongi/lib/screens/home/home_ourfamily_text_withoutUser.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class HomeOngiTextWithoutUser extends StatelessWidget {
1212
padding: EdgeInsets.only(
1313
left: 32,
1414
right: 0, // 오른쪽 패딩 제거
15-
top: 16,
1615
bottom: 16,
1716
),
1817
child: Column(

frontend/ongi/lib/screens/photo/photo_calendar_screen.dart

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter_svg/svg.dart';
23
import 'package:table_calendar/table_calendar.dart';
34
import 'package:ongi/core/app_light_background.dart';
45
import 'package:ongi/core/app_colors.dart';
@@ -254,18 +255,14 @@ class _PhotoCalendarScreenState extends State<PhotoCalendarScreen> {
254255
children: [
255256
const PhotoDateScreen(),
256257
Positioned(
257-
top: MediaQuery.of(context).padding.top + 16,
258-
left: 20,
258+
top: MediaQuery.of(context).padding.top - 10,
259+
left: 40,
259260
child: GestureDetector(
260261
onTap: _goBackToCalendar,
261-
child: const SizedBox(
262-
width: 44,
263-
height: 44,
264-
child: Icon(
265-
Icons.arrow_back_ios,
266-
color: AppColors.ongiOrange,
267-
size: 30,
268-
),
262+
child: SizedBox(
263+
width: 36,
264+
height: 36,
265+
child: SvgPicture.asset('assets/images/back_icon_black.svg'),
269266
),
270267
),
271268
),

frontend/ongi/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ flutter:
5656
- assets/images/users/elderly_woman.png
5757
- assets/images/close_icon_orange.svg
5858
- assets/images/close_icon_black.svg
59+
- assets/images/back_icon_black.svg
5960
- assets/images/dropdown_icon.svg
6061
- assets/images/camera_button.svg
6162
- assets/images/step_tracker_crown.svg

0 commit comments

Comments
 (0)