Add loading spinner

brave · Oct 15, 2020 · b0c3661 · b0c3661
1 parent 37ab0e1
commit b0c3661
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 26 deletions.
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -35,6 +35,7 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
@@ -140,6 +141,9 @@ public class BraveNewTabPageLayout extends NewTabPageLayout {
     private LinearLayout indicatorLayout;
     private LinearLayout superReferralSitesLayout;
     private LinearLayout ntpWidgetLayout;
+    private LinearLayout bianceDisconnectLayout;
+    private LinearLayout binanceWidgetLayout;
+    private ProgressBar binanceWidgetProgress;
 
     private BinanceNativeWorker mBinanceNativeWorker;
     private CountDownTimer countDownTimer;
@@ -239,6 +243,12 @@ public void onClick(View v) {
                 }
             } else if (widget.equals(NTPWidgetManager.PREF_BINANCE)) {
                 View binanceWidgetView = inflater.inflate(R.layout.crypto_widget_layout, null);
+                binanceWidgetLayout = binanceWidgetView.findViewById(R.id.binance_widget_layout);
+                bianceDisconnectLayout =
+                        binanceWidgetView.findViewById(R.id.binance_disconnect_layout);
+                binanceWidgetProgress =
+                        binanceWidgetView.findViewById(R.id.binance_widget_progress);
+                binanceWidgetProgress.setVisibility(View.GONE);
                 binanceWidgetView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
@@ -252,6 +262,8 @@ public void onClick(View view) {
                                     CryptoWidgetBottomSheetDialogFragment.TAG_FRAGMENT);
                         } else {
                             TabUtils.openUrlInSameTab(mBinanceNativeWorker.getOAuthClientUrl());
+                            bianceDisconnectLayout.setVisibility(View.GONE);
+                            binanceWidgetProgress.setVisibility(View.VISIBLE);
                         }
                     }
                 });
@@ -260,6 +272,8 @@ public void onClick(View view) {
                     @Override
                     public void onClick(View view) {
                         TabUtils.openUrlInSameTab(mBinanceNativeWorker.getOAuthClientUrl());
+                        bianceDisconnectLayout.setVisibility(View.GONE);
+                        binanceWidgetProgress.setVisibility(View.VISIBLE);
                     }
                 });
                 ntpWidgetItem.setWidgetView(binanceWidgetView);
@@ -353,6 +367,12 @@ protected void onAttachedToWindow() {
         }
         showWidgets();
         if (BinanceWidgetManager.getInstance().isUserAuthenticatedForBinance()) {
+            if (binanceWidgetLayout != null) {
+                binanceWidgetLayout.setVisibility(View.GONE);
+            }
+            if (binanceWidgetProgress != null) {
+                binanceWidgetProgress.setVisibility(View.VISIBLE);
+            }
             mBinanceNativeWorker.getAccountBalances();
         }
         mBinanceNativeWorker.AddObserver(mBinanaceObserver);
