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( +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(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(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 @@ 여행 친구들 초대 같이 할일 + 여행일까지 %s일 남았어요! + %s - %s + %s월 %s일 나의 할일