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/xml/interface_preference.xml    |  7 +++----
 app/src/main/res/xml/time_format_preferences.xml | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/xml/time_format_preferences.xml

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

diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index d2525eb6..900ee84d 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -27,10 +27,9 @@
         app:key="vote_buttons_on_the_right"
         app:title="@string/settings_vote_buttons_on_the_right_title" />
 
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="show_elapsed_time"
-        app:title="@string/settings_show_elapsed_time" />
+    <Preference
+        app:title="@string/settings_time_format_title"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.TimeFormatPreferenceFragment" />
 
     <ListPreference
         app:defaultValue="0"
diff --git a/app/src/main/res/xml/time_format_preferences.xml b/app/src/main/res/xml/time_format_preferences.xml
new file mode 100644
index 00000000..a6080d32
--- /dev/null
+++ b/app/src/main/res/xml/time_format_preferences.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="show_elapsed_time"
+        app:title="@string/settings_show_elapsed_time" />
+
+    <ListPreference
+        app:defaultValue="MMM d, yyyy, HH:mm"
+        app:entries="@array/settings_time_format"
+        app:entryValues="@array/settings_time_format_values"
+        app:key="time_format"
+        app:title="@string/settings_time_format_title"
+        app:useSimpleSummaryProvider="true" />
+</PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3