Skip to content

Commit 6fbfb98

Browse files
bscliftonbsclifton
committed
Revert "Merge pull request #8508 from brave/stats-social-sharing"
This reverts commit c5443ff, reversing changes made to 79aeb63.
1 parent 0ad26fd commit 6fbfb98

20 files changed

+39
-547
lines changed

‎android/brave_java_resources.gni

-8
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ brave_java_resources = [
9090
"java/res/drawable-hdpi/search_engine_startpage.png",
9191
"java/res/drawable-hdpi/settings_desktop_mode.png",
9292
"java/res/drawable-hdpi/settings_play_yt_video_in_browser.png",
93-
"java/res/drawable-hdpi/share_activity_background.png",
9493
"java/res/drawable-hdpi/share_icon.png",
9594
"java/res/drawable-hdpi/shortcut_incognito.png",
9695
"java/res/drawable-hdpi/slide_down.png",
@@ -183,7 +182,6 @@ brave_java_resources = [
183182
"java/res/drawable-mdpi/search_engine_startpage.png",
184183
"java/res/drawable-mdpi/settings_desktop_mode.png",
185184
"java/res/drawable-mdpi/settings_play_yt_video_in_browser.png",
186-
"java/res/drawable-mdpi/share_activity_background.png",
187185
"java/res/drawable-mdpi/share_icon.png",
188186
"java/res/drawable-mdpi/shortcut_incognito.png",
189187
"java/res/drawable-mdpi/slide_down.png",
@@ -327,7 +325,6 @@ brave_java_resources = [
327325
"java/res/drawable-xhdpi/search_engine_startpage.png",
328326
"java/res/drawable-xhdpi/settings_desktop_mode.png",
329327
"java/res/drawable-xhdpi/settings_play_yt_video_in_browser.png",
330-
"java/res/drawable-xhdpi/share_activity_background.png",
331328
"java/res/drawable-xhdpi/share_icon.png",
332329
"java/res/drawable-xhdpi/shortcut_incognito.png",
333330
"java/res/drawable-xhdpi/slide_down.png",
@@ -421,7 +418,6 @@ brave_java_resources = [
421418
"java/res/drawable-xxhdpi/search_engine_startpage.png",
422419
"java/res/drawable-xxhdpi/settings_desktop_mode.png",
423420
"java/res/drawable-xxhdpi/settings_play_yt_video_in_browser.png",
424-
"java/res/drawable-xxhdpi/share_activity_background.png",
425421
"java/res/drawable-xxhdpi/share_icon.png",
426422
"java/res/drawable-xxhdpi/shortcut_incognito.png",
427423
"java/res/drawable-xxhdpi/slide_down.png",
@@ -509,7 +505,6 @@ brave_java_resources = [
509505
"java/res/drawable-xxxhdpi/search_engine_startpage.png",
510506
"java/res/drawable-xxxhdpi/settings_desktop_mode.png",
511507
"java/res/drawable-xxxhdpi/settings_play_yt_video_in_browser.png",
512-
"java/res/drawable-xxxhdpi/share_activity_background.png",
513508
"java/res/drawable-xxxhdpi/share_icon.png",
514509
"java/res/drawable-xxxhdpi/shortcut_incognito.png",
515510
"java/res/drawable-xxxhdpi/slide_down.png",
@@ -602,8 +597,6 @@ brave_java_resources = [
602597
"java/res/drawable/ic_phone.xml",
603598
"java/res/drawable/ic_setbraveasdefault.xml",
604599
"java/res/drawable/ic_setbraveasdefault_dark.xml",
605-
"java/res/drawable/ic_share.xml",
606-
"java/res/drawable/ic_share_white.xml",
607600
"java/res/drawable/ic_shield_done_filled.xml",
608601
"java/res/drawable/ic_shield_done_filled_20dp.xml",
609602
"java/res/drawable/ic_sort.xml",
@@ -702,7 +695,6 @@ brave_java_resources = [
702695
"java/res/layout/brave_stats_bottom_sheet.xml",
703696
"java/res/layout/brave_stats_layout.xml",
704697
"java/res/layout/brave_stats_pager_layout.xml",
705-
"java/res/layout/brave_stats_share_layout.xml",
706698
"java/res/layout/brave_sync_add_laptop.xml",
707699
"java/res/layout/brave_sync_add_mobile.xml",
708700
"java/res/layout/brave_sync_device.xml",

‎android/java/org/chromium/chrome/browser/brave_stats/BraveStatsUtil.java

+9-112
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,20 @@
55

66
package org.chromium.chrome.browser.brave_stats;
77

8-
import android.content.Context;
9-
import android.content.Intent;
10-
import android.content.pm.ResolveInfo;
11-
import android.graphics.Bitmap;
12-
import android.graphics.Canvas;
13-
import android.net.Uri;
14-
import android.provider.MediaStore;
158
import android.util.Pair;
16-
import android.view.LayoutInflater;
179
import android.view.View;
1810
import android.widget.TextView;
1911

20-
import androidx.appcompat.app.AppCompatActivity;
21-
22-
import org.chromium.base.ContextUtils;
23-
import org.chromium.base.Log;
24-
import org.chromium.base.ThreadUtils;
25-
import org.chromium.base.task.AsyncTask;
2612
import org.chromium.chrome.R;
2713
import org.chromium.chrome.browser.app.BraveActivity;
2814
import org.chromium.chrome.browser.brave_stats.BraveStatsBottomSheetDialogFragment;
29-
import org.chromium.chrome.browser.local_database.DatabaseHelper;
3015
import org.chromium.chrome.browser.preferences.BravePref;
3116
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
3217
import org.chromium.chrome.browser.profiles.Profile;
33-
import org.chromium.chrome.browser.shields.BraveShieldsUtils;
3418

35-
import java.io.ByteArrayOutputStream;
3619
import java.text.SimpleDateFormat;
37-
import java.util.ArrayList;
3820
import java.util.Calendar;
3921
import java.util.Date;
40-
import java.util.List;
4122
import java.util.Locale;
4223

4324
public class BraveStatsUtil {
@@ -114,6 +95,7 @@ public static String getCalculatedDate(String dateFormat, int days) {
11495
}
11596

11697
public static void updateBraveStatsLayout(View view) {
98+
Profile mProfile = Profile.getLastUsedRegularProfile();
11799
TextView mAdsBlockedCountTextView =
118100
(TextView) view.findViewById(R.id.brave_stats_text_ads_count);
119101
TextView mDataSavedValueTextView =
@@ -127,109 +109,24 @@ public static void updateBraveStatsLayout(View view) {
127109
TextView mEstTimeSavedCountTextTextView =
128110
(TextView) view.findViewById(R.id.brave_stats_text_time_count_text);
129111

130-
List<Pair<String, String>> statsPairs = getStatsPairs();
131-
132-
mAdsBlockedCountTextView.setText(statsPairs.get(0).first);
133-
mDataSavedValueTextView.setText(statsPairs.get(1).first);
134-
mEstTimeSavedCountTextView.setText(statsPairs.get(2).first);
135-
mAdsBlockedCountTextTextView.setText(statsPairs.get(0).second);
136-
mDataSavedValueTextTextView.setText(statsPairs.get(1).second);
137-
mEstTimeSavedCountTextTextView.setText(statsPairs.get(2).second);
138-
}
139-
140-
public static void updateBraveShareStatsLayoutAndShare(View view) {
141-
TextView mAdsBlockedCountTextView = (TextView) view.findViewById(R.id.stats_trackers_no);
142-
TextView mDataSavedValueTextView = (TextView) view.findViewById(R.id.stats_saved_data_no);
143-
TextView mEstTimeSavedCountTextView = (TextView) view.findViewById(R.id.stats_timed_no);
144-
145-
List<Pair<String, String>> statsPairs = getStatsPairs();
146-
String trackersString =
147-
String.format("%s %s", statsPairs.get(0).first, statsPairs.get(0).second);
148-
String dataSavedString =
149-
String.format("%s %s", statsPairs.get(1).first, statsPairs.get(1).second);
150-
String timeSavedString =
151-
String.format("%s %s", statsPairs.get(2).first, statsPairs.get(2).second);
152-
153-
mAdsBlockedCountTextView.setText(trackersString);
154-
mDataSavedValueTextView.setText(dataSavedString);
155-
mEstTimeSavedCountTextView.setText(timeSavedString);
156-
shareStatsAction(view);
157-
}
158-
159-
public static void shareStatsAction(View view) {
160-
Context context = ContextUtils.getApplicationContext();
161-
Bitmap bmp = convertToBitmap(view);
162-
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
163-
bmp.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
164-
String path = MediaStore.Images.Media.insertImage(
165-
context.getContentResolver(), bmp, "tempimage", null);
166-
Uri uri = Uri.parse(path);
167-
168-
Intent sendIntent = new Intent();
169-
sendIntent.setAction(Intent.ACTION_SEND);
170-
sendIntent.putExtra(Intent.EXTRA_TEXT,
171-
context.getResources().getString(R.string.brave_stats_share_text));
172-
sendIntent.putExtra(Intent.EXTRA_STREAM, uri);
173-
sendIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
174-
sendIntent.setType("image/text");
175-
176-
Intent shareIntent = Intent.createChooser(sendIntent, " ");
177-
shareIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
178-
context.startActivity(shareIntent);
179-
}
180-
181-
public static View getLayout(int layoutId) {
182-
Context context = ContextUtils.getApplicationContext();
183-
LayoutInflater inflater =
184-
(LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
185-
View layout = inflater.inflate(layoutId, null);
186-
187-
return layout;
188-
}
189-
190-
private static Bitmap convertToBitmap(View view) {
191-
view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
192-
int totalHeight = view.getMeasuredHeight();
193-
int totalWidth = view.getMeasuredWidth();
194-
195-
Bitmap canvasBitmap = Bitmap.createBitmap(totalWidth, totalHeight, Bitmap.Config.ARGB_8888);
196-
Canvas canvas = new Canvas(canvasBitmap);
197-
view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
198-
view.draw(canvas);
199-
200-
return canvasBitmap;
201-
}
202-
203-
private static List<Pair<String, String>> getStatsPairs() {
204-
List<Pair<String, String>> statsPair = new ArrayList<>();
205-
Profile mProfile = Profile.getLastUsedRegularProfile();
206112
long trackersBlockedCount =
207113
BravePrefServiceBridge.getInstance().getTrackersBlockedCount(mProfile);
208114
long adsBlockedCount = BravePrefServiceBridge.getInstance().getAdsBlockedCount(mProfile);
209-
long adsTrackersBlockedCount = trackersBlockedCount + adsBlockedCount;
210115
long dataSaved = BravePrefServiceBridge.getInstance().getDataSaved(mProfile);
211116
long estimatedMillisecondsSaved =
212117
(trackersBlockedCount + adsBlockedCount) * MILLISECONDS_PER_ITEM;
213118

214119
Pair<String, String> adsTrackersPair =
215-
getBraveStatsStringFormNumberPair(adsTrackersBlockedCount, false);
120+
getBraveStatsStringFormNumberPair(adsBlockedCount, false);
216121
Pair<String, String> dataSavedPair = getBraveStatsStringFormNumberPair(dataSaved, true);
217122
Pair<String, String> timeSavedPair =
218123
getBraveStatsStringFromTime(estimatedMillisecondsSaved / 1000);
219-
statsPair.add(adsTrackersPair);
220-
statsPair.add(dataSavedPair);
221-
statsPair.add(timeSavedPair);
222-
223-
return statsPair;
224-
}
225-
226-
public static Pair<String, String> getAdsTrackersBlocked() {
227-
Profile mProfile = Profile.getLastUsedRegularProfile();
228-
long trackersBlockedCount =
229-
BravePrefServiceBridge.getInstance().getTrackersBlockedCount(mProfile);
230-
long adsBlockedCount = BravePrefServiceBridge.getInstance().getAdsBlockedCount(mProfile);
231-
long adsTrackersBlockedCount = trackersBlockedCount + adsBlockedCount;
232124

233-
return getBraveStatsStringFormNumberPair(adsTrackersBlockedCount, false);
125+
mAdsBlockedCountTextView.setText(adsTrackersPair.first);
126+
mDataSavedValueTextView.setText(dataSavedPair.first);
127+
mEstTimeSavedCountTextView.setText(timeSavedPair.first);
128+
mAdsBlockedCountTextTextView.setText(adsTrackersPair.second);
129+
mDataSavedValueTextTextView.setText(dataSavedPair.second);
130+
mEstTimeSavedCountTextTextView.setText(timeSavedPair.second);
234131
}
235-
}
132+
}

‎android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java

+16-27
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,19 @@
1313
import android.content.Context;
1414
import android.content.ContextWrapper;
1515
import android.graphics.Bitmap;
16-
import android.graphics.Canvas;
1716
import android.graphics.Color;
1817
import android.graphics.Point;
1918
import android.graphics.Rect;
2019
import android.graphics.Typeface;
21-
import android.graphics.drawable.BitmapDrawable;
2220
import android.graphics.drawable.ColorDrawable;
2321
import android.graphics.drawable.Drawable;
24-
import android.net.Uri;
2522
import android.os.Build;
26-
import android.provider.MediaStore;
2723
import android.text.SpannableString;
2824
import android.text.Spanned;
2925
import android.text.method.LinkMovementMethod;
3026
import android.text.style.ClickableSpan;
3127
import android.text.style.ImageSpan;
3228
import android.text.style.StyleSpan;
33-
import android.util.TypedValue;
3429
import android.view.ContextThemeWrapper;
3530
import android.view.Gravity;
3631
import android.view.LayoutInflater;
@@ -44,7 +39,6 @@
4439
import android.widget.Button;
4540
import android.widget.CompoundButton;
4641
import android.widget.CompoundButton.OnCheckedChangeListener;
47-
import android.widget.FrameLayout;
4842
import android.widget.ImageView;
4943
import android.widget.LinearLayout;
5044
import android.widget.ListPopupWindow;
@@ -55,8 +49,6 @@
5549
import android.widget.Switch;
5650
import android.widget.TextView;
5751

58-
import androidx.core.widget.TextViewCompat;
59-
6052
import org.chromium.base.Log;
6153
import org.chromium.base.SysUtils;
6254
import org.chromium.base.task.AsyncTask;
@@ -73,9 +65,6 @@
7365
import org.chromium.chrome.browser.tab.Tab;
7466
import org.chromium.chrome.browser.util.ConfigurationUtils;
7567

76-
import java.io.ByteArrayOutputStream;
77-
import java.io.File;
78-
import java.io.IOException;
7968
import java.util.Collections;
8069
import java.util.HashMap;
8170
import java.util.Map;
@@ -289,8 +278,11 @@ public PopupWindow showPopupMenu(View anchorView) {
289278
}
290279

291280
Rect bgPadding = new Rect();
281+
popupWindow.getBackground().getPadding(bgPadding);
282+
292283
int popupWidth = wrapper.getResources().getDimensionPixelSize(R.dimen.menu_width)
293284
+ bgPadding.left + bgPadding.right;
285+
294286
popupWindow.setWidth(popupWidth);
295287

296288
return popupWindow;
@@ -318,7 +310,7 @@ public int getAdsBlockedCount(int tabId) {
318310
return blockersInfo.mAdsBlocked;
319311
}
320312

321-
public int getTrackersBlockedCount(int tabId) {
313+
public int getTackersBlockedCount(int tabId) {
322314
if (!mTabsStat.containsKey(tabId)) {
323315
return 0;
324316
}
@@ -405,26 +397,23 @@ private void setUpMainLayout() {
405397

406398
Switch mShieldMainSwitch = mMainLayout.findViewById(R.id.site_switch);
407399

408-
ImageView helpImage = (ImageView) mMainLayout.findViewById(R.id.help);
409-
ImageView shareImage = (ImageView) mMainLayout.findViewById(R.id.share);
410-
411-
helpImage.setOnClickListener(new View.OnClickListener() {
400+
ClickableSpan mClickableSpan = new ClickableSpan() {
412401
@Override
413-
public void onClick(View v) {
402+
public void onClick(View widget) {
414403
mMainLayout.setVisibility(View.GONE);
415404
mAboutLayout.setVisibility(View.VISIBLE);
416405
setUpAboutLayout();
417406
}
418-
});
407+
};
419408

420-
shareImage.setOnClickListener(new View.OnClickListener() {
421-
@Override
422-
public void onClick(View v) {
423-
mMainLayout.setVisibility(View.GONE);
424-
View shareStatsLayout = BraveStatsUtil.getLayout(R.layout.brave_stats_share_layout);
425-
BraveStatsUtil.updateBraveShareStatsLayoutAndShare(shareStatsLayout);
426-
}
427-
});
409+
TextView mSiteBlockText = mMainLayout.findViewById(R.id.site_block_text);
410+
mSiteBlockText.setMovementMethod(LinkMovementMethod.getInstance());
411+
String mBlockText = mContext.getResources().getString(R.string.ads_and_other_things_blocked) + " ";
412+
SpannableString mSpannableString = new SpannableString(mBlockText);
413+
ImageSpan mImageSpan = new ImageSpan(mContext, R.drawable.ic_help);
414+
mSpannableString.setSpan(mImageSpan, mBlockText.length() - 1, mBlockText.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
415+
mSpannableString.setSpan(mClickableSpan, mSpannableString.getSpanStart(mImageSpan), mSpannableString.getSpanEnd(mImageSpan), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
416+
mSiteBlockText.setText(mSpannableString);
428417

429418
mToggleIcon.setColorFilter(mContext.getResources().getColor(R.color.shield_toggle_button_tint));
430419
mToggleLayout.setOnClickListener(new View.OnClickListener() {
@@ -939,4 +928,4 @@ public void onClick(View view) {
939928
hideBraveShieldsMenu();
940929
}
941930
};
942-
}
931+
}

‎android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java

+1-25
Original file line numberDiff line numberDiff line change
@@ -39,36 +39,12 @@ public class BraveShieldsUtils {
3939
"shields_ads_tracker_blocked_tooltip";
4040
public static final String PREF_SHIELDS_HTTPS_UPGRADE_TOOLTIP =
4141
"shields_https_upgrade_tooltip";
42-
public static final String PREF_SHARE_SHIELDS_TOOLTIP = "share_shields_tooltip";
43-
public static final String PREF_ADS_TRACKERS_BLOCKED_NO = "ads_trackers_blocked_no";
44-
public static final String PREF_DATA_SAVED_NO = "data_saved_no";
45-
public static final String PREF_TIME_SAVED_NO = "time_saved_no";
46-
47-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER1 = "share_shields_tooltip_tier1";
48-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER2 = "share_shields_tooltip_tier2";
49-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER3 = "share_shields_tooltip_tier3";
50-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER4 = "share_shields_tooltip_tier4";
51-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER5 = "share_shields_tooltip_tier5";
52-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER6 = "share_shields_tooltip_tier6";
53-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER7 = "share_shields_tooltip_tier7";
54-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER8 = "share_shields_tooltip_tier8";
55-
public static final String PREF_SHARE_SHIELDS_TOOLTIP_TIER9 = "share_shields_tooltip_tier9";
5642

5743
public static final List<String> videoSitesList =
5844
Arrays.asList("youtube.com", "vimeo.com", "twitch.tv");
5945
public static final List<String> videoSitesListJp =
6046
Arrays.asList("nicovideo.jp", "tiktok.com", "instagram.com");
6147

62-
public static final int BRAVE_BLOCKED_TIER1 = 1000;
63-
public static final int BRAVE_BLOCKED_TIER2 = 5000;
64-
public static final int BRAVE_BLOCKED_TIER3 = 10000;
65-
public static final int BRAVE_BLOCKED_TIER4 = 25000;
66-
public static final int BRAVE_BLOCKED_TIER5 = 75000;
67-
public static final int BRAVE_BLOCKED_TIER6 = 100000;
68-
public static final int BRAVE_BLOCKED_TIER7 = 250000;
69-
public static final int BRAVE_BLOCKED_TIER8 = 500000;
70-
public static final int BRAVE_BLOCKED_TIER9 = 1000000;
71-
7248
public static boolean isTooltipShown;
7349

7450
public interface BraveShieldsCallback {
@@ -158,4 +134,4 @@ private static void sendBraveShieldsFeedback(String domain) {
158134
if (urlConnection != null) urlConnection.disconnect();
159135
}
160136
}
161-
}
137+
}

0 commit comments

Comments
 (0)