From 28c24d4b7bd9a4087e0dc3a2b6cb8d9d6c7fee95 Mon Sep 17 00:00:00 2001 From: Deep Date: Mon, 22 Feb 2021 02:17:56 -0500 Subject: [PATCH] Remove locale related locale Remove unused files from .gni --- android/brave_java_resources.gni | 49 ------------------- .../browser/BraveRewardsPanelPopup.java | 18 ++++--- .../BraveRewardsSiteBannerActivity.java | 18 +++---- .../chrome/browser/app/BraveActivity.java | 1 + .../browser/ntp/widget/NTPWidgetManager.java | 13 +++-- .../binance/BinanceDepositFragment.java | 7 +-- 6 files changed, 30 insertions(+), 76 deletions(-) diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index 1ee0287ec05..f245db975c1 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -242,34 +242,6 @@ brave_java_resources = [ "java/res/drawable-nodpi/link.png", "java/res/drawable-nodpi/loader0.png", "java/res/drawable-nodpi/loader0_orange.png", - "java/res/drawable-nodpi/loader1.png", - "java/res/drawable-nodpi/loader10.png", - "java/res/drawable-nodpi/loader11.png", - "java/res/drawable-nodpi/loader12.png", - "java/res/drawable-nodpi/loader13.png", - "java/res/drawable-nodpi/loader14.png", - "java/res/drawable-nodpi/loader15.png", - "java/res/drawable-nodpi/loader16.png", - "java/res/drawable-nodpi/loader17.png", - "java/res/drawable-nodpi/loader18.png", - "java/res/drawable-nodpi/loader19.png", - "java/res/drawable-nodpi/loader2.png", - "java/res/drawable-nodpi/loader20.png", - "java/res/drawable-nodpi/loader21.png", - "java/res/drawable-nodpi/loader22.png", - "java/res/drawable-nodpi/loader23.png", - "java/res/drawable-nodpi/loader24.png", - "java/res/drawable-nodpi/loader25.png", - "java/res/drawable-nodpi/loader26.png", - "java/res/drawable-nodpi/loader27.png", - "java/res/drawable-nodpi/loader28.png", - "java/res/drawable-nodpi/loader3.png", - "java/res/drawable-nodpi/loader4.png", - "java/res/drawable-nodpi/loader5.png", - "java/res/drawable-nodpi/loader6.png", - "java/res/drawable-nodpi/loader7.png", - "java/res/drawable-nodpi/loader8.png", - "java/res/drawable-nodpi/loader9.png", "java/res/drawable-nodpi/ltc.png", "java/res/drawable-nodpi/matic.png", "java/res/drawable-nodpi/nano.png", @@ -627,14 +599,12 @@ brave_java_resources = [ "java/res/drawable/brave_menu_settings.xml", "java/res/drawable/brave_modern_toolbar_text_box_background.xml", "java/res/drawable/brave_rewards_circle.xml", - "java/res/drawable/brave_rewards_loader.xml", "java/res/drawable/brave_rewards_not_verified_rectangle.xml", "java/res/drawable/brave_rewards_onboarding_default.xml", "java/res/drawable/brave_rewards_onboarding_selected.xml", "java/res/drawable/brave_rewards_onboarding_selector.xml", "java/res/drawable/brave_rewards_rectangle.xml", "java/res/drawable/brave_rewards_welcome_bg.xml", - "java/res/drawable/brave_rewards_widget_gradient.xml", "java/res/drawable/brave_stats_radio_button_normal.xml", "java/res/drawable/brave_stats_radio_button_selected.xml", "java/res/drawable/brave_stats_radio_button_selector.xml", @@ -653,26 +623,20 @@ brave_java_resources = [ "java/res/drawable/brave_sync_warning.xml", "java/res/drawable/circular_progress.xml", "java/res/drawable/default_indicator.xml", - "java/res/drawable/enable_rewards_button.xml", "java/res/drawable/ic_add.xml", "java/res/drawable/ic_arrow_drop_down_white.xml", "java/res/drawable/ic_arrow_forward.xml", "java/res/drawable/ic_back.xml", - "java/res/drawable/ic_bat.xml", "java/res/drawable/ic_binance.xml", "java/res/drawable/ic_brave_logo.xml", - "java/res/drawable/ic_brave_rewards_widget.xml", - "java/res/drawable/ic_btc.xml", "java/res/drawable/ic_checkbox_filled.xml", "java/res/drawable/ic_checkbox_outline.xml", "java/res/drawable/ic_chevron_left.xml", "java/res/drawable/ic_chevron_right.xml", "java/res/drawable/ic_clock.xml", - "java/res/drawable/ic_ethereum.xml", "java/res/drawable/ic_help.xml", "java/res/drawable/ic_help_filled.xml", "java/res/drawable/ic_icon_bat_eta.xml", - "java/res/drawable/ic_litecoin.xml", "java/res/drawable/ic_more_horiz.xml", "java/res/drawable/ic_onboarding_graphic_android_brave_ads.xml", "java/res/drawable/ic_onboarding_graphic_auto_contribute.xml", @@ -682,7 +646,6 @@ brave_java_resources = [ "java/res/drawable/ic_onboarding_graphic_completed.xml", "java/res/drawable/ic_onboarding_graphic_tipping.xml", "java/res/drawable/ic_phone.xml", - "java/res/drawable/ic_polygon_1.xml", "java/res/drawable/ic_setbraveasdefault.xml", "java/res/drawable/ic_setbraveasdefault_dark.xml", "java/res/drawable/ic_shield_done_filled.xml", @@ -690,7 +653,6 @@ brave_java_resources = [ "java/res/drawable/ic_sort.xml", "java/res/drawable/ic_spot_graphic.xml", "java/res/drawable/ic_spot_graphic_dark.xml", - "java/res/drawable/ic_stats_icon.xml", "java/res/drawable/ic_thank_you.xml", "java/res/drawable/ic_toggle_down.xml", "java/res/drawable/ic_toggle_up.xml", @@ -698,9 +660,7 @@ brave_java_resources = [ "java/res/drawable/ic_warning_circle.xml", "java/res/drawable/ic_warning_triangle.xml", "java/res/drawable/ic_warning_triangle_2.xml", - "java/res/drawable/ic_yahoo.xml", "java/res/drawable/image_credit_rounded_shape.xml", - "java/res/drawable/indicator_selector.xml", "java/res/drawable/modern_toolbar_background_grey_end_segment.xml", "java/res/drawable/ntp_widget_indicator_bg.xml", "java/res/drawable/orange_rounded_button.xml", @@ -763,7 +723,6 @@ brave_java_resources = [ "java/res/layout/brave_ddg_offer_link.xml", "java/res/layout/brave_rewards_auto_contrib.xml", "java/res/layout/brave_rewards_donation_sent.xml", - "java/res/layout/brave_rewards_grants_list_item.xml", "java/res/layout/brave_rewards_onboarding_ac_layout.xml", "java/res/layout/brave_rewards_onboarding_item_layout.xml", "java/res/layout/brave_rewards_onboarding_layout.xml", @@ -777,19 +736,11 @@ brave_java_resources = [ "java/res/layout/brave_rewards_spinnner_item.xml", "java/res/layout/brave_rewards_spinnner_item_dropdown.xml", "java/res/layout/brave_rewards_welcome_layout.xml", - "java/res/layout/brave_rewards_widget_layout.xml", "java/res/layout/brave_set_default_browser_dialog.xml", - "java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml", - "java/res/layout/brave_shields_ads_tracking_switcher.xml", - "java/res/layout/brave_shields_fingerprints_blocked_switcher.xml", - "java/res/layout/brave_shields_https_upgrade_switcher.xml", "java/res/layout/brave_shields_main_layout.xml", - "java/res/layout/brave_shields_menu_item.xml", "java/res/layout/brave_shields_option_layout.xml", - "java/res/layout/brave_shields_scripts_blocked_switcher.xml", "java/res/layout/brave_shields_secondary_layout.xml", "java/res/layout/brave_shields_switcher.xml", - "java/res/layout/brave_shields_text_item.xml", "java/res/layout/brave_shields_thank_you_layout.xml", "java/res/layout/brave_shields_toggle_layout.xml", "java/res/layout/brave_shields_tooltip_layout.xml", diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java index 0863d6db2d5..ac31001e604 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java @@ -157,6 +157,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward private String currentNotificationId; private TextView tvPublisherNotVerified; private TextView tvPublisherNotVerifiedSummary; + private TextView tvBrBatWallet; private boolean walletDetailsReceived; //flag: wallet details received private boolean showRewardsSummary; //flag: we don't want OnGetCurrentBalanceReport always opens up Rewards Summary window private BraveRewardsHelper mIconFetcher; @@ -285,6 +286,8 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward btSendATip = (Button)root.findViewById(R.id.send_a_tip); tvPublisherNotVerified = (TextView)root.findViewById(R.id.publisher_not_verified); mTip_amount_spinner = root.findViewById(R.id.auto_tip_amount); + + tvBrBatWallet = root.findViewById(R.id.br_bat_wallet); } private void initViewActionEvents() { @@ -916,7 +919,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward } public void ShowWebSiteView() { - ((TextView)this.root.findViewById(R.id.br_bat_wallet)).setText(String.format(Locale.getDefault(), "%.3f", 0.0)); + tvBrBatWallet.setText(String.format(Locale.getDefault(), "%.3f", 0.0)); String usdText = String.format(this.root.getResources().getString(R.string.brave_ui_usd), "0.00"); ((TextView)this.root.findViewById(R.id.br_usd_wallet)).setText(usdText); CreateUpdateBalanceTask(); @@ -1149,10 +1152,10 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward if (splittedValue.length != 0 && splittedValue[0].length() >= 18) { value = BraveRewardsHelper.probiToDouble(args[3]); valueString = Double.isNaN(value) ? - ERROR_CONVERT_PROBI : String.format("%.3f", value); + ERROR_CONVERT_PROBI : String.format(Locale.getDefault(), "%.3f", value); } else { value = Double.parseDouble(args[3]); - valueString = String.format("%.3f", value); + valueString = String.format(Locale.getDefault(), "%.3f", value); } description = String.format( @@ -1364,8 +1367,8 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward * @param enable */ private void EnableWalletDetails(boolean enable) { - View fadein = enable ? root.findViewById(R.id.br_bat_wallet) : root.findViewById(R.id.progress_wallet_update); - View fadeout = enable ? root.findViewById(R.id.progress_wallet_update) : root.findViewById(R.id.br_bat_wallet); + View fadein = enable ? tvBrBatWallet : root.findViewById(R.id.progress_wallet_update); + View fadeout = enable ? root.findViewById(R.id.progress_wallet_update) : tvBrBatWallet; BraveRewardsHelper.crossfade(fadeout, fadein, View.GONE, 1f, BraveRewardsHelper.CROSS_FADE_DURATION); View usd = root.findViewById(R.id.br_usd_wallet_layout); @@ -1587,7 +1590,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward if (amount > 0.0) { String non_verified_summary = String.format(root.getResources().getString( - R.string.brave_ui_reserved_amount_text), String.format("%.3f", amount), batPointsText) + + R.string.brave_ui_reserved_amount_text), String.format(Locale.getDefault(), "%.3f", amount), batPointsText) + " " + root.getResources().getString(R.string.learn_more) + "."; Spanned toInsert = BraveRewardsHelper.spannedFromHtmlString(non_verified_summary); @@ -1666,8 +1669,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward DecimalFormat df = new DecimalFormat("#.###"); df.setRoundingMode(RoundingMode.FLOOR); df.setMinimumFractionDigits(3); - ((TextView) this.root.findViewById(R.id.br_bat_wallet)) - .setText(df.format(walletBalance)); + tvBrBatWallet.setText(df.format(walletBalance)); ((TextView) this.root.findViewById(R.id.br_bat)).setText(batPointsText); double usdValue = walletBalance * mBraveRewardsNativeWorker.GetWalletRate(); String usdText = diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java index 636d7731626..f4f4f2137c3 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java @@ -48,7 +48,6 @@ public class BraveRewardsSiteBannerActivity extends Activity implements public static final String TIP_AMOUNT_EXTRA="tipAmount"; public static final String TIP_MONTHLY_EXTRA="tipMonthly"; - private int currentTabId_ = -1; private BraveRewardsNativeWorker mBraveRewardsNativeWorker; private final int PUBLISHER_ICON_SIDE_LEN= 70; //dp @@ -59,6 +58,7 @@ public class BraveRewardsSiteBannerActivity extends Activity implements private boolean mTippingInProgress; //flag preventing multiple tipping processes private boolean isAnonWallet; + private LinearLayout sendDonationLayout; @Override protected void onCreate(Bundle savedInstanceState) { @@ -204,10 +204,9 @@ public class BraveRewardsSiteBannerActivity extends Activity implements } //not enough funds else { - View send_tip = findViewById(R.id.send_donation_button); - send_tip.setVisibility(View.INVISIBLE); + sendDonationLayout.setVisibility(View.INVISIBLE); View animatedView = findViewById(R.id.not_enough_funds_button); - int fromY = findViewById(R.id.send_donation_button).getHeight(); + int fromY = sendDonationLayout.getHeight(); TranslateAnimation animate = new TranslateAnimation(0,0,fromY,0); animate.setDuration(FADE_OUT_DURATION); @@ -217,7 +216,7 @@ public class BraveRewardsSiteBannerActivity extends Activity implements } }; - findViewById(R.id.send_donation_button).setOnClickListener (send_tip_clicker); + sendDonationLayout.setOnClickListener (send_tip_clicker); //set 'add funds' button onClick @@ -234,12 +233,11 @@ public class BraveRewardsSiteBannerActivity extends Activity implements View add_funds_btn = findViewById(R.id.not_enough_funds_button); add_funds_btn.setVisibility(View.INVISIBLE); - View animatedView = findViewById(R.id.send_donation_button); - int fromY = findViewById(R.id.send_donation_button).getHeight(); + int fromY = sendDonationLayout.getHeight(); TranslateAnimation animate = new TranslateAnimation(0,0,fromY,0); animate.setDuration(FADE_OUT_DURATION); - animatedView.startAnimation(animate); - animatedView.setVisibility(View.VISIBLE); + sendDonationLayout.startAnimation(animate); + sendDonationLayout.setVisibility(View.VISIBLE); } }; @@ -314,6 +312,8 @@ public class BraveRewardsSiteBannerActivity extends Activity implements icon_layout.requestLayout(); } }); + + sendDonationLayout = findViewById(R.id.send_donation_button); } private void setPublisherNoteText(@PublisherStatus int pubStatus) { diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 58dc75bd17d..c5ce96ba1dd 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -174,6 +174,7 @@ public abstract class BraveActivity if (mBraveRewardsNativeWorker != null) { mBraveRewardsNativeWorker.RemoveObserver(this); } + super.onPauseWithNative(); } @Override diff --git a/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetManager.java b/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetManager.java index 1128000a509..920405338a3 100644 --- a/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetManager.java +++ b/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetManager.java @@ -30,22 +30,21 @@ public class NTPWidgetManager { private static NTPWidgetManager sInstance; private final SharedPreferences mSharedPreferences; - private static Context mContext = ContextUtils.getApplicationContext(); public static Map mWidgetsMap = new HashMap() { { put(PREF_PRIVATE_STATS, new NTPWidgetItem(PREF_PRIVATE_STATS, - mContext.getResources().getString(R.string.privacy_stats), - mContext.getResources().getString(R.string.privacy_stats_text))); + ContextUtils.getApplicationContext().getResources().getString(R.string.privacy_stats), + ContextUtils.getApplicationContext().getResources().getString(R.string.privacy_stats_text))); put(PREF_FAVORITES, new NTPWidgetItem(PREF_FAVORITES, - mContext.getResources().getString(R.string.favorites), - mContext.getResources().getString(R.string.favorites_text))); + ContextUtils.getApplicationContext().getResources().getString(R.string.favorites), + ContextUtils.getApplicationContext().getResources().getString(R.string.favorites_text))); put(PREF_BINANCE, new NTPWidgetItem(PREF_BINANCE, - mContext.getResources().getString(R.string.binance), - mContext.getResources().getString(R.string.binance_disconnect_text))); + ContextUtils.getApplicationContext().getResources().getString(R.string.binance), + ContextUtils.getApplicationContext().getResources().getString(R.string.binance_disconnect_text))); } }; diff --git a/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceDepositFragment.java b/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceDepositFragment.java index 4082f32b77e..49d008a3fc7 100644 --- a/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceDepositFragment.java +++ b/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceDepositFragment.java @@ -45,6 +45,7 @@ import org.chromium.chrome.browser.widget.crypto.binance.CoinNetworkModel; import org.chromium.ui.widget.Toast; import java.util.List; +import java.util.Locale; public class BinanceDepositFragment extends Fragment { private BinanceNativeWorker mBinanceNativeWorker; @@ -97,7 +98,7 @@ public class BinanceDepositFragment extends Fragment { @Override public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { if (networksJson != null && !TextUtils.isEmpty(networksJson)) { - showCoinList(networksJson, charSequence.toString().toLowerCase()); + showCoinList(networksJson, charSequence.toString().toLowerCase(Locale.getDefault())); } } @@ -123,8 +124,8 @@ public class BinanceDepositFragment extends Fragment { } for (CoinNetworkModel coinNetworkModel : binanceCoinNetworks.getCoinNetworksList()) { if (filterQuery == null - || (coinNetworkModel.getCoin().toLowerCase().contains(filterQuery) - || coinNetworkModel.getCoinDesc().toLowerCase().contains( + || (coinNetworkModel.getCoin().toLowerCase(Locale.getDefault()).contains(filterQuery) + || coinNetworkModel.getCoinDesc().toLowerCase(Locale.getDefault()).contains( filterQuery))) { final View view = inflater.inflate(R.layout.binance_deposit_item, null);