Skip to content

Commit 7f8177c

Browse files
committed
💄 러닝 히스토리 텍스트 포맷 개선
1 parent e3a28a2 commit 7f8177c

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

presentation/src/main/java/com/whyranoid/presentation/util/BindingAdapters.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ fun TextView.finishLongToDate(long: Long) {
4949
text = formatter.format(Date(long))
5050
}
5151

52-
@BindingAdapter("LongToTime")
52+
@BindingAdapter("longToTime")
5353
fun TextView.longToTime(long: Long) {
54-
val formatter = SimpleDateFormat("HH : mm", Locale.KOREA)
54+
val formatter = SimpleDateFormat("HH:mm", Locale.getDefault())
5555
text = formatter.format(Date(long))
5656
}

presentation/src/main/res/layout/item_running_history.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
<data>
77

8+
<import type="com.whyranoid.presentation.util.ExtensionsKt" />
9+
810
<variable
911
name="runningHistory"
1012
type="com.whyranoid.presentation.model.RunningHistoryUiModel" />
@@ -34,7 +36,7 @@
3436
android:layout_height="wrap_content"
3537
android:layout_marginTop="4dp"
3638
android:maxLines="1"
37-
android:text="@{Long.toString(runningHistory.date)}"
39+
android:text="@{ExtensionsKt.toRunningDateString(runningHistory.date)}"
3840
android:textAppearance="@style/MoGakRunText.Regular.Small"
3941
android:textColor="?attr/colorOnSecondary"
4042
app:layout_constraintEnd_toEndOf="@id/view_vertical_partition_line"
@@ -59,7 +61,7 @@
5961
android:id="@+id/tv_total_running_time"
6062
android:layout_width="wrap_content"
6163
android:layout_height="wrap_content"
62-
android:text="@{Integer.toString(runningHistory.totalRunningTime)}"
64+
android:text="@{String.format(@string/running_history_value_total_running_time, runningHistory.totalRunningTime / 3600, runningHistory.totalRunningTime / 60)}"
6365
android:textAppearance="@style/MoGakRunText.Regular.Small"
6466
app:layout_constraintBottom_toBottomOf="@id/tv_label_total_running_time"
6567
app:layout_constraintEnd_toEndOf="parent"
@@ -103,11 +105,11 @@
103105

104106
<TextView
105107
android:id="@+id/tv_start_time_value"
108+
longToTime="@{runningHistory.startedAt}"
106109
android:layout_width="wrap_content"
107110
android:layout_height="wrap_content"
108111
android:paddingTop="10dp"
109112
android:paddingBottom="20dp"
110-
android:text="@{Long.toString(runningHistory.startedAt)}"
111113
android:textAppearance="@style/MoGakRunText.Regular.Medium"
112114
app:layout_constraintEnd_toStartOf="@id/view_vertical_partition_line"
113115
app:layout_constraintHorizontal_bias="0.6"
@@ -126,12 +128,12 @@
126128
app:layout_constraintTop_toTopOf="@id/tv_start_time_label" />
127129

128130
<TextView
131+
longToTime="@{runningHistory.finishedAt}"
129132
android:layout_width="wrap_content"
130133
android:layout_height="wrap_content"
131134
android:layout_marginBottom="20dp"
132135
android:paddingTop="10dp"
133136
android:paddingBottom="20dp"
134-
android:text="@{Long.toString(runningHistory.finishedAt)}"
135137
android:textAppearance="@style/MoGakRunText.Regular.Medium"
136138
app:layout_constraintEnd_toEndOf="@id/view_horizontal_partition_line"
137139
app:layout_constraintHorizontal_bias="0.6"
@@ -156,7 +158,7 @@
156158
android:layout_marginTop="24dp"
157159
android:paddingTop="10dp"
158160
android:paddingBottom="20dp"
159-
android:text="@{Double.toString(runningHistory.totalDistance)}"
161+
android:text="@{runningHistory.totalDistance >= 1000 ? String.format(@string/running_history_value_running_distance_km, runningHistory.totalDistance / 1000) : String.format(@string/running_history_value_running_distance_m, runningHistory.totalDistance)}"
160162
android:textAppearance="@style/MoGakRunText.Regular.Medium"
161163
app:layout_constraintEnd_toStartOf="@id/view_vertical_partition_line"
162164
app:layout_constraintHorizontal_bias="0.6"
@@ -181,7 +183,7 @@
181183
android:layout_marginTop="24dp"
182184
android:paddingTop="10dp"
183185
android:paddingBottom="20dp"
184-
android:text="@{Double.toString(runningHistory.pace)}"
186+
android:text="@{String.format(@string/running_history_value_running_pace, runningHistory.pace)}"
185187
android:textAppearance="@style/MoGakRunText.Regular.Medium"
186188
app:layout_constraintEnd_toEndOf="@id/view_horizontal_partition_line"
187189
app:layout_constraintHorizontal_bias="0.6"

