From ad2987f9fa8b8484be9fe269af1dd13d2ae84a7d Mon Sep 17 00:00:00 2001 From: Deep Date: Thu, 15 Oct 2020 00:34:02 -0400 Subject: [PATCH] Add top sites error state Fix UI --- android/brave_java_resources.gni | 1 + .../browser/ntp/BraveNewTabPageLayout.java | 8 ++++++-- .../ntp_background_images/util/NTPUtil.java | 5 +++-- .../crypto/binance/BinanceWidgetManager.java | 4 ++-- android/java/res/drawable-nodpi/busd.png | Bin 0 -> 2487 bytes android/java/res/layout/brave_stats_layout.xml | 4 ++-- .../java/res/layout/crypto_widget_layout.xml | 4 ++-- .../res/layout/fragment_binance_convert.xml | 2 +- android/java/res/layout/top_sites_layout.xml | 17 +++++++++++++++-- .../android/strings/android_brave_strings.grd | 6 ++++++ 10 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 android/java/res/drawable-nodpi/busd.png diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni index f6a1b2a6fd4a8..e0498901b98be 100644 --- a/android/brave_java_resources.gni +++ b/android/brave_java_resources.gni @@ -227,6 +227,7 @@ brave_java_resources = [ "java/res/drawable-nodpi/ben_karpinski.jpg", "java/res/drawable-nodpi/bnb.png", "java/res/drawable-nodpi/btc.png", + "java/res/drawable-nodpi/busd.png", "java/res/drawable-nodpi/dash.png", "java/res/drawable-nodpi/dc_cavalleri.jpg", "java/res/drawable-nodpi/doge.png", diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index cb0670aa094ef..48ca3ff141760 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -213,6 +213,7 @@ public void onClick(View v) { View mTopSitesLayout = inflater.inflate(R.layout.top_sites_layout, null); FrameLayout mTopSitesGridLayout = mTopSitesLayout.findViewById(R.id.top_sites_grid_layout); + TextView topsiteErrorMessage = mTopSitesLayout.findViewById(R.id.widget_error_title); if (shouldShowSuperReferral() && superReferralSitesLayout != null) { if (superReferralSitesLayout.getParent() != null) { @@ -228,6 +229,7 @@ public void onClick(View v) { boolean showPlaceholder = getTileGroup().hasReceivedData() && getTileGroup().isEmpty(); if (mSiteSectionView != null && !showPlaceholder) { + topsiteErrorMessage.setVisibility(View.GONE); if (mSiteSectionView.getParent() != null) { ((ViewGroup) mSiteSectionView.getParent()).removeView(mSiteSectionView); } @@ -237,9 +239,11 @@ public void onClick(View v) { mSiteSectionView.requestLayout(); } mTopSitesGridLayout.addView(mSiteSectionView); - ntpWidgetItem.setWidgetView(mTopSitesLayout); - ntpWidgetMap.put(ntpWidgetManager.getFavoritesWidget(), ntpWidgetItem); + } else { + topsiteErrorMessage.setVisibility(View.VISIBLE); } + ntpWidgetItem.setWidgetView(mTopSitesLayout); + ntpWidgetMap.put(ntpWidgetManager.getFavoritesWidget(), ntpWidgetItem); } } else if (widget.equals(NTPWidgetManager.PREF_BINANCE)) { View binanceWidgetView = inflater.inflate(R.layout.crypto_widget_layout, null); diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPUtil.java b/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPUtil.java index b8e45b919b9a0..b20bcba3eb527 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPUtil.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/util/NTPUtil.java @@ -100,8 +100,9 @@ public static void updateOrientedUI(Context context, ViewGroup view, Point size) LinearLayout.LayoutParams imageCreditLayoutParams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT); imageCreditLayout.setLayoutParams(imageCreditLayoutParams); - - layoutParams.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL; + + layoutParams.setMargins(dpToPx(context, 32), 0, 0, 0); + layoutParams.gravity = Gravity.BOTTOM | Gravity.START; sponsoredLogo.setLayoutParams(layoutParams); } else { if (ConfigurationUtils.isLandscape(context) diff --git a/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceWidgetManager.java b/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceWidgetManager.java index ce00f0bee0b4e..8e2291bb3ca32 100644 --- a/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceWidgetManager.java +++ b/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceWidgetManager.java @@ -60,7 +60,7 @@ public class BinanceWidgetManager { put("BNB", new CoinNetworkModel("BNB", "Binance Coin", R.drawable.bnb)); put("BCH", new CoinNetworkModel("BCH", "Bitcoin Cash", R.drawable.bch)); put("XRP", new CoinNetworkModel("XRP", "Ripple", R.drawable.xrp)); - put("BUSD", new CoinNetworkModel("BUSD", "US Dollar", 0)); + put("BUSD", new CoinNetworkModel("BUSD", "US Dollar", R.drawable.busd)); put("BAT", new CoinNetworkModel("BAT", "Basic Attention Token", R.drawable.bat)); put("XTZ", new CoinNetworkModel("XTZ", "", R.drawable.xtz)); @@ -94,7 +94,7 @@ public class BinanceWidgetManager { put("NANO", new CoinNetworkModel("NANO", "", R.drawable.nano)); put("PAX", new CoinNetworkModel("PAX", "", R.drawable.pax)); put("TRX", new CoinNetworkModel("TRX", "", R.drawable.trx)); - put("BUSD", new CoinNetworkModel("BUSD", "US Dollar", 0)); + put("BUSD", new CoinNetworkModel("BUSD", "US Dollar", R.drawable.busd)); put("TUSD", new CoinNetworkModel("TUSD", "", R.drawable.tusd)); put("USDT", new CoinNetworkModel("USDT", "", R.drawable.usdt)); } diff --git a/android/java/res/drawable-nodpi/busd.png b/android/java/res/drawable-nodpi/busd.png new file mode 100644 index 0000000000000000000000000000000000000000..5b84d9127ecc088f7ce8610fe1479831ff124ff0 GIT binary patch literal 2487 zcmV;o2}t&dP)(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ_JxN4CRCwC#ookR()e*;kOV9;siO;MCd?b}hrAj}kQDRx9NTK*Z*u(-iK24g=8Oi;=WmlPtOPWs3k2X}YE8gQq< zbw*^}t(3h+lJm|iyiVrY&|L|;3|DTla)Vm3nt+)~*;<+NW!;UiM)|h(H5mIb4>x!{ zFb_D=WBk4{_r~r**l^>}{Vt{KO|oYdtG9)+ma5LfhD%ahQ|8cp9Po6?&+9E~0arq+ zIt#lESY$-jeIB9vc;FX-KDS2JbZ4~@_7z+Wucr}N_bX+82t01!rEUj~uO`B_p)U*h zV1fr(6M-iT=CBL68Th!`_OPiyYl@9N7eDr}mLCBR8La73U?i}yTBF3-lBA}+ImqoE zWKG1KEQiJp;F403RgNeTNj%%-XEC@1__+sJ7MArNT#@*d?vgk!z!h2#87^Fn8ecU?f~?wN0+C`|;tl9eXgeb5oo9tP?QR;802U#64Q*>!cSVC5@ zMKvNm6VBwmi1eOY@JwE$mY^%D4T|~gbg%M(szKf zJme>LsHB9%c3jn6L)KBiN=c$aV_-MFz=ybA`9CW6tmQ_QwLx^+Vinf6;w}j)mb50^v5E#$a7{Cz@i*Cn-craO zjk`zHKqIoQ6rGwT&U?h~ul0D(VVRt^9P_kPF+$^g;8JvV4d{dG@V(Gr9&1I1dwkzm zY}MftTvO=F3fV(a30SQh`%zrwJv9Cg*&CfbWTDqquu zWi?22rNMM;uIztT0t}5C>@Cr&#YKE;L?3&L9UyI8FR`@EdH#10_%86Ga;!-NI^@g2 zKgF`%SGvJvz_$(Nu{n)pg(3`GZ(akiKIiq}vUqJ$Ji$Oo?@3a;RUw;{n=Un&$9mDx zr)dWYRXN{{>vwoV{vL_`LheaMN%3~s*taSzYo$?u@v7)%cZk74HsQ44uD3c)S>{Q| zvaqaeq9hGjy>Yd{OAO|*33pV}7HYuIjihgR$WAu2ENz~Zgzkfk$nr{xOX(7Q@t_e| zNr0gttFO303$iwgWwnGJxE!t8(~Y9R48xCu-$5@$Wjqj2b^gX4K^sr z>W3>gS&+3(^3Hvw_~w@aZMYNWkdKGjiYp)eMIn0j<9(%2WGVNsk0jR# zLE1aGL%(+wvi&7=Khub;5u~UMR(jCUBKys2DaLqH#@MEiJyik>3pcnFS1UbGN(Gi9 z58FlY?FN6wJsjY#3fYr!)$y|o*04yT!TqIHUbzzIR`hLU3I2qu4QhHHPQjfNpJp)k z#pqhjtBSD1Jr0owt1D~~%lbeW4K@ScG??>T++l2cxs+D!+wZkWIJ~J7nb*Y{HTS_d zSptl27|iuqbXS#DHDTZm^a`~|Z;?FfUy5<+ftQT-ta;)FiG(@q7ScLi?EQwkwnOO# z*BI?t&xvJK#M2`x>8{#)#r18(o&F9}1{lXlQf!fDEur)4ue&v22tk8zS72^e$e(~~ z8MDf>M&r7^h=di!4y9bZVN$%D&mJ^DBrHAZ#dV%;WLaa%krZbs=((6LXF>vaLfnnnKmTSdYGqZN06xjMxdGl1_`QU#-$ z2}|~~k+?H2Upxi;AfxNfEMWlu#U0Tv@p#WvY%ar%geh^5&mPj&6{cWw8Ez!Z6Ne diff --git a/android/java/res/layout/crypto_widget_layout.xml b/android/java/res/layout/crypto_widget_layout.xml index dc7c1a3db56fd..792177fc9fb80 100644 --- a/android/java/res/layout/crypto_widget_layout.xml +++ b/android/java/res/layout/crypto_widget_layout.xml @@ -35,8 +35,8 @@ diff --git a/android/java/res/layout/fragment_binance_convert.xml b/android/java/res/layout/fragment_binance_convert.xml index 6ef6bb4ac5c43..8823536326a4e 100644 --- a/android/java/res/layout/fragment_binance_convert.xml +++ b/android/java/res/layout/fragment_binance_convert.xml @@ -76,7 +76,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_marginEnd="16dp" - android:text="@string/convert" + android:text="@string/price" android:textColor="@android:color/white"/> + + Confirm Conversion + + There's nothing here yet on the top sites. + + + Price +