From 8ed7f54d46307177e4ef05721b3c6f15aa4fa9c4 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 13 Jun 2020 22:11:57 +0800
Subject: Add an option to move thumbnail in compact layout to the left.

---
 app/src/main/res/layout/item_post_compact.xml          |  1 +
 app/src/main/res/values/strings.xml                    |  1 +
 .../main/res/xml/immersive_interface_preferences.xml   | 17 +++++++++++++++++
 app/src/main/res/xml/interface_preference.xml          | 18 +++++++-----------
 4 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/xml/immersive_interface_preferences.xml

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

diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml
index a8f3d262..59444cef 100644
--- a/app/src/main/res/layout/item_post_compact.xml
+++ b/app/src/main/res/layout/item_post_compact.xml
@@ -76,6 +76,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/title_and_image_constraint_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86d705aa..f79e18a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -343,6 +343,7 @@
     <string name="settings_show_elapsed_time">Show Elapsed Time in Posts and Comments</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>
     <string name="settings_swap_tap_and_long_title">Swap Tap and Long Press in Comments</string>
     <string name="settings_swipe_to_go_back_from_post_detail_title">Swipe Right to Go Back From Comments</string>
     <string name="settings_lock_jump_to_next_top_level_comment_button_title">Lock Jump to Next Top-level Comment Button</string>
diff --git a/app/src/main/res/xml/immersive_interface_preferences.xml b/app/src/main/res/xml/immersive_interface_preferences.xml
new file mode 100644
index 00000000..962faa10
--- /dev/null
+++ b/app/src/main/res/xml/immersive_interface_preferences.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="immersive_interface"
+        app:title="@string/settings_immersive_interface_title"
+        app:isPreferenceVisible="false" />
+
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="immersive_interface_ignore_nav_bar"
+        app:title="@string/settings_immersive_interface_ignore_nav_bar_title"
+        app:summary="@string/settings_immersive_interface_ignore_nav_bar_summary"
+        app:isPreferenceVisible="false" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/interface_preference.xml b/app/src/main/res/xml/interface_preference.xml
index 1d77970c..d2525eb6 100644
--- a/app/src/main/res/xml/interface_preference.xml
+++ b/app/src/main/res/xml/interface_preference.xml
@@ -7,18 +7,9 @@
         app:icon="@drawable/ic_font_size_24dp"
         app:fragment="ml.docilealligator.infinityforreddit.Settings.FontPreferenceFragment" />
 
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="immersive_interface"
+    <Preference
         app:title="@string/settings_immersive_interface_title"
-        app:isPreferenceVisible="false" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="immersive_interface_ignore_nav_bar"
-        app:title="@string/settings_immersive_interface_ignore_nav_bar_title"
-        app:summary="@string/settings_immersive_interface_ignore_nav_bar_summary"
-        app:isPreferenceVisible="false" />
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.ImmersiveInterfacePreferenceFragment" />
 
     <Preference
         app:title="@string/settings_customize_tabs_in_main_page_title"
@@ -54,6 +45,11 @@
         app:key="show_divider_in_compact_layout"
         app:title="@string/settings_show_divider_in_compact_layout" />
 
+    <SwitchPreference
+        app:defaultValue="false"
+        app:key="show_thumbnail_on_the_right_in_compact_layout"
+        app:title="@string/settings_show_thumbnail_on_the_right_in_compact_layout" />
+
     <SwitchPreference
         app:defaultValue="false"
         app:key="show_top_level_comments_first"
-- 
cgit v1.2.3