From 36b7ab5f1b4763a0c5909b1d71b81f17058e4d5b Mon Sep 17 00:00:00 2001
From: polymorphicshade <polymorphicshade@gmail.com>
Date: Tue, 15 Dec 2020 16:09:42 -0700
Subject: [PATCH] SponsorBlock: Added Disable TV UI extra setting, and other
 misc setting-related refactoring

---
 .../org/schabi/newpipe/util/DeviceUtils.java  |  7 ++++++
 app/src/main/res/values/settings_keys.xml     |  1 +
 app/src/main/res/values/strings.xml           |  6 +++--
 app/src/main/res/xml/extra_settings.xml       | 13 ++++++++++
 .../main/res/xml/sponsor_block_settings.xml   | 24 ++++++++-----------
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
index 6d9842ee9..a51b8658e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
@@ -25,6 +25,13 @@ public final class DeviceUtils {
     }
 
     public static boolean isTv(final Context context) {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+
+        if (prefs.getBoolean(context
+                .getString(R.string.disable_tv_ui_key), false)) {
+            return false;
+        }
+
         if (isTV != null) {
             return isTV;
         }
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index be8c9fa2a..4ef6b2296 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -364,6 +364,7 @@
 
     <!-- Extras -->
     <string name="disable_tablet_ui_key" translatable="false">disable_tablet_ui</string>
+    <string name="disable_tv_ui_key" translatable="false">disable_tv_ui</string>
 
     <!-- Localizations   -->
     <string name="default_localization_key" translatable="false">system</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f53dc8f4..1cc9ae8a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -707,7 +707,6 @@
     <string name="show_thumbnail_summary">Show thumbnail on lock screen as background and inside notifications</string>
     <!-- SponsorBlock -->
     <string name="sponsor_block">SponsorBlock</string>
-    <string name="sponsor_block_information">Information</string>
     <string name="sponsor_block_home_page_title">View Website</string>
     <string name="sponsor_block_home_page_summary">View the official SponsorBlock website.</string>
     <string name="sponsor_block_enable_title">Skip Sponsors</string>
@@ -742,7 +741,10 @@
     <string name="sponsor_block_reset_colors_toast">Colors reset.</string>
     <!-- Extras -->
     <string name="extras">Extras</string>
+    <string name="extras_todo_summary">Tweaks, workarounds, and other miscellaneous settings belong here.</string>
     <string name="experimental_settings">Experimental Settings</string>
     <string name="disable_tablet_ui_title">Disable Tablet UI</string>
-    <string name="disable_tablet_ui_summary">Ignore tablet layouts. This is intended for workarounds related to specific scenarios.</string>
+    <string name="disable_tablet_ui_summary">Ignore tablet layouts. This is intended for specific workarounds. You may need to restart the app to see the effects.</string>
+    <string name="disable_tv_ui_title">Disable TV UI</string>
+    <string name="disable_tv_ui_summary">Ignore TV layouts. This is intended for specific workarounds. You may need to restart the app to see the effects.</string>
 </resources>
diff --git a/app/src/main/res/xml/extra_settings.xml b/app/src/main/res/xml/extra_settings.xml
index 67979432a..342336027 100644
--- a/app/src/main/res/xml/extra_settings.xml
+++ b/app/src/main/res/xml/extra_settings.xml
@@ -3,6 +3,12 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/extras">
 
+    <Preference
+        app:iconSpaceReserved="false"
+        android:selectable="false"
+        android:persistent="false"
+        android:summary="@string/extras_todo_summary"/>
+
     <PreferenceCategory
         android:layout="@layout/settings_category_header_layout"
         android:title="@string/experimental_settings">
@@ -13,5 +19,12 @@
             android:key="@string/disable_tablet_ui_key"
             android:summary="@string/disable_tablet_ui_summary"
             android:title="@string/disable_tablet_ui_title"/>
+
+        <SwitchPreference
+            app:iconSpaceReserved="false"
+            android:defaultValue="false"
+            android:key="@string/disable_tv_ui_key"
+            android:summary="@string/disable_tv_ui_summary"
+            android:title="@string/disable_tv_ui_title"/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/sponsor_block_settings.xml b/app/src/main/res/xml/sponsor_block_settings.xml
index 89cb20539..0ea3ddb35 100644
--- a/app/src/main/res/xml/sponsor_block_settings.xml
+++ b/app/src/main/res/xml/sponsor_block_settings.xml
@@ -2,22 +2,18 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/sponsor_block">
-    <PreferenceCategory
-        android:layout="@layout/settings_category_header_layout"
-        android:title="@string/sponsor_block_information">
 
-        <Preference
-            app:iconSpaceReserved="false"
-            android:key="@string/sponsor_block_home_page_key"
-            android:summary="@string/sponsor_block_home_page_summary"
-            android:title="@string/sponsor_block_home_page_title"/>
+    <Preference
+        app:iconSpaceReserved="false"
+        android:key="@string/sponsor_block_home_page_key"
+        android:summary="@string/sponsor_block_home_page_summary"
+        android:title="@string/sponsor_block_home_page_title"/>
 
-        <Preference
-            app:iconSpaceReserved="false"
-            android:key="@string/sponsor_block_privacy_key"
-            android:summary="@string/sponsor_block_privacy_summary"
-            android:title="@string/sponsor_block_privacy_title"/>
-    </PreferenceCategory>
+    <Preference
+        app:iconSpaceReserved="false"
+        android:key="@string/sponsor_block_privacy_key"
+        android:summary="@string/sponsor_block_privacy_summary"
+        android:title="@string/sponsor_block_privacy_title"/>
 
     <PreferenceCategory
         android:layout="@layout/settings_category_header_layout"