From 3bbc9f79c8dcd514b4a5f707ba8dfdd2ccf57d76 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Wed, 15 Jun 2022 16:20:14 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tieba/post/utils/DateTimeUtils.kt         | 38 +++++++++----------
 app/src/main/res/values/strings.xml           |  3 +-
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt
index e292b2fe..7177a6dc 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/DateTimeUtils.kt
@@ -25,38 +25,34 @@ object DateTimeUtils {
         }
         val currentCalendar = Calendar.getInstance()
         return if (currentCalendar.after(calendar)) {
-            if (calendar.get(Calendar.YEAR) == currentCalendar.get(Calendar.YEAR)) {
-                if (calendar.get(Calendar.MONTH) == currentCalendar.get(Calendar.MONTH)) {
-                    if (calendar.get(Calendar.DAY_OF_MONTH) == currentCalendar.get(Calendar.DAY_OF_MONTH)) {
-                        if (calendar.get(Calendar.HOUR_OF_DAY) == currentCalendar.get(Calendar.HOUR_OF_DAY)) {
-                            if (calendar.get(Calendar.MINUTE) == currentCalendar.get(Calendar.MINUTE)) {
-                                context.getString(
-                                    R.string.relative_date_second,
-                                    currentCalendar.get(Calendar.SECOND) - calendar.get(Calendar.SECOND)
-                                )
-                            } else {
-                                context.getString(
-                                    R.string.relative_date_minute,
-                                    currentCalendar.get(Calendar.MINUTE) - calendar.get(Calendar.MINUTE)
-                                )
-                            }
+            if (calendar.get(Calendar.YEAR) == currentCalendar.get(Calendar.YEAR) && calendar.get(
+                    Calendar.MONTH
+                ) == currentCalendar.get(Calendar.MONTH)
+            ) {
+                if (calendar.get(Calendar.DAY_OF_MONTH) == currentCalendar.get(Calendar.DAY_OF_MONTH)) {
+                    if (calendar.get(Calendar.HOUR_OF_DAY) == currentCalendar.get(Calendar.HOUR_OF_DAY)) {
+                        if (calendar.get(Calendar.MINUTE) == currentCalendar.get(Calendar.MINUTE)) {
+                            context.getString(
+                                R.string.relative_date_second,
+                                currentCalendar.get(Calendar.SECOND) - calendar.get(Calendar.SECOND)
+                            )
                         } else {
                             context.getString(
-                                R.string.relative_date_hour,
-                                currentCalendar.get(Calendar.HOUR_OF_DAY) - calendar.get(Calendar.HOUR_OF_DAY)
+                                R.string.relative_date_minute,
+                                currentCalendar.get(Calendar.MINUTE) - calendar.get(Calendar.MINUTE)
                             )
                         }
                     } else {
                         context.getString(
-                            R.string.relative_date_month,
-                            currentCalendar.get(Calendar.DAY_OF_MONTH) - calendar.get(Calendar.DAY_OF_MONTH)
+                            R.string.relative_date_today,
+                            calendar.format("HH:mm")
                         )
                     }
                 } else {
-                    calendar.format(context.getString(R.string.pattern_date_short))
+                    calendar.format("MM-dd HH:mm")
                 }
             } else {
-                calendar.format(context.getString(R.string.pattern_date_long))
+                calendar.format("yyyy-MM-dd HH:mm")
             }
         } else {
             calendar.format(context.getString(R.string.relative_date_after))
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 248605b5..5cb5123c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -409,7 +409,7 @@
     <string name="text_badge_history_forum">贴吧</string>
     <string name="title_history_thread">贴子记录</string>
     <string name="title_history_forum">经过贴吧</string>
-    <string name="tip_thread_item_thread">发布于 %1$s</string>
+    <string name="tip_thread_item_thread">%1$s 来自 %2$s</string>
     <string name="title_all_reply">全部</string>
     <string name="title_thread_header">回复 %1$s</string>
     <string name="btn_agree_post">%1$s 赞</string>
@@ -521,4 +521,5 @@
     <string name="usage_webview_location_permission">用于向当前访问的网页提供你的位置信息，以便该网页向你提供相关服务。</string>
     <string name="title_hide_forum_intro_and_stat">精简吧页面</string>
     <string name="summary_hide_forum_intro_and_stat">开启后将隐藏吧页面的吧简介和数据（仍然可以通过“关于本吧”查看这些内容）</string>
+    <string name="relative_date_today">今天 %1$s</string>
 </resources>