From d24b7cb7fbd4d4b65fc0c5ab28b503b9027318f6 Mon Sep 17 00:00:00 2001
From: Sangho Kim <marchbreeze03@gmail.com>
Date: Fri, 12 Jan 2024 19:26:59 +0900
Subject: [PATCH] =?UTF-8?q?[FIX/#85]=20=EC=8A=A4=ED=8A=B8=EB=A7=81=20?=
 =?UTF-8?q?=EC=B6=94=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/going/data/dto/NonDataBaseResponse.kt | 2 +-
 .../com/going/presentation/todo/ourtodo/OurTodoFragment.kt  | 6 +++---
 presentation/src/main/res/values/strings.xml                | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/data/src/main/java/com/going/data/dto/NonDataBaseResponse.kt b/data/src/main/java/com/going/data/dto/NonDataBaseResponse.kt
index 3138cd55..24f56e49 100644
--- a/data/src/main/java/com/going/data/dto/NonDataBaseResponse.kt
+++ b/data/src/main/java/com/going/data/dto/NonDataBaseResponse.kt
@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class NonDataBaseResponse<T>(
+data class NonDataBaseResponse(
     @SerialName("status")
     val status: Int,
     @SerialName("code")
diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt
index 613c8e11..1e154d6b 100644
--- a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt
+++ b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt
@@ -111,9 +111,9 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
                     binding.run {
                         tvOurTodoTitleUp.text = state.data.title
                         // TODO: 날짜 분기처리
-                        tvOurTodoTitleDown.text = "여행일까지 %s일 남았어요!".format(state.data.day)
+                        tvOurTodoTitleDown.text = getString(R.string.our_todo_title_down).format(state.data.day)
                         setDateTextColor()
-                        tvOurTodoTitleDate.text = "%s - %s".format(convertDate(state.data.startDate), convertDate(state.data.endDate))
+                        tvOurTodoTitleDate.text = getString(R.string.our_todo_date_form).format(convertDate(state.data.startDate), convertDate(state.data.endDate))
                         progressBarOurTodo.progress = state.data.progress
                         tvOurTripInfoPercent.text = state.data.progress.toString() + "%"
                         adapter.submitList(state.data.participants)
@@ -129,7 +129,7 @@ class OurTodoFragment() : BaseFragment<FragmentOurTodoBinding>(R.layout.fragment
 
     private fun convertDate(date: String): String {
         val splitDate = date.split(".")
-        return "${splitDate[1]}월 ${splitDate[2]}일"
+        return getString(R.string.our_todo_day_form).format(splitDate[1], splitDate[2])
     }
 
     override fun onDestroyView() {
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
index 63c7f952..c168acb6 100644
--- a/presentation/src/main/res/values/strings.xml
+++ b/presentation/src/main/res/values/strings.xml
@@ -65,6 +65,9 @@
     <string name="our_todo_tv_trip_friend_title">여행 친구들</string>
     <string name="our_todo_btn_invite_friend">초대</string>
     <string name="our_todo_btn_add_todo">같이 할일</string>
+    <string name="our_todo_title_down">여행일까지 %s일 남았어요!</string>
+    <string name="our_todo_date_form">%s - %s</string>
+    <string name="our_todo_day_form">%s월 %s일</string>
 
     <!--my_todo-->
     <string name="my_todo_btn_add_todo">나의 할일</string>