From 738c76a18c109eaa30ffbc304cd0388c4f5f2a7c Mon Sep 17 00:00:00 2001 From: Deep Date: Mon, 1 Mar 2021 20:25:30 -0500 Subject: [PATCH] Format java classes --- .../browser/BraveRewardsPanelPopup.java | 17 ++++++++++------ .../BraveRewardsSiteBannerActivity.java | 12 +++++------ .../BraveRewardsVerifyWalletActivity.java | 7 ++++--- .../custom_layout/NonSwipeableViewPager.java | 2 +- .../custom_layout/VerticalViewPager.java | 2 +- .../PopupWindowTooltip.java | 4 ++-- .../onboarding/v2/OnboardingV2Fragment.java | 8 ++++---- ...crollingBottomViewResourceFrameLayout.java | 2 +- ...BrowsingModeBottomToolbarLinearLayout.java | 2 +- .../toolbar/top/BraveToolbarLayout.java | 7 ++++--- .../binance/BinanceDepositFragment.java | 20 +++++++++++++------ 11 files changed, 49 insertions(+), 34 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java index 0359270d88c..171bc9d6be1 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java @@ -6,6 +6,7 @@ package org.chromium.chrome.browser; +import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -47,7 +48,6 @@ import android.widget.SpinnerAdapter; import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; -import android.annotation.SuppressLint; import androidx.annotation.NonNull; import androidx.appcompat.widget.AppCompatImageView; @@ -557,11 +557,13 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward tosTextSS.setSpan(privacyProtectionClickableSpan, privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); tosTextSS.setSpan(new ForegroundColorSpan(mActivity.getResources().getColor(R.color.brave_rewards_modal_theme_color)), privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - TextView tosAndPpText = braveRewardsOptInView.findViewById(R.id.brave_rewards_opt_in_tos_pp_text); + TextView tosAndPpText = + braveRewardsOptInView.findViewById(R.id.brave_rewards_opt_in_tos_pp_text); tosAndPpText.setMovementMethod(LinkMovementMethod.getInstance()); tosAndPpText.setText(tosTextSS); - AppCompatImageView modalCloseButton = braveRewardsOptInView.findViewById(R.id.brave_rewards_opt_in_modal_close); + AppCompatImageView modalCloseButton = + braveRewardsOptInView.findViewById(R.id.brave_rewards_opt_in_modal_close); modalCloseButton.setOnClickListener((new View.OnClickListener() { @Override public void onClick(View v) { @@ -610,7 +612,8 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward tosTextSS.setSpan(privacyProtectionClickableSpan, privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); tosTextSS.setSpan(new ForegroundColorSpan(mActivity.getResources().getColor(R.color.brave_rewards_modal_theme_color)), privacyPolicyIndex, privacyPolicyIndex + mActivity.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_tos_pp_text); + TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById( + R.id.brave_rewards_onboarding_modal_tos_pp_text); tosAndPpText.setMovementMethod(LinkMovementMethod.getInstance()); tosAndPpText.setText(tosTextSS); @@ -632,7 +635,8 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward showBraveRewardsOnboarding(root, true); } })); - AppCompatImageView modalCloseButton = braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_close); + AppCompatImageView modalCloseButton = braveRewardsOnboardingModalView.findViewById( + R.id.brave_rewards_onboarding_modal_close); modalCloseButton.setOnClickListener((new View.OnClickListener() { @Override public void onClick(View v) { @@ -684,7 +688,8 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward braveRewardsViewPager.setAdapter(braveRewardsOnboardingPagerAdapter); TabLayout braveRewardsTabLayout = braveRewardsOnboardingView.findViewById(R.id.brave_rewards_tab_layout); braveRewardsTabLayout.setupWithViewPager(braveRewardsViewPager, true); - AppCompatImageView modalCloseButton = braveRewardsOnboardingView.findViewById(R.id.brave_rewards_onboarding_layout_modal_close); + AppCompatImageView modalCloseButton = braveRewardsOnboardingView.findViewById( + R.id.brave_rewards_onboarding_layout_modal_close); modalCloseButton.setOnClickListener((new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java index 2cfad20845f..a46433640b2 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java @@ -4,35 +4,35 @@ package org.chromium.chrome.browser; -import org.chromium.chrome.R; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.content.res.Configuration; import android.graphics.Bitmap; import android.os.Bundle; +import android.text.Spanned; import android.text.TextUtils; +import android.view.MotionEvent; import android.view.View; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.view.animation.TranslateAnimation; import android.widget.CheckBox; import android.widget.FrameLayout; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.ToggleButton; -import android.text.Spanned; -import android.view.MotionEvent; + import org.chromium.base.IntentUtils; +import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsBalance; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveRewardsPublisher.PublisherStatus; import org.chromium.chrome.browser.app.BraveActivity; -import android.graphics.Bitmap; -import android.widget.ImageView; -import android.annotation.SuppressLint; import org.chromium.chrome.browser.tab.Tab; import java.math.RoundingMode; diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java index fa9eb85648c..00da466b4f2 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java @@ -6,6 +6,7 @@ package org.chromium.chrome.browser; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.os.Bundle; @@ -14,14 +15,14 @@ import android.view.MotionEvent; import android.view.View; import android.widget.Button; import android.widget.TextView; -import java.util.Locale; -import android.annotation.SuppressLint; +import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsExternalWallet; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveUphold; import org.chromium.chrome.browser.app.BraveActivity; -import org.chromium.chrome.R; + +import java.util.Locale; public class BraveRewardsVerifyWalletActivity extends Activity { diff --git a/android/java/org/chromium/chrome/browser/custom_layout/NonSwipeableViewPager.java b/android/java/org/chromium/chrome/browser/custom_layout/NonSwipeableViewPager.java index 5f0860e7093..d41cbeef84c 100644 --- a/android/java/org/chromium/chrome/browser/custom_layout/NonSwipeableViewPager.java +++ b/android/java/org/chromium/chrome/browser/custom_layout/NonSwipeableViewPager.java @@ -7,12 +7,12 @@ package org.chromium.chrome.browser.custom_layout; +import android.annotation.SuppressLint; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.animation.DecelerateInterpolator; import android.widget.Scroller; -import android.annotation.SuppressLint; import androidx.viewpager.widget.ViewPager; diff --git a/android/java/org/chromium/chrome/browser/custom_layout/VerticalViewPager.java b/android/java/org/chromium/chrome/browser/custom_layout/VerticalViewPager.java index fa03d00d25d..55d48baf827 100644 --- a/android/java/org/chromium/chrome/browser/custom_layout/VerticalViewPager.java +++ b/android/java/org/chromium/chrome/browser/custom_layout/VerticalViewPager.java @@ -6,11 +6,11 @@ package org.chromium.chrome.browser.custom_layout; // https://android.googlesource.com/platform/packages/apps/DeskClock/+/master/src/com/android/deskclock/VerticalViewPager.java +import android.annotation.SuppressLint; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; -import android.annotation.SuppressLint; import androidx.viewpager.widget.ViewPager; diff --git a/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java b/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java index 470251cbb11..a8cb7198553 100644 --- a/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java +++ b/android/java/org/chromium/chrome/browser/custom_layout/popup_window_tooltip/PopupWindowTooltip.java @@ -8,6 +8,7 @@ package org.chromium.chrome.browser.custom_layout.popup_window_tooltip; import static org.chromium.ui.base.ViewUtils.dpToPx; +import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Color; import android.graphics.PointF; @@ -25,7 +26,6 @@ import android.view.WindowManager; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.PopupWindow; -import android.annotation.SuppressLint; import androidx.annotation.ColorInt; import androidx.annotation.DimenRes; @@ -106,7 +106,7 @@ public class PopupWindowTooltip implements PopupWindow.OnDismissListener { mPopupWindow.setOutsideTouchable(true); mPopupWindow.setTouchable(true); mPopupWindow.setTouchInterceptor(new View.OnTouchListener() { - @SuppressLint("ClickableViewAccessibility") + @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouch(View v, MotionEvent event) { final int x = (int) event.getX(); diff --git a/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2Fragment.java b/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2Fragment.java index d6f8521d491..1cb7c86fe53 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2Fragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/v2/OnboardingV2Fragment.java @@ -157,15 +157,15 @@ public class OnboardingV2Fragment extends Fragment { mIndicator1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.selected_indicator, /* theme= */ null)); break; - case 1: + case 1: mIndicator2.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.selected_indicator, /* theme= */ null)); break; - case 2: + case 2: mIndicator3.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.selected_indicator, /* theme= */ null)); break; - case 3: + case 3: mIndicator4.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.selected_indicator, /* theme= */ null)); FrameLayout.LayoutParams params = @@ -175,7 +175,7 @@ public class OnboardingV2Fragment extends Fragment { mOnboardingLayout.setLayoutParams(params); if (isFromStats) mLearnMoreButton.setVisibility(View.VISIBLE); break; - } + } } public void setPosition(int position) { diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveScrollingBottomViewResourceFrameLayout.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveScrollingBottomViewResourceFrameLayout.java index 46f3b3c7429..1098414b9e9 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveScrollingBottomViewResourceFrameLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveScrollingBottomViewResourceFrameLayout.java @@ -5,10 +5,10 @@ package org.chromium.chrome.browser.toolbar.bottom; +import android.annotation.SuppressLint; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; -import android.annotation.SuppressLint; import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener; import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.SwipeHandler; diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java index e3a95ecc0a5..abf49f965e5 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarLinearLayout.java @@ -5,11 +5,11 @@ package org.chromium.chrome.browser.toolbar.bottom; +import android.annotation.SuppressLint; import android.content.Context; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.LinearLayout; -import android.annotation.SuppressLint; import androidx.annotation.Nullable; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index 9eb281a3a6c..386169dcd0d 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -653,7 +653,8 @@ public abstract class BraveToolbarLayout extends ToolbarLayout + context.getResources().getString(R.string.privacy_policy).length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_tos_pp_text); + TextView tosAndPpText = braveRewardsOnboardingModalView.findViewById( + R.id.brave_rewards_onboarding_modal_tos_pp_text); tosAndPpText.setMovementMethod(LinkMovementMethod.getInstance()); tosAndPpText.setText(tosTextSS); @@ -677,8 +678,8 @@ public abstract class BraveToolbarLayout extends ToolbarLayout dialog.dismiss(); } })); - AppCompatImageView modalCloseButton = - braveRewardsOnboardingModalView.findViewById(R.id.brave_rewards_onboarding_modal_close); + AppCompatImageView modalCloseButton = braveRewardsOnboardingModalView.findViewById( + R.id.brave_rewards_onboarding_modal_close); modalCloseButton.setOnClickListener((new View.OnClickListener() { @Override public void onClick(View v) { 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 0083e5e6cc8..4c933f48310 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 @@ -136,9 +136,12 @@ public class BinanceDepositFragment extends Fragment { ImageView currencyImageView = view.findViewById(R.id.currency_image); TextView currencyText = view.findViewById(R.id.currency_text); - String currencyString = new StringBuilder(coinNetworkModel.getCoin()).append((TextUtils.isEmpty(coinNetworkModel.getCoinDesc()) - ? "" - : " (" + coinNetworkModel.getCoinDesc() + ")")).toString(); + String currencyString = + new StringBuilder(coinNetworkModel.getCoin()) + .append((TextUtils.isEmpty(coinNetworkModel.getCoinDesc()) + ? "" + : " (" + coinNetworkModel.getCoinDesc() + ")")) + .toString(); currencyText.setText(currencyString); if (coinNetworkModel.getCoinRes() == 0) { @@ -219,9 +222,14 @@ public class BinanceDepositFragment extends Fragment { }); if (selectedCoinNetworkModel != null) { - String currencyTitleString = new StringBuilder(selectedCoinNetworkModel.getCoin()).append((TextUtils.isEmpty(selectedCoinNetworkModel.getCoinDesc()) - ? "" - : " (" + selectedCoinNetworkModel.getCoinDesc() + ")")).toString(); + String currencyTitleString = + new StringBuilder(selectedCoinNetworkModel.getCoin()) + .append((TextUtils.isEmpty( + selectedCoinNetworkModel.getCoinDesc()) + ? "" + : " (" + selectedCoinNetworkModel.getCoinDesc() + + ")")) + .toString(); currencyTitleText.setText(currencyTitleString); currencyAddressText.setText(String.format( getActivity().getResources().getString(R.string.currency_address_text),