From 1c0608985577a4807ba49194d760a0f31adebafe Mon Sep 17 00:00:00 2001 From: Sujit Acharya Date: Fri, 23 Sep 2022 18:49:06 +0530 Subject: [PATCH] update review comments --- .../browser/BraveRewardsSiteBannerActivity.java | 15 ++++++++------- .../rewards/BraveRewardsCreatorPanelFragment.java | 1 - .../rewards/BraveRewardsCustomTipFragment.java | 7 ++++--- .../BraveRewardsTipConfirmationFragment.java | 4 ++-- .../strings/brave_components_resources_en-GB.xtb | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java index aeb042f5278..90090846ac6 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java @@ -54,7 +54,7 @@ public class BraveRewardsSiteBannerActivity public static final int TIP_SUCCESS = 2; public static final int TIP_PENDING = 3; - private View progressBar; + private View mProgressBar; private boolean mIsActivityIsActive; private static final String TAG = "TippingBanner"; @@ -66,14 +66,13 @@ public class BraveRewardsSiteBannerActivity super.onCreate(savedInstanceState); setContentView(R.layout.brave_rewards_site_banner); mIsActivityIsActive = true; - progressBar = findViewById(R.id.progressBar); + mProgressBar = findViewById(R.id.progressBar); mBraveRewardsNativeWorker = BraveRewardsNativeWorker.getInstance(); mBraveRewardsNativeWorker.AddObserver(this); currentTabId_ = IntentUtils.safeGetIntExtra(getIntent(), TAB_ID_EXTRA, -1); mIsMonthlyContribution = IntentUtils.safeGetBooleanExtra(getIntent(), IS_MONTHLY_CONTRIBUTION, false); - mBannerInfo = null; if (savedInstanceState == null) { mBraveRewardsNativeWorker.GetPublisherBanner( mBraveRewardsNativeWorker.GetPublisherId(currentTabId_)); @@ -90,10 +89,12 @@ public class BraveRewardsSiteBannerActivity try { mBannerInfo = new BraveRewardsBannerInfo(jsonBannerInfo); } catch (JSONException e) { - Log.e(TAG, "BraveRewardsSiteBannerActivity:onPublisherBanner JSONException error " + e); + Log.e(TAG, + "BraveRewardsSiteBannerActivity:onPublisherBanner JSONException error " + + e); } - progressBar.setVisibility(View.GONE); + mProgressBar.setVisibility(View.GONE); BraveRewardsCreatorPanelFragment creatorPanelFragment = BraveRewardsCreatorPanelFragment.newInstance( @@ -131,13 +132,13 @@ public class BraveRewardsSiteBannerActivity mAmount = amount; mIsMonthly = isMonthly; mTipUpdated = false; - progressBar.setVisibility(View.VISIBLE); + mProgressBar.setVisibility(View.VISIBLE); enableTimeout(); // wait for 3 seconds } private void tipConfirmation(int status, double amount, boolean isMonthly) { if (!mIsActivityIsActive) return; - progressBar.setVisibility(View.GONE); + mProgressBar.setVisibility(View.GONE); String publisherName = ""; if (mBannerInfo != null) publisherName = mBannerInfo.getName(); diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCreatorPanelFragment.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCreatorPanelFragment.java index fb3e057a307..e05b6d4df6f 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCreatorPanelFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCreatorPanelFragment.java @@ -74,7 +74,6 @@ public class BraveRewardsCreatorPanelFragment extends Fragment private static final String TAG = "TippingBanner"; - public static BraveRewardsCreatorPanelFragment newInstance( int tabId, boolean isMonthlyContribution, String bannerInfo) { BraveRewardsCreatorPanelFragment fragment = new BraveRewardsCreatorPanelFragment(); diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java index 81166603b38..1d11a06d38e 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsCustomTipFragment.java @@ -12,6 +12,7 @@ import android.os.Bundle; import android.text.Editable; import android.text.InputFilter; import android.text.Spanned; +import android.text.TextUtils; import android.text.TextWatcher; import android.util.Log; import android.view.LayoutInflater; @@ -118,7 +119,7 @@ public class BraveRewardsCustomTipFragment extends Fragment { @SuppressLint("SetTextI18n") @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - if (s == null || s.toString().isEmpty()) s = "0"; + if (TextUtils.isEmpty(s)) s = "0"; Double batValue = getBatValue(s.toString()); Double usdValue = exchangeRate * batValue; @@ -156,7 +157,7 @@ public class BraveRewardsCustomTipFragment extends Fragment { * * @param inputValue : editText string passed here * @return - * convert to bat value if current editText is usd + * convert to bat value if current editText is USD * It will return multiple 0.25 * And also return which is lower between Max and value * decimal points always roundedOff to floor value. @@ -164,7 +165,7 @@ public class BraveRewardsCustomTipFragment extends Fragment { private double getBatValue(String inputValue) { double rawValue = Double.parseDouble(inputValue); if (!isBatCurrencyMode) { - // from usd to BAT + // from USD to BAT rawValue = rawValue / exchangeRate; } diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTipConfirmationFragment.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTipConfirmationFragment.java index 0fdb43ae46f..a9dfde9fd55 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTipConfirmationFragment.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsTipConfirmationFragment.java @@ -44,7 +44,6 @@ public class BraveRewardsTipConfirmationFragment extends Fragment implements Bra private static final String TAG = "TippingBanner"; - public static BraveRewardsTipConfirmationFragment newInstance( int status, String name, double amount, boolean isMonthly) { BraveRewardsTipConfirmationFragment fragment = new BraveRewardsTipConfirmationFragment(); @@ -125,7 +124,8 @@ public class BraveRewardsTipConfirmationFragment extends Fragment implements Bra startActivity(new Intent(Intent.ACTION_VIEW, uri)); } else { // error - Log.e(TAG, "BraveRewardsTipConfirmationFragment -> setTweetClickListener invalid status "); + Log.e(TAG, + "BraveRewardsTipConfirmationFragment -> setTweetClickListener invalid status "); } }); } diff --git a/components/resources/strings/brave_components_resources_en-GB.xtb b/components/resources/strings/brave_components_resources_en-GB.xtb index 2b39fe70c7c..86732a639ec 100644 --- a/components/resources/strings/brave_components_resources_en-GB.xtb +++ b/components/resources/strings/brave_components_resources_en-GB.xtb @@ -402,7 +402,7 @@ Next tip date: Not enough tokens. Please add funds. Brave collects 5% of the tip amount as a processing fee. -One-Time Tip +One-time tip One-time tip amount: Hold on, you can’t tip yet ’s post