Merge pull request #4559 from FineFindus/feat/move-proxy-setting

feat(settings): move proxy settings to instance page
libre-tube · Aug 20, 2023 · 8934ab2 · 8934ab2
2 parents 0e8e627 + 56d2a4d
commit 8934ab2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -399,6 +399,7 @@
     <string name="playing_next">Playing next in %1$s</string>
     <string name="lbry_hls">LBRY HLS</string>
     <string name="lbry_hls_summary">Use LBRY HLS for streaming if available.</string>
+    <string name="proxy">Proxy</string>
     <string name="disable_proxy">Disable Piped proxy</string>
     <string name="disable_proxy_summary">Load videos and images directly from YouTube\'s servers. Only enable the option if you use a VPN anyways!</string>
     <string name="auto_fullscreen_shorts">Auto fullscreen on short videos</string>

diff --git a/app/src/main/res/xml/audio_video_settings.xml b/app/src/main/res/xml/audio_video_settings.xml
@@ -95,22 +95,6 @@
             app:title="@string/codecs"
             app:useSimpleSummaryProvider="true" />
 
-        <SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:icon="@drawable/ic_server"
-            android:summary="@string/disable_proxy_summary"
-            android:title="@string/disable_proxy"
-            app:key="disable_video_image_proxy" />
-
-        <SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:dependency="disable_video_image_proxy"
-            android:icon="@drawable/ic_music"
-            android:summary="@string/fallback_piped_proxy_desc"
-            android:title="@string/fallback_piped_proxy"
-            app:defaultValue="true"
-            app:key="fallback_piped_proxy" />
-
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/instance_settings.xml b/app/src/main/res/xml/instance_settings.xml
@@ -64,4 +64,24 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory app:title="@string/proxy">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:icon="@drawable/ic_server"
+            android:summary="@string/disable_proxy_summary"
+            android:title="@string/disable_proxy"
+            app:key="disable_video_image_proxy" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:dependency="disable_video_image_proxy"
+            android:icon="@drawable/ic_music"
+            android:summary="@string/fallback_piped_proxy_desc"
+            android:title="@string/fallback_piped_proxy"
+            app:defaultValue="true"
+            app:key="fallback_piped_proxy" />
+
+    </PreferenceCategory>
+
 </PreferenceScreen>