presentation/src/main/res/layout/item_running_post.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
android:layout_height="wrap_content"
103103
android:layout_marginEnd="50dp"
104104
android:layout_marginBottom="20dp"
105-
app:LongToTime="@{runningPost.runningHistory.startedAt}"
105+
app:longToTime="@{runningPost.runningHistory.startedAt}"
106106
app:layout_constraintBottom_toBottomOf="@id/view_horizontal_partition_line"
107107
app:layout_constraintEnd_toStartOf="@id/view_vertical_partition_line"
108108
tools:text="17:00" />
@@ -121,7 +121,7 @@
121121
android:layout_height="wrap_content"
122122
android:layout_marginEnd="50dp"
123123
android:layout_marginBottom="20dp"
124-
app:LongToTime="@{runningPost.runningHistory.finishedAt}"
124+
app:longToTime="@{runningPost.runningHistory.finishedAt}"
125125
app:layout_constraintBottom_toBottomOf="@id/view_horizontal_partition_line"
126126
app:layout_constraintEnd_toEndOf="parent"
127127
tools:text="19:22" />

presentation/src/main/res/values/strings.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
<string name="text_delete_post_fail">게시글 삭제에 실패하였습니다!</string>
3939
<string name="text_check_delete_post">해당 포스트를 삭제하시겠습니까?</string>
4040
<string name="text_delete">삭제</string>
41+
<string name="text_join_group">그룹 가입하기</string>
42+
<string name="text_like_count">좋아요 %d개</string>
4143

4244
<!-- 마이런 탭 화면 -->
4345
<string name="my_run_tool_bar_menu_setting">설정</string>
@@ -63,6 +65,8 @@
6365
<string name="text_go_to_create_group">그룹 생성하러 가기</string>
6466
<string name="text_group_introduce">그룹 소개</string>
6567
<string name="text_duplicate_check">중복확인</string>
68+
<string name="text_duplicated_group_name">중복된 그룹 이름입니다. 변경해주세요!</string>
69+
<string name="text_un_duplicated_group_name">사용 가능한 그룹 이름입니다!</string>
6670
<string name="text_create_group">그룹 생성하기</string>
6771
<string name="text_warning_create_group">그룹명과 그룹 소개를 입력해주세요.</string>
6872
<string name="text_create_group_success">그룹이 생성되었습니다!</string>
@@ -71,10 +75,14 @@
7175

7276
<!-- 운동 기록 아이템 뷰 -->
7377
<string name="running_history_label_total_running_time">총 운동시간</string>
78+
<string name="running_history_value_total_running_time">%d시간 %d분</string>
7479
<string name="running_history_label_start_running_time">시작시간</string>
7580
<string name="running_history_label_finish_running_time">종료시간</string>
7681
<string name="running_history_label_running_distance">이동거리</string>
82+
<string name="running_history_value_running_distance_m">%.0fm</string>
83+
<string name="running_history_value_running_distance_km">%.2fkm</string>
7784
<string name="running_history_label_running_pace">페이스</string>
85+
<string name="running_history_value_running_pace">%.2fkm/h</string>
7886

7987
<!-- 그룹 상세보기 화면-->
8088
<string name="text_headcount">%d명</string>
@@ -105,10 +113,6 @@
105113
<string name="running_channel_name">활동 추적</string>
106114
<string name="running_channel_description">달리기 활동을 추적하는 알림 채널입니다.</string>
107115
<string name="running_map_location_button">🎯</string>
108-
<string name="text_join_group">그룹 가입하기</string>
109-
<string name="text_duplicated_group_name">중복된 그룹 이름입니다. 변경해주세요!</string>
110-
<string name="text_un_duplicated_group_name">사용 가능한 그룹 이름입니다!</string>
111-
<string name="text_like_count">좋아요 %d개</string>
112116

113117
<!--라닝 종료 화면-->
114118
<string name="running_finish_tool_bar">러닝 종료</string>

0 commit comments

Comments
 (0)