Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional Shields menu item to show all blocked elements(same as reset) (#27910)

Browse Source 
Additional Shields menu item to show all blocked elements(same as reset)
(https://github.com/brave/brave-browser/issues/43955)

---------

Signed-off-by: Vadym Struts <vstruts@brave.com>
This commit is contained in:
vadims
2025-03-13 15:54:57 +01:00
committed by GitHub
parent 7bd8138540
commit b3e162dba1
30 changed files with 249 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java
+13
View File
@@ -87,6 +87,14 @@ public class BraveShieldsContentSettings {
mNativeBraveShieldsContentSettings = 0;
}
public static void resetCosmeticFilter(String url) {
BraveShieldsContentSettingsJni.get().resetCosmeticFilter(url);
}
public static boolean areAnyBlockedElementsPresent(String url) {
return BraveShieldsContentSettingsJni.get().areAnyBlockedElementsPresent(url);
}
public static void setShields(
Profile profile,
String host,
@@ -288,6 +296,11 @@ public class BraveShieldsContentSettings {
boolean getForgetFirstPartyStorageEnabled(String url, Profile profile);
void setCosmeticFilteringControlType(String type, String url, Profile profile);
String getCosmeticFilteringControlType(String url, Profile profile);
void resetCosmeticFilter(String url);
boolean areAnyBlockedElementsPresent(String url);
}
}
android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java
+25 -6
View File
@@ -111,6 +111,7 @@ public class BraveShieldsHandler
private View mAnchorView;
private LinearLayout mMainLayout;
private LinearLayout mSecondaryLayout;
private LinearLayout mThirdLayout;
private LinearLayout mAboutLayout;
private LinearLayout mToggleLayout;
private LinearLayout mThankYouLayout;
@@ -449,6 +450,7 @@ public class BraveShieldsHandler
private void initViews() {
mMainLayout = mPopupView.findViewById(R.id.main_layout);
mSecondaryLayout = mPopupView.findViewById(R.id.brave_shields_secondary_layout_id);
mThirdLayout = mPopupView.findViewById(R.id.brave_shields_third_layout_id);
mAboutLayout = mPopupView.findViewById(R.id.brave_shields_about_layout_id);
mToggleLayout = mPopupView.findViewById(R.id.brave_shields_toggle_layout_id);
mSiteBlockCounterText = mPopupView.findViewById(R.id.site_block_count_text);
@@ -504,12 +506,24 @@ public class BraveShieldsHandler
});
mToggleIcon.setColorFilter(mContext.getColor(R.color.shield_toggle_button_tint));
mToggleLayout.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
setToggleView(!mSecondaryLayout.isShown());
}
});
mToggleLayout.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View view) {
setToggleView(!mSecondaryLayout.isShown());
}
});
mThirdLayout.setOnClickListener(
new View.OnClickListener() {
@Override
public void onClick(View view) {
BraveShieldsContentSettings.resetCosmeticFilter(mUrlSpec);
hideBraveShieldsMenu();
Tab currentActiveTab = mIconFetcher.getTab();
currentActiveTab.reload();
}
});
ImageView mPrivacyReportIcon = mPrivacyReportLayout.findViewById(R.id.toggle_favicon);
mPrivacyReportIcon.setImageResource(R.drawable.ic_arrow_forward);
@@ -1020,6 +1034,10 @@ public class BraveShieldsHandler
mSiteBlockLayout.setVisibility(View.VISIBLE);
siteBrokenWarningText.setVisibility(View.VISIBLE);
mToggleLayout.setVisibility(View.VISIBLE);
mThirdLayout.setVisibility(
BraveShieldsContentSettings.areAnyBlockedElementsPresent(mUrlSpec)
? View.VISIBLE
: View.GONE);
String mUpText = mContext.getResources().getString(R.string.up);
SpannableString mSpanString = new SpannableString(mBraveShieldsText + " " + mUpText);
@@ -1032,6 +1050,7 @@ public class BraveShieldsHandler
mSiteBlockLayout.setVisibility(View.GONE);
siteBrokenWarningText.setVisibility(View.GONE);
mToggleLayout.setVisibility(View.GONE);
mThirdLayout.setVisibility(View.GONE);
setToggleView(false);
String mDownText = mContext.getResources().getString(R.string.down);