Merge pull request #78 from TeamSeeMeet/feature/homeView

[FIX] d-day 계산 수정.

Author: You-jeong136

Diff for: app/src/main/java/org/seemeet/seemeet/util/Extension.kt

@@ -6,9 +6,7 @@ import android.widget.TextView
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
-import java.time.DayOfWeek
-import java.time.LocalDate
-import java.time.LocalDateTime
+import java.time.*
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoUnit
 import java.time.temporal.WeekFields
@@ -89,10 +87,11 @@ fun String.monthDayParsing() : String {
     return "${date[1]}월 ${date[2]}일"
 }
 fun String.calDday() : Int {
-    val today = LocalDate.now().dayOfMonth
-    val date = this.split("-")[2].toInt()
+    val comeDay =  LocalDate.parse(this, DateTimeFormatter.ISO_DATE).atStartOfDay().toInstant(
+        ZoneOffset.of("+9"))
+    val today = LocalDateTime.now().toInstant( ZoneOffset.of("+9"))
 
-    return date - today
+    return ChronoUnit.DAYS.between(today, comeDay).toInt()
 }
 
 fun String.dateParsingIso() : LocalDateTime {
@@ -112,4 +111,3 @@ fun String.setBetweenDays2() : Long {
 
     return ChronoUnit.DAYS.between(created, today)
 }
-

Diff for: app/src/main/res/values/strings.xml

@@ -60,7 +60,7 @@
     <string name="noti_in_progress">진행 중</string>
     <string name="noti_done">완료</string>
     <string name="noti_send">보낸 요청</string>
-    <string name="noti_day">1일전</string>
+    <string name="noti_day">0일전</string>
     <string name="noti_send_msg_wait">친구</string>
     <string name="noti_send_msg_wait_num">3</string>
     <string name="noti_send_msg_wait2">명의 답변을 기다리고 있어요!</string>