Merge pull request #3184 from opusforlife2/relocate_settings

Relocate two settings from Appearance to Content

Author: Stypox

app/src/main/res/xml/appearance_settings.xml

@@ -13,12 +13,6 @@
         android:summary="%s"
         android:title="@string/theme_title"/>
 
-    <SwitchPreference
-        app:iconSpaceReserved="false"
-        android:defaultValue="true"
-        android:key="@string/show_next_video_key"
-        android:title="@string/show_next_and_similar_title"/>
-
     <SwitchPreference
         app:iconSpaceReserved="false"
         android:defaultValue="true"
@@ -41,11 +35,4 @@
         android:title="@string/caption_setting_title"
         android:summary="@string/caption_setting_description"/>
 
-    <PreferenceScreen
-        app:iconSpaceReserved="false"
-        android:fragment="org.schabi.newpipe.settings.tabs.ChooseTabsFragment"
-        android:summary="@string/main_page_content_summary"
-        android:key="@string/main_page_content_key"
-        android:title="@string/main_page_content"/>
-
 </PreferenceScreen>

app/src/main/res/xml/content_settings.xml

@@ -31,6 +31,13 @@
         android:summary="%s"
         android:title="@string/default_content_country_title"/>
 
+    <PreferenceScreen
+        app:iconSpaceReserved="false"
+        android:fragment="org.schabi.newpipe.settings.tabs.ChooseTabsFragment"
+        android:summary="@string/main_page_content_summary"
+        android:key="@string/main_page_content_key"
+        android:title="@string/main_page_content"/>
+
     <PreferenceScreen
         app:iconSpaceReserved="false"
         android:fragment="org.schabi.newpipe.settings.PeertubeInstanceListFragment"
@@ -58,6 +65,12 @@
         android:title="@string/download_thumbnail_title"
         android:summary="@string/download_thumbnail_summary"/>
 
+    <SwitchPreference
+        app:iconSpaceReserved="false"
+        android:defaultValue="true"
+        android:key="@string/show_next_video_key"
+        android:title="@string/show_next_and_similar_title"/>
+
     <SwitchPreference
         app:iconSpaceReserved="false"
         android:defaultValue="true"