From dce5777fbbaa7d8611c819fe3a75ab7f85a9a09d Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Sat, 20 Jun 2020 22:02:18 +0800
Subject: Add an option to automatically try loading removed gfycat videos on
 Redgifs.

---
 app/src/main/res/xml/autoplay_preferences.xml | 24 -----------------
 app/src/main/res/xml/main_preferences.xml     | 11 +++-----
 app/src/main/res/xml/video_preferences.xml    | 38 +++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 32 deletions(-)
 delete mode 100644 app/src/main/res/xml/autoplay_preferences.xml
 create mode 100644 app/src/main/res/xml/video_preferences.xml

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

diff --git a/app/src/main/res/xml/autoplay_preferences.xml b/app/src/main/res/xml/autoplay_preferences.xml
deleted file mode 100644
index 5cc344aa..00000000
--- a/app/src/main/res/xml/autoplay_preferences.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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">
-
-    <ListPreference
-        app:defaultValue="0"
-        android:entries="@array/settings_video_autoplay"
-        app:entryValues="@array/settings_video_autoplay_values"
-        app:key="video_autoplay"
-        app:title="@string/settings_video_autoplay_title"
-        app:useSimpleSummaryProvider="true" />
-
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="mute_autoplaying_videos"
-        app:icon="@drawable/ic_mute_preferences_24dp"
-        app:title="@string/settings_mute_autoplaying_videos_title" />
-
-    <SwitchPreference
-        app:defaultValue="true"
-        app:key="autoplay_nsfw_videos"
-        app:title="@string/settings_autoplay_nsfw_videos_title" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index f332a49c..c15bfee4 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -29,14 +29,9 @@
         app:title="@string/settings_open_link_in_app_title" />
 
     <Preference
-        app:title="@string/settings_video_autoplay_title"
-        app:fragment="ml.docilealligator.infinityforreddit.Settings.AutoplayPreferenceFragment" />
-
-    <SwitchPreference
-        app:defaultValue="false"
-        app:key="mute_video"
-        app:icon="@drawable/ic_mute_preferences_24dp"
-        app:title="@string/settings_mute_video_title" />
+        app:title="@string/settigns_video_title"
+        android:icon="@drawable/ic_outline_video_24dp"
+        app:fragment="ml.docilealligator.infinityforreddit.Settings.VideoPreferenceFragment" />
 
     <SwitchPreference
         app:defaultValue="false"
diff --git a/app/src/main/res/xml/video_preferences.xml b/app/src/main/res/xml/video_preferences.xml
new file mode 100644
index 00000000..bb690347
--- /dev/null
+++ b/app/src/main/res/xml/video_preferences.xml
@@ -0,0 +1,38 @@
+<?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="mute_video"
+        app:icon="@drawable/ic_mute_preferences_24dp"
+        app:title="@string/settings_mute_video_title" />
+
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="automatically_try_redgifs"
+        app:title="@string/settings_automatically_try_redgifs_title" />
+
+    <PreferenceCategory
+        app:title="@string/settings_video_autoplay_title" />
+
+    <ListPreference
+        app:defaultValue="0"
+        android:entries="@array/settings_video_autoplay"
+        app:entryValues="@array/settings_video_autoplay_values"
+        app:key="video_autoplay"
+        app:title="@string/settings_video_autoplay_title"
+        app:useSimpleSummaryProvider="true" />
+
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="mute_autoplaying_videos"
+        app:icon="@drawable/ic_mute_preferences_24dp"
+        app:title="@string/settings_mute_autoplaying_videos_title" />
+
+    <SwitchPreference
+        app:defaultValue="true"
+        app:key="autoplay_nsfw_videos"
+        app:title="@string/settings_autoplay_nsfw_videos_title" />
+
+</PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3