@@ -608,11 +628,6 @@ public void onClick(View view) {
     private void loadTopSites(List<TopSiteTable> topSites) {
         superReferralSitesLayout = new LinearLayout(mActivity);
         superReferralSitesLayout.setWeightSum(1f);
-        // LinearLayout.LayoutParams params =
-        //         new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT,
-        //         LayoutParams.WRAP_CONTENT);
-        // params.setMargins(16, 16, 16, 16);
-        // superReferralSitesLayout.setLayoutParams(params);
         superReferralSitesLayout.setOrientation(LinearLayout.HORIZONTAL);
         superReferralSitesLayout.setBackgroundColor(
                 mActivity.getResources().getColor(R.color.topsite_bg_color));
@@ -760,6 +775,12 @@ public void OnGetAccessToken(boolean isSuccess) {
             BinanceWidgetManager.getInstance().setUserAuthenticationForBinance(isSuccess);
             if (isSuccess) {
                 mBinanceNativeWorker.getAccountBalances();
+                if (bianceDisconnectLayout != null) {
+                    bianceDisconnectLayout.setVisibility(View.GONE);
+                }
+                if (binanceWidgetProgress != null) {
+                    binanceWidgetProgress.setVisibility(View.VISIBLE);
+                }
             }
         };
 

diff --git a/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetAdapter.java b/android/java/org/chromium/chrome/browser/ntp/widget/NTPWidgetAdapter.java
@@ -15,6 +15,7 @@
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.appcompat.widget.AppCompatImageView;
@@ -93,6 +94,9 @@ public void onClick(View view) {
                 TextView binanceUSDBalanceText =
                         binanceWidgetLayout.findViewById(R.id.binance_usd_balance_text);
 
+                ProgressBar binanceWidgetProgress =
+                        binanceWidgetLayout.findViewById(R.id.binance_widget_progress);
+
                 if (BinanceWidgetManager.binanceAccountBalance != null) {
                     binanceBalanceText.setText(String.format(String.valueOf(
                             BinanceWidgetManager.binanceAccountBalance.getTotalBTC())));

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
@@ -16,6 +16,7 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -47,6 +48,7 @@ public class BinanceDepositFragment extends Fragment {
 
     private CoinNetworkModel selectedCoinNetworkModel;
     private LinearLayout depositCoinListLayout;
+    private ProgressBar binanceCoinsProgress;
     private NestedScrollView currentNestedScrollView;
 
     public BinanceDepositFragment() {
@@ -76,6 +78,9 @@ public void onDestroyView() {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         depositCoinListLayout = view.findViewById(R.id.deposit_layout);
+        binanceCoinsProgress = view.findViewById(R.id.binance_coins_progress);
+        depositCoinListLayout.setVisibility(View.GONE);
+        binanceCoinsProgress.setVisibility(View.VISIBLE);
         mBinanceNativeWorker.getCoinNetworks();
     }
 
@@ -126,6 +131,10 @@ public void onClick(View view) {
                     });
                     if (depositCoinListLayout != null) {
                         depositCoinListLayout.addView(view);
+                        depositCoinListLayout.setVisibility(View.VISIBLE);
+                    }
+                    if (binanceCoinsProgress != null) {
+                        binanceCoinsProgress.setVisibility(View.GONE);
                     }
                 }
             } catch (JSONException e) {

diff --git a/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceSummaryFragment.java b/android/java/org/chromium/chrome/browser/widget/crypto/binance/BinanceSummaryFragment.java
@@ -13,6 +13,7 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -38,6 +39,7 @@
 public class BinanceSummaryFragment extends Fragment {
     private BinanceNativeWorker mBinanceNativeWorker;
     private LinearLayout summaryLayout;
+    private ProgressBar binanceCoinsProgress;
 
     private static final String ZERO_BALANCE = "0.00000000";
     private static final String ZERO_USD_BALANCE = "0.00";
@@ -73,6 +75,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         TextView binanceBtcText = view.findViewById(R.id.binance_btc_text);
         TextView binanceUSDBalanceText = view.findViewById(R.id.binance_usd_balance_text);
 
+        binanceCoinsProgress = view.findViewById(R.id.binance_coins_progress);
+
         if (BinanceWidgetManager.binanceAccountBalance != null) {
             binanceBalanceText.setText(
                     String.valueOf(BinanceWidgetManager.binanceAccountBalance.getTotalBTC()));
@@ -82,6 +86,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                     String.valueOf(BinanceWidgetManager.binanceAccountBalance.getTotalUSD())));
         }
         summaryLayout = view.findViewById(R.id.summary_layout);
+        binanceCoinsProgress.setVisibility(View.VISIBLE);
+        summaryLayout.setVisibility(View.GONE);
         mBinanceNativeWorker.getCoinNetworks();
     }
 
@@ -145,6 +151,10 @@ public void OnGetCoinNetworks(String jsonNetworks) {
 
                     if (summaryLayout != null) {
                         summaryLayout.addView(view);
+                        summaryLayout.setVisibility(View.VISIBLE);
+                    }
+                    if (binanceCoinsProgress != null) {
+                        binanceCoinsProgress.setVisibility(View.GONE);
                     }
                 }
             } catch (JSONException e) {

diff --git a/android/java/res/layout/crypto_widget_layout.xml b/android/java/res/layout/crypto_widget_layout.xml
@@ -46,6 +46,16 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <ProgressBar
+            android:id="@+id/binance_widget_progress"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:layout_gravity="center"
+            android:indeterminateTintMode="src_atop"
+            android:indeterminateTint="@color/binance_theme_color" /> 
+
         <LinearLayout
             android:id="@+id/binance_disconnect_layout"
             android:layout_width="match_parent"
@@ -123,7 +133,6 @@
                 android:id="@+id/binance_usd_balance_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/usd_balance"
                 android:textColor="@android:color/white"
                 android:alpha="0.6"
                 android:textSize="12sp" />

diff --git a/android/java/res/layout/fragment_binance_deposit.xml b/android/java/res/layout/fragment_binance_deposit.xml
@@ -7,17 +7,33 @@
 
     <include layout="@layout/binance_deposit_layout"/>
 
-    <androidx.core.widget.NestedScrollView
-	 	android:id="@+id/deposit_scrollview"
-	    android:layout_width="match_parent"
-	    android:layout_height="match_parent">
-
-	    <LinearLayout
-	        android:id="@+id/deposit_layout"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent"
-	        android:orientation="vertical"/>
-
-	</androidx.core.widget.NestedScrollView>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ProgressBar
+            android:id="@+id/binance_coins_progress"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateTintMode="src_atop"
+            android:indeterminateTint="@color/binance_theme_color" />
+
+	    <androidx.core.widget.NestedScrollView
+		 	android:id="@+id/deposit_scrollview"
+		    android:layout_width="match_parent"
+		    android:layout_height="match_parent">
+
+		    <LinearLayout
+		        android:id="@+id/deposit_layout"
+		        android:layout_width="match_parent"
+		        android:layout_height="match_parent"
+		        android:orientation="vertical"/>
+
+		</androidx.core.widget.NestedScrollView>
+
+	</FrameLayout>
 
 </LinearLayout>
diff --git a/android/java/res/layout/fragment_binance_summary.xml b/android/java/res/layout/fragment_binance_summary.xml
@@ -53,17 +53,33 @@
         android:layout_marginBottom="16dp"
         android:background="@color/binance_divider_color"/>
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/summary_scrollview"
+     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout
-            android:id="@+id/summary_layout"
+        <ProgressBar
+            android:id="@+id/binance_coins_progress"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:layout_gravity="center_horizontal"
+            android:indeterminateTintMode="src_atop"
+            android:indeterminateTint="@color/binance_theme_color" /> 
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/summary_scrollview"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"/>
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:id="@+id/summary_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical"/>
+
+        </androidx.core.widget.NestedScrollView>
 
-    </androidx.core.widget.NestedScrollView>
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -109,13 +109,17 @@ source_set("browser_process") {
     ":version_info",
     "autoplay",
     "browsing_data",
+    "browsing_data",
     "content_settings",
     "download",
     "farbling",
     "net",
     "ntp_background_images",
+    "ntp_background_images",
     "profiles",
     "renderer_context_menu",
+    "search",
+    "themes",
     "themes",
     "ui",
     "//base",
@@ -124,6 +128,7 @@ source_set("browser_process") {
     "//brave/browser/tor:buildflags",
     "//brave/browser/translate/buildflags",
     "//brave/chromium_src:browser",
+    "//brave/chromium_src:browser",
     "//brave/common",
     "//brave/common:pref_names",
     "//brave/components/binance/browser/buildflags",

diff --git a/components/brave_referrals/browser/brave_referrals_service.cc b/components/brave_referrals/browser/brave_referrals_service.cc
@@ -359,7 +359,7 @@ void BraveReferralsService::OnReferralFinalizationCheckLoadComplete(
 
 void BraveReferralsService::OnReadPromoCodeComplete() {
   if (!promo_code_.empty()) {
-    pref_service_->SetString(kReferralPromoCode, "RUSHGAM");
+    pref_service_->SetString(kReferralPromoCode, promo_code_);
     DCHECK(!initialization_timer_);
     InitReferral();
   } else {