From 9a4edde8fb5550b5caa66eeaba4e686a6b1ff442 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Thu, 2 Jul 2020 18:59:53 +0800
Subject: Add an option to change time format. Properly show message time in
 ViewPrivateMessagesActivity.

---
 app/src/main/res/values/arrays.xml  | 50 +++++++++++++++++++++++++++++++++++++
 app/src/main/res/values/strings.xml |  1 +
 2 files changed, 51 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 3efd7c75..2d8cdce0 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -168,4 +168,54 @@
         <item>4</item>
         <item>5</item>
     </string-array>
+
+    <string-array name="settings_time_format">
+        <item>Jan 2, 2020, 01:00</item>
+        <item>Jan 2, 2020, 01:00 PM</item>
+        <item>2 Jan, 2020, 01:00</item>
+        <item>2 Jan, 2020, 01:00 PM</item>
+        <item>1/2/2020 01:00 (Month first)</item>
+        <item>1/2/2020 01:00 PM (Month first)</item>
+        <item>2/1/2020 01:00 (Day first)</item>
+        <item>2/1/2020 01:00 PM (Day first)</item>
+        <item>2020/1/2 01:00 (Month first)</item>
+        <item>2020/1/2 01:00 PM (Month first)</item>
+        <item>1-2-2020 01:00 (Month first)</item>
+        <item>1-2-2020 01:00 PM (Month first)</item>
+        <item>2-1-2020 01:00 (Day first)</item>
+        <item>2-1-2020 01:00 PM (Day first)</item>
+        <item>2020-1-2 01:00 (Month first)</item>
+        <item>2020-1-2 01:00 PM (Month first)</item>
+        <item>1.2.2020 01:00 (Month first)</item>
+        <item>1.2.2020 01:00 PM (Month first)</item>
+        <item>2.1.2020 01:00 (Day first)</item>
+        <item>2.1.2020 01:00 PM (Day first)</item>
+        <item>2020.1.2 01:00 (Month first)</item>
+        <item>2020.1.2 01:00 PM (Month first)</item>
+    </string-array>
+
+    <string-array name="settings_time_format_values">
+        <item>MMM d, yyyy, HH:mm</item>
+        <item>MMM d, yyyy, hh:mm a</item>
+        <item>d MMM yyyy, HH:mm</item>
+        <item>d MMM yyyy, hh:mm a</item>
+        <item>M/d/yyyy HH:mm</item>
+        <item>M/d/yyyy hh:mm a</item>
+        <item>d/M/yyyy HH:mm</item>
+        <item>d/M/yyyy hh:mm a</item>
+        <item>yyyy/M/d HH:mm</item>
+        <item>yyyy/M/d hh:mm a</item>
+        <item>M-d-yyyy HH:mm</item>
+        <item>M-d-yyyy hh:mm a</item>
+        <item>d-M-yyyy HH:mm</item>
+        <item>d-M-yyyy hh:mm a</item>
+        <item>yyyy-M-d HH:mm</item>
+        <item>yyyy-M-d hh:mm a</item>
+        <item>M.d.yyyy HH:mm</item>
+        <item>M.d.yyyy hh:mm a</item>
+        <item>d.M.yyyy HH:mm</item>
+        <item>d.M.yyyy hh:mm a</item>
+        <item>yyyy.M.d HH:mm</item>
+        <item>yyyy.M.d hh:mm a</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5d78d9d8..8c874679 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -355,6 +355,7 @@
     <string name="settings_comment_toolbar_hidden">Comment Toolbar Hidden by Default</string>
     <string name="settings_show_absolute_number_of_votes_title">Show Absolute Number of Votes</string>
     <string name="settings_show_elapsed_time">Show Elapsed Time in Posts and Comments</string>
+    <string name="settings_time_format_title">Time Format</string>
     <string name="settings_default_post_layout">Default Post Layout</string>
     <string name="settings_show_divider_in_compact_layout">Show Divider in Compact Layout</string>
     <string name="settings_show_thumbnail_on_the_right_in_compact_layout">Show Thumbnail on the Right in Compact Layout</string>
-- 
cgit v1.2.3