aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-11-15 16:20:09 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-11-15 16:20:09 +0000
commitee60cbf640df8386bd7ffab0508edff9c283fdbd (patch)
treeae95ba175ad79d5f3349ea247ff078fc90083133 /app/src/main/res
parente0a9a02157153cbfd27ad6dacbfbabba158a278d (diff)
downloadinfinity-for-reddit-ee60cbf640df8386bd7ffab0508edff9c283fdbd.tar
infinity-for-reddit-ee60cbf640df8386bd7ffab0508edff9c283fdbd.tar.gz
infinity-for-reddit-ee60cbf640df8386bd7ffab0508edff9c283fdbd.tar.bz2
infinity-for-reddit-ee60cbf640df8386bd7ffab0508edff9c283fdbd.tar.lz
infinity-for-reddit-ee60cbf640df8386bd7ffab0508edff9c283fdbd.tar.xz
infinity-for-reddit-ee60cbf640df8386bd7ffab0508edff9c283fdbd.tar.zst
infinity-for-reddit-ee60cbf640df8386bd7ffab0508edff9c283fdbd.zip
Swipe right to go back from ViewPostDetailActivity. Fix inconsistency in elapsed time.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml13
-rw-r--r--app/src/main/res/xml/main_preferences.xml5
2 files changed, 18 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db0ed690..88228a44 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,6 +290,7 @@
<string name="settings_immersive_interface_title">Immersive Interface</string>
<string name="settings_vote_buttons_on_the_right_title">Vote Buttons on the Right</string>
<string name="settings_show_elapsed_time">Show Elpased Time in Posts and Comments</string>
+ <string name="swipe_to_go_back_from_post_detail">Swipe Right to Go Back From Comments</string>
<string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string>
<string name="settings_font_size_title">Font Size</string>
<string name="settings_title_font_size_title">Title Font Size</string>
@@ -353,4 +354,16 @@
<string name="post_layout_card">Card Layout</string>
<string name="post_layout_compact">Compact Layout</string>
+
+ <string name="elapsed_time_just_now">Just Now</string>
+ <string name="elapsed_time_a_minute_ago">1 Minute</string>
+ <string name="elapsed_time_minutes_ago">%1$d Minutes</string>
+ <string name="elapsed_time_an_hour_ago">1 Hour</string>
+ <string name="elapsed_time_hours_ago">%1$d Hours</string>
+ <string name="elapsed_time_yesterday">Yesterday</string>
+ <string name="elapsed_time_days_ago">%1$d Days</string>
+ <string name="elapsed_time_a_month_ago">1 Month</string>
+ <string name="elapsed_time_months_ago">%1$d Months</string>
+ <string name="elapsed_time_a_year_ago">1 Year</string>
+ <string name="elapsed_time_years_ago">%1$d Years</string>
</resources>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 548bf949..db4b75a1 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -36,6 +36,11 @@
app:key="show_elapsed_time"
app:title="@string/settings_show_elapsed_time"/>
+ <SwitchPreference
+ app:defaultValue="true"
+ app:key="swipe_to_go_back_from_post_detail"
+ app:title="@string/swipe_to_go_back_from_post_detail"/>
+
<Preference
app:title="@string/settings_font_size_title"
app:icon="@drawable/ic_font_size_24dp"