Youtube Settings to remove distracting elements and recommended

This commit is contained in:
Sujit Acharya
2023-03-31 17:33:06 +05:30
parent 3390454856
commit e760cae176
5 changed files with 73 additions and 4 deletions
@@ -70,6 +70,7 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
private static final String PREF_CLEAR_DATA_SECTION = "clear_data_section";
private static final String PREF_BRAVE_SOCIAL_BLOCKING_SECTION =
"brave_social_blocking_section";
private static final String PREF_YOUTUBE_SECTION = "youtube_section";
private static final String PREF_OTHER_PRIVACY_SETTINGS_SECTION =
"other_privacy_settings_section";
@@ -90,6 +91,11 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
private static final String PREF_SHOW_AUTOCOMPLETE_IN_ADDRESS_BAR =
"show_autocomplete_in_address_bar";
private static final String PREF_AUTOCOMPLETE_TOP_SITES = "autocomplete_top_sites";
private static final String PREF_HIDE_YOUTUBE_RECOMMENDED_CONTENT =
"hide_youtube_recommended_content";
private static final String PREF_HIDE_YOUTUBE_DISTRACTING_ELEMENTS =
"hide_youtube_distracting_elements";
private static final String PREF_SOCIAL_BLOCKING_GOOGLE = "social_blocking_google";
private static final String PREF_SOCIAL_BLOCKING_FACEBOOK = "social_blocking_facebook";
private static final String PREF_SOCIAL_BLOCKING_TWITTER = "social_blocking_twitter";
@@ -118,6 +124,8 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
PREF_BRAVE_SOCIAL_BLOCKING_SECTION, // social blocking section
PREF_SOCIAL_BLOCKING_GOOGLE, PREF_SOCIAL_BLOCKING_FACEBOOK,
PREF_SOCIAL_BLOCKING_TWITTER, PREF_SOCIAL_BLOCKING_LINKEDIN,
PREF_YOUTUBE_SECTION, // Youtube section
PREF_HIDE_YOUTUBE_RECOMMENDED_CONTENT, PREF_HIDE_YOUTUBE_DISTRACTING_ELEMENTS,
PREF_OTHER_PRIVACY_SETTINGS_SECTION, // other section
PREF_WEBRTC_POLICY, PREF_SAFE_BROWSING, PREF_INCOGNITO_LOCK, PREF_CAN_MAKE_PAYMENT,
PREF_UNSTOPPABLE_DOMAINS, PREF_ENS, PREF_SNS, PREF_IPFS_GATEWAY, PREF_SECURE_DNS,
@@ -156,6 +164,8 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
private ChromeSwitchPreference mIpfsGatewayPref;
private ChromeSwitchPreference mBlockCookieConsentNoticesPref;
private ChromeSwitchPreference mBlockSwitchToAppNoticesPref;
private ChromeSwitchPreference mHideYoutubeRecommendedContentPref;
private ChromeSwitchPreference mHideYoutubeDistractingElementsPref;
private PreferenceCategory mSocialBlockingCategory;
private ChromeSwitchPreference mSocialBlockingGoogle;
private ChromeSwitchPreference mHttpsEverywhere;
@@ -263,6 +273,14 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
(ChromeSwitchPreference) findPreference(PREF_BLOCK_SWITCH_TO_APP_NOTICES);
mBlockSwitchToAppNoticesPref.setOnPreferenceChangeListener(this);
mHideYoutubeRecommendedContentPref =
(ChromeSwitchPreference) findPreference(PREF_HIDE_YOUTUBE_RECOMMENDED_CONTENT);
mHideYoutubeRecommendedContentPref.setOnPreferenceChangeListener(this);
mHideYoutubeDistractingElementsPref =
(ChromeSwitchPreference) findPreference(PREF_HIDE_YOUTUBE_DISTRACTING_ELEMENTS);
mHideYoutubeDistractingElementsPref.setOnPreferenceChangeListener(this);
mBlockCrosssiteCookies =
(BraveDialogPreference) findPreference(PREF_BLOCK_CROSS_SITE_COOKIES);
mBlockCrosssiteCookies.setOnPreferenceChangeListener(this);
@@ -451,6 +469,18 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
mFilterListAndroidHandler.enableFilter(
FilterListConstants.SWITCH_TO_APP_UUID, (boolean) newValue);
}
} else if (PREF_HIDE_YOUTUBE_RECOMMENDED_CONTENT.equals(key)) {
if (mFilterListAndroidHandler != null) {
mFilterListAndroidHandler.enableFilter(
FilterListConstants.HIDE_YOUTUBE_RECOMMENDED_CONTENT_UUID,
(boolean) newValue);
}
} else if (PREF_HIDE_YOUTUBE_DISTRACTING_ELEMENTS.equals(key)) {
if (mFilterListAndroidHandler != null) {
mFilterListAndroidHandler.enableFilter(
FilterListConstants.HIDE_YOUTUBE_DISTRACTING_ELEMENTS_UUID,
(boolean) newValue);
}
} else if (PREF_FINGERPRINTING_PROTECTION.equals(key)) {
if (newValue instanceof String) {
final String newStringValue = String.valueOf(newValue);
@@ -704,11 +734,14 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE
if (mFilterListAndroidHandler != null) {
mFilterListAndroidHandler.isFilterListEnabled(FilterListConstants.COOKIE_LIST_UUID,
isEnabled -> { mBlockCookieConsentNoticesPref.setChecked(isEnabled); });
}
if (mFilterListAndroidHandler != null) {
mFilterListAndroidHandler.isFilterListEnabled(FilterListConstants.SWITCH_TO_APP_UUID,
isEnabled -> { mBlockSwitchToAppNoticesPref.setChecked(isEnabled); });
mFilterListAndroidHandler.isFilterListEnabled(
FilterListConstants.HIDE_YOUTUBE_RECOMMENDED_CONTENT_UUID,
isEnabled -> { mHideYoutubeRecommendedContentPref.setChecked(isEnabled); });
mFilterListAndroidHandler.isFilterListEnabled(
FilterListConstants.HIDE_YOUTUBE_DISTRACTING_ELEMENTS_UUID,
isEnabled -> { mHideYoutubeDistractingElementsPref.setChecked(isEnabled); });
}
// Debounce
if (mDebouncePref != null) {
@@ -96,6 +96,23 @@
android:key="social_blocking_linkedin"
android:title="@string/brave_shields_social_blocking_linkedin"
android:defaultValue="false" />
</PreferenceCategory>
<PreferenceCategory
android:key="youtube_section"
android:title="@string/youtube">
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="hide_youtube_recommended_content"
android:title="@string/hide_youtube_recommended_content"
android:order="25"
android:summary="@string/hide_youtube_recommended_content_description"
android:defaultValue="true" />
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="hide_youtube_distracting_elements"
android:title="@string/hide_youtube_distracting_elements"
android:order="25"
android:summary="@string/hide_youtube_distracting_elements_description"
android:defaultValue="true" />
</PreferenceCategory>
<PreferenceCategory
android:key="other_privacy_settings_section"
@@ -46,7 +46,7 @@ public class BravePrivacySettingsTest {
private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key";
private static int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 25;
private static int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 26;
private int mItemsLeft;
@@ -368,6 +368,21 @@ This file contains all "about" strings. It is set to NOT be translated, in tran
<message name="IDS_BRAVE_SHIELDS_BLOCKS_SCRIPTS_SUMMARY" desc="Switch for Block Scripts summary.">
Blocks JavaScript (may break sites)
</message>
<message name="IDS_YOUTUBE" desc="Text for youtube">
Youtube
</message>
<message name="IDS_HIDE_YOUTUBE_RECOMMENDED_CONTENT" desc="Hide YouTube Recommended Content">
Hide YouTube Recommended Content
</message>
<message name="IDS_HIDE_YOUTUBE_RECOMMENDED_CONTENT_DESCRIPTION" desc="Hides the up next, home feed and end card elements on YouTube.">
Hides the up next, home feed and end card elements on YouTube.
</message>
<message name="IDS_HIDE_YOUTUBE_DISTRACTING_ELEMENTS" desc="Hide YouTube Distracting Elements">
Hide YouTube Distracting Elements
</message>
<message name="IDS_HIDE_YOUTUBE_DISTRACTING_ELEMENTS_DESCRIPTION" desc="Hides the sign in, menu, comments and video info elements on YouTube.">
Hides the sign in, menu, comments and video info elements on YouTube.
</message>
<message name="IDS_BRAVE_SHIELDS_SOCIAL_BLOCKING_TITLE" desc="Title for social media blocking.">
Social Media Blocking
</message>
@@ -13,4 +13,8 @@ interface FilterListAndroidHandler {
const string kSwitchToAppUuid = "2F3DCE16-A19A-493C-A88F-2E110FBD37D6";
const string kCookieListUuid = "AC023D22-AE88-4060-A978-4FEEEC4221693";
const string kHideYoutubeRecommendedContentUuid
= "2D57ADED-3531-419A-9DED-7F8868BC1561";
const string kHideYoutubeDistractingElementsUuid
= "BD308B90-D3BB-4041-9114-22E096B0BA77";