Moved service-settings into own fragment

litetex · litetex · commit d840a633dc6d · 2022-04-15T17:20:20.000+02:00
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -4,7 +4,6 @@
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -20,7 +19,6 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceManager;
 
-import org.schabi.newpipe.DownloaderImpl;
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorUtil;
@@ -49,7 +47,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     private ContentSettingsManager manager;
 
     private String importExportDataPathKey;
-    private String youtubeRestrictedModeEnabledKey;
 
     private Localization initialSelectedLocalization;
     private ContentCountry initialSelectedContentCountry;
@@ -67,7 +64,6 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
         manager.deleteSettingsFile();
 
         importExportDataPathKey = getString(R.string.import_export_data_path);
-        youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
 
         addPreferencesFromResourceRegistry();
 
@@ -119,20 +115,6 @@ ZIP_MIME_TYPE, getImportExportDataUri()),
                 });
     }
 
-    @Override
-    public boolean onPreferenceTreeClick(final Preference preference) {
-        if (preference.getKey().equals(youtubeRestrictedModeEnabledKey)) {
-            final Context context = getContext();
-            if (context != null) {
-                DownloaderImpl.getInstance().updateYoutubeRestrictedModeCookies(context);
-            } else {
-                Log.w(TAG, "onPreferenceTreeClick: null context");
-            }
-        }
-
-        return super.onPreferenceTreeClick(preference);
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsResourceRegistry.java
@@ -5,6 +5,7 @@
 import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.services.ServicesSettingsFragment;
 
 import java.util.HashSet;
 import java.util.Objects;
@@ -33,6 +34,7 @@ private SettingsResourceRegistry() {
 
         add(AppearanceSettingsFragment.class, R.xml.appearance_settings);
         add(ContentSettingsFragment.class, R.xml.content_settings);
+        add(ServicesSettingsFragment.class, R.xml.services_settings);
         add(DebugSettingsFragment.class, R.xml.debug_settings).setSearchable(false);
         add(DownloadSettingsFragment.class, R.xml.download_settings);
         add(HistorySettingsFragment.class, R.xml.history_settings);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/services/ServicesSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/services/ServicesSettingsFragment.java
@@ -0,0 +1,38 @@
+package org.schabi.newpipe.settings.services;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.preference.Preference;
+
+import org.schabi.newpipe.DownloaderImpl;
+import org.schabi.newpipe.R;
+import org.schabi.newpipe.settings.BasePreferenceFragment;
+
+public class ServicesSettingsFragment extends BasePreferenceFragment {
+
+    private String youtubeRestrictedModeEnabledKey;
+
+    @Override
+    public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+        youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
+
+        addPreferencesFromResourceRegistry();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(final Preference preference) {
+        if (preference.getKey().equals(youtubeRestrictedModeEnabledKey)) {
+            final Context context = getContext();
+            if (context != null) {
+                DownloaderImpl.getInstance().updateYoutubeRestrictedModeCookies(context);
+            } else {
+                Log.w(TAG, "onPreferenceTreeClick: null context");
+            }
+        }
+
+        return super.onPreferenceTreeClick(preference);
+    }
+
+}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/services/instances/AbstractInstanceTypeCreator.java b/app/src/main/java/org/schabi/newpipe/settings/services/instances/AbstractInstanceTypeCreator.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.settings.serviceinstances;
+package org.schabi.newpipe.settings.services.instances;
 
 import androidx.annotation.DrawableRes;
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/services/instances/AbstractServiceInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/services/instances/AbstractServiceInstanceListFragment.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.settings.serviceinstances;
+package org.schabi.newpipe.settings.services.instances;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/services/instances/InstanceTypeCreator.java b/app/src/main/java/org/schabi/newpipe/settings/services/instances/InstanceTypeCreator.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.settings.serviceinstances;
+package org.schabi.newpipe.settings.services.instances;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/org/schabi/newpipe/settings/services/instances/UrlMultiInstanceTypeCreator.java b/app/src/main/java/org/schabi/newpipe/settings/services/instances/UrlMultiInstanceTypeCreator.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.settings.serviceinstances;
+package org.schabi.newpipe.settings.services.instances;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/services/instances/peertube/PeertubeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/services/instances/peertube/PeertubeInstanceListFragment.java
@@ -1,9 +1,9 @@
-package org.schabi.newpipe.settings.serviceinstances.peertube;
+package org.schabi.newpipe.settings.services.instances.peertube;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.extractor.services.peertube.PeertubeInstance;
-import org.schabi.newpipe.settings.serviceinstances.AbstractServiceInstanceListFragment;
-import org.schabi.newpipe.settings.serviceinstances.UrlMultiInstanceTypeCreator;
+import org.schabi.newpipe.settings.services.instances.AbstractServiceInstanceListFragment;
+import org.schabi.newpipe.settings.services.instances.UrlMultiInstanceTypeCreator;
 import org.schabi.newpipe.util.services.PeertubeInstanceManager;
 
 import java.util.Collections;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/services/instances/youtubelike/YouTubeLikeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/services/instances/youtubelike/YouTubeLikeInstanceListFragment.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.settings.serviceinstances.youtubelike;
+package org.schabi.newpipe.settings.services.instances.youtubelike;
 
 import android.content.Context;
 
@@ -9,9 +9,9 @@
 import org.schabi.newpipe.extractor.services.youtube.YoutubeLikeInstance;
 import org.schabi.newpipe.extractor.services.youtube.invidious.InvidiousInstance;
 import org.schabi.newpipe.extractor.services.youtube.youtube.YoutubeInstance;
-import org.schabi.newpipe.settings.serviceinstances.AbstractInstanceTypeCreator;
-import org.schabi.newpipe.settings.serviceinstances.AbstractServiceInstanceListFragment;
-import org.schabi.newpipe.settings.serviceinstances.UrlMultiInstanceTypeCreator;
+import org.schabi.newpipe.settings.services.instances.AbstractInstanceTypeCreator;
+import org.schabi.newpipe.settings.services.instances.AbstractServiceInstanceListFragment;
+import org.schabi.newpipe.settings.services.instances.UrlMultiInstanceTypeCreator;
 import org.schabi.newpipe.util.services.YoutubeLikeInstanceManager;
 
 import java.util.Arrays;
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
@@ -25,6 +25,7 @@
     <string name="service_kiosk_string">%1$s/%2$s</string>
     <string name="youtube">YouTube</string>
     <string name="soundcloud">SoundCloud</string>
+    <string name="peertube">PeerTube</string>
     <string name="preferred_open_action_share_menu_title">@string/app_name</string>
     <string name="leakcanary">LeakCanary</string>
 </resources>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
@@ -265,15 +265,7 @@
     <string name="stream_info_selected_tab_key">stream_info_selected_tab</string>
     <string name="show_hold_to_append_key">show_hold_to_append</string>
     <string name="content_language_key">content_language</string>
-    <string name="peertube_instance_setup_key">peertube_instance_setup</string>
-    <string name="peertube_selected_instance_key">peertube_selected_instance</string>
-    <string name="peertube_instance_list_key">peertube_instance_list</string>
-    <string name="yt_like_instance_setup_key">yt_like_instance_setup</string>
-    <string name="yt_like_instance_selected_instance_key">yt_like_instance_selected_instance</string>
-    <string name="yt_like_instance_list_key">yt_like_instance_list</string>
     <string name="content_country_key">content_country</string>
-    <string name="show_age_restricted_content">show_age_restricted_content</string>
-    <string name="youtube_restricted_mode_enabled">youtube_restricted_mode_enabled</string>
     <string name="enable_search_history_key">enable_search_history</string>
     <string name="enable_watch_history_key">enable_watch_history</string>
     <string name="main_page_content_key">main_page_content</string>
@@ -336,6 +328,17 @@
     <string name="downloads_storage_ask">downloads_storage_ask</string>
     <string name="storage_use_saf">storage_use_saf</string>
 
+    <!-- Services-Settings -->
+    <string name="services">Services</string>
+    <string name="peertube_instance_setup_key">peertube_instance_setup</string>
+    <string name="peertube_selected_instance_key">peertube_selected_instance</string>
+    <string name="peertube_instance_list_key">peertube_instance_list</string>
+    <string name="yt_like_instance_setup_key">yt_like_instance_setup</string>
+    <string name="yt_like_instance_selected_instance_key">yt_like_instance_selected_instance</string>
+    <string name="yt_like_instance_list_key">yt_like_instance_list</string>
+    <string name="show_age_restricted_content">show_age_restricted_content</string>
+    <string name="youtube_restricted_mode_enabled">youtube_restricted_mode_enabled</string>
+
     <!-- FileName Downloads  -->
     <string name="settings_file_charset_key">file_rename_charset</string>
     <string name="settings_file_replacement_character_key">file_replacement_character</string>
diff --git a/app/src/main/res/xml/content_settings.xml b/app/src/main/res/xml/content_settings.xml
@@ -42,34 +42,8 @@
         app:iconSpaceReserved="false" />
 
     <PreferenceScreen
-        android:fragment="org.schabi.newpipe.settings.serviceinstances.youtubelike.YouTubeLikeInstanceListFragment"
-        android:key="@string/yt_like_instance_setup_key"
-        android:summary="@string/yt_like_instance_url_summary"
-        android:title="@string/yt_like_instance_url_title"
-        app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
-
-    <PreferenceScreen
-        android:fragment="org.schabi.newpipe.settings.serviceinstances.peertube.PeertubeInstanceListFragment"
-        android:key="@string/peertube_instance_setup_key"
-        android:summary="@string/peertube_instance_url_summary"
-        android:title="@string/peertube_instance_url_title"
-        app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
-
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="@string/show_age_restricted_content"
-        android:summary="@string/show_age_restricted_content_summary"
-        android:title="@string/show_age_restricted_content_title"
-        app:singleLineTitle="false"
-        app:iconSpaceReserved="false" />
-
-    <SwitchPreferenceCompat
-        android:defaultValue="false"
-        android:key="@string/youtube_restricted_mode_enabled"
-        android:summary="@string/youtube_restricted_mode_enabled_summary"
-        android:title="@string/youtube_restricted_mode_enabled_title"
+        android:fragment="org.schabi.newpipe.settings.services.ServicesSettingsFragment"
+        android:title="@string/services"
         app:singleLineTitle="false"
         app:iconSpaceReserved="false" />
 
diff --git a/app/src/main/res/xml/services_settings.xml b/app/src/main/res/xml/services_settings.xml
@@ -0,0 +1,56 @@
+<?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"
+    android:title="@string/services">
+
+    <SwitchPreferenceCompat
+        android:defaultValue="false"
+        android:key="@string/show_age_restricted_content"
+        android:summary="@string/show_age_restricted_content_summary"
+        android:title="@string/show_age_restricted_content_title"
+        app:singleLineTitle="false"
+        app:iconSpaceReserved="false" />
+
+    <PreferenceCategory
+        android:layout="@layout/settings_category_header_layout"
+        android:title="@string/youtube"
+        app:singleLineTitle="false"
+        app:iconSpaceReserved="false">
+
+        <PreferenceScreen
+            android:fragment="org.schabi.newpipe.settings.services.instances.youtubelike.YouTubeLikeInstanceListFragment"
+            android:key="@string/yt_like_instance_setup_key"
+            android:summary="@string/yt_like_instance_url_summary"
+            android:title="@string/yt_like_instance_url_title"
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="@string/youtube_restricted_mode_enabled"
+            android:summary="@string/youtube_restricted_mode_enabled_summary"
+            android:title="@string/youtube_restricted_mode_enabled_title"
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:layout="@layout/settings_category_header_layout"
+        android:title="@string/peertube"
+        app:singleLineTitle="false"
+        app:iconSpaceReserved="false">
+
+        <PreferenceScreen
+            android:fragment="org.schabi.newpipe.settings.services.instances.peertube.PeertubeInstanceListFragment"
+            android:key="@string/peertube_instance_setup_key"
+            android:summary="@string/peertube_instance_url_summary"
+            android:title="@string/peertube_instance_url_title"
+            app:singleLineTitle="false"
+            app:iconSpaceReserved="false" />
+
+    </PreferenceCategory>
+
+
+
+</PreferenceScreen>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.schabi.newpipe.settings.serviceinstances;`
	`1`	`+package org.schabi.newpipe.settings.services.instances;`
`2`	`2`
`3`	`3`	`import androidx.annotation.DrawableRes;`
`4`	`4`