Rewards bitflyer android integration

android/brave_java_resources.gni

@@ -525,6 +525,7 @@ brave_java_resources = [
   "java/res/drawable/bat_rewards_summary_gradient.xml",
   "java/res/drawable/binance_edittext.xml",
   "java/res/drawable/binance_radio_button_selector.xml",
+  "java/res/drawable/blue_48_rounded_bg.xml",
   "java/res/drawable/blue_rounded_button.xml",
   "java/res/drawable/blue_rounded_holo_button.xml",
   "java/res/drawable/brave_badge_rewards_background_large.xml",
@@ -576,11 +577,13 @@ brave_java_resources = [
   "java/res/drawable/ic_add.xml",
   "java/res/drawable/ic_addresses.xml",
   "java/res/drawable/ic_appearance.xml",
+  "java/res/drawable/ic_arrow_down.xml",
   "java/res/drawable/ic_arrow_downward.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_background_bat.xml",
+  "java/res/drawable/ic_bar_chart_20.xml",
   "java/res/drawable/ic_baseline_arrow_back_24.xml",
   "java/res/drawable/ic_baseline_close_24.xml",
   "java/res/drawable/ic_baseline_more_vert_24.xml",
@@ -593,6 +596,7 @@ brave_java_resources = [
   "java/res/drawable/ic_brave_logo.xml",
   "java/res/drawable/ic_brave_mobiledata.xml",
   "java/res/drawable/ic_brave_vpn_graphic.xml",
+  "java/res/drawable/ic_calendar.xml",
   "java/res/drawable/ic_carat_down.xml",
   "java/res/drawable/ic_card_background.xml",
   "java/res/drawable/ic_check_circle.xml",
@@ -602,6 +606,7 @@ brave_java_resources = [
   "java/res/drawable/ic_chevron_right.xml",
   "java/res/drawable/ic_clock.xml",
   "java/res/drawable/ic_close.xml",
+  "java/res/drawable/ic_close_12.xml",
   "java/res/drawable/ic_closing_all_closes_brave.xml",
   "java/res/drawable/ic_copy.xml",
   "java/res/drawable/ic_crypto_wallets.xml",
@@ -614,13 +619,17 @@ brave_java_resources = [
   "java/res/drawable/ic_eth.xml",
   "java/res/drawable/ic_eth_24.xml",
   "java/res/drawable/ic_guardian.xml",
+  "java/res/drawable/ic_hearts.xml",
   "java/res/drawable/ic_help.xml",
   "java/res/drawable/ic_help_filled.xml",
   "java/res/drawable/ic_homepage.xml",
   "java/res/drawable/ic_icon_bat_eta.xml",
   "java/res/drawable/ic_info.xml",
   "java/res/drawable/ic_languages.xml",
+  "java/res/drawable/ic_logo_bitflyer.xml",
+  "java/res/drawable/ic_logo_bitflyer_colored.xml",
   "java/res/drawable/ic_mask.xml",
+  "java/res/drawable/ic_money_bag_coins.xml",
   "java/res/drawable/ic_more_horiz.xml",
   "java/res/drawable/ic_new_tab_page.xml",
   "java/res/drawable/ic_news.xml",
@@ -643,6 +652,7 @@ brave_java_resources = [
   "java/res/drawable/ic_payment_methods.xml",
   "java/res/drawable/ic_phone.xml",
   "java/res/drawable/ic_plans.xml",
+  "java/res/drawable/ic_plus.xml",
   "java/res/drawable/ic_privacy_reports.xml",
   "java/res/drawable/ic_promoted.xml",
   "java/res/drawable/ic_qr_code.xml",
@@ -658,6 +668,7 @@ brave_java_resources = [
   "java/res/drawable/ic_server_selection_check.xml",
   "java/res/drawable/ic_setbraveasdefault.xml",
   "java/res/drawable/ic_setbraveasdefault_dark.xml",
+  "java/res/drawable/ic_settings.xml",
   "java/res/drawable/ic_share.xml",
   "java/res/drawable/ic_share_white.xml",
   "java/res/drawable/ic_shield_done_filled.xml",
@@ -673,7 +684,9 @@ brave_java_resources = [
   "java/res/drawable/ic_toggle_down.xml",
   "java/res/drawable/ic_toggle_up.xml",
   "java/res/drawable/ic_trash_icon.xml",
+  "java/res/drawable/ic_unverified_state.xml",
   "java/res/drawable/ic_up_icon.xml",
+  "java/res/drawable/ic_uphold.xml",
   "java/res/drawable/ic_vpn.xml",
   "java/res/drawable/ic_vpn_shield.xml",
   "java/res/drawable/ic_wallet_add.xml",
@@ -702,6 +715,9 @@ brave_java_resources = [
   "java/res/drawable/rewards_button_purple_border.xml",
   "java/res/drawable/rewards_button_summary.xml",
   "java/res/drawable/rewards_image_button.xml",
+  "java/res/drawable/rewards_settings_gradient_bg.xml",
+  "java/res/drawable/rounded_8_bottom_bg.xml",
+  "java/res/drawable/rounded_8_top_bg.xml",
   "java/res/drawable/rounded_corners.xml",
   "java/res/drawable/rounded_filled.xml",
   "java/res/drawable/rounded_filled_bg_radius_12.xml",
@@ -720,12 +736,14 @@ brave_java_resources = [
   "java/res/drawable/tab_selector.xml",
   "java/res/drawable/tip_amount.xml",
   "java/res/drawable/transparent_bg_bordered.xml",
+  "java/res/drawable/unverified_48_rounded_bg.xml",
   "java/res/drawable/wallet_disconnected_button.xml",
   "java/res/drawable/wallet_radio_button_normal.xml",
   "java/res/drawable/wallet_radio_button_selected.xml",
   "java/res/drawable/wallet_radio_button_selector.xml",
   "java/res/drawable/wallet_top_banner_bg.xml",
   "java/res/drawable/wallet_verify_button.xml",
+  "java/res/drawable/white_48_rounded_bg.xml",
   "java/res/drawable/white_rounded_holo_button.xml",
   "java/res/drawable/yearly_selector.xml",
   "java/res/font/poppins_light.ttf",
@@ -783,6 +801,12 @@ brave_java_resources = [
   "java/res/layout/brave_rewards_panel.xml",
   "java/res/layout/brave_rewards_panel_grant.xml",
   "java/res/layout/brave_rewards_panel_header.xml",
+  "java/res/layout/brave_rewards_panel_layout.xml",
+  "java/res/layout/brave_rewards_panel_notification_layout.xml",
+  "java/res/layout/brave_rewards_panel_publisher_layout.xml",
+  "java/res/layout/brave_rewards_panel_settings_layout.xml",
+  "java/res/layout/brave_rewards_panel_summary_layout.xml",
+  "java/res/layout/brave_rewards_panel_tip_layout.xml",
   "java/res/layout/brave_rewards_reset_tab_content.xml",
   "java/res/layout/brave_rewards_site_banner.xml",
   "java/res/layout/brave_rewards_spinnner_item.xml",

android/brave_java_sources.gni

@@ -32,7 +32,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/BraveRewardsVerifyWalletActivity.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveSyncInformers.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveSyncWorker.java",
-  "../../brave/android/java/org/chromium/chrome/browser/BraveUphold.java",
+  "../../brave/android/java/org/chromium/chrome/browser/BraveWalletProvider.java",
   "../../brave/android/java/org/chromium/chrome/browser/CrossPromotionalModalDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/DormantUsersEngagementDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/InternetConnection.java",
@@ -209,6 +209,7 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java",
   "../../brave/android/java/org/chromium/chrome/browser/rate/RateUtils.java",
+  "../../brave/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java",
   "../../brave/android/java/org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java",
   "../../brave/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java",

android/java/org/chromium/chrome/browser/BraveRewardsBalance.java

@@ -15,7 +15,6 @@
 
 public class BraveRewardsBalance {
     public static final String WALLET_ANONYMOUS = "anonymous";
-    public static final String WALLET_UPHOLD = "uphold";
     public static final String WALLET_BLINDED = "blinded";
 
     /**
@@ -25,7 +24,7 @@ public class BraveRewardsBalance {
     public static final String JSON_TOTAL = "total";
     public static final String JSON_WALLETS = "wallets";
 
-    double mTotal;
+    private double mTotal;
     Map <String, Double> mWallets;
 
     BraveRewardsBalance (String json_balance) throws JSONException {
@@ -57,4 +56,4 @@ public String toString() {
                 "mTotal=" + mTotal +
                 ", mWallets=" + mWallets +'}';
     }
-}
+}

android/java/org/chromium/chrome/browser/BraveRewardsExternalWallet.java

@@ -17,7 +17,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-class BraveRewardsExternalWallet {
+public class BraveRewardsExternalWallet {
     //fields
     public static final String ACCOUNT_URL = "account_url";
     public static final String ADD_URL = "add_url";
@@ -95,7 +95,7 @@ public String getLoginUrl() {
         return mLoginUrl;
     }
 
-    BraveRewardsExternalWallet (String json_external_wallet) throws JSONException {
+    public BraveRewardsExternalWallet(String json_external_wallet) throws JSONException {
         fromJson (json_external_wallet);
     }
 

android/java/org/chromium/chrome/browser/BraveRewardsHelper.java

@@ -430,8 +430,7 @@ public void onAnimationEnd(Animator animation) {
     }
   }
 
-
-  static double probiToDouble(String probi) {
+  public static double probiToDouble(String probi) {
       final String PROBI_POWER = "1000000000000000000";
       double val = Double.NaN;
       try {
@@ -445,7 +444,6 @@ static double probiToDouble(String probi) {
       return val;
   }
 
-
     /**
      * Expands touchable area of a small view
       * @param parentView

android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java

@@ -191,6 +191,13 @@ public BraveRewardsBalance GetWalletBalance() {
         }
     }
 
+    public String getExternalWalletType() {
+        synchronized (lock) {
+            return BraveRewardsNativeWorkerJni.get().getExternalWalletType(
+                    mNativeBraveRewardsNativeWorker);
+        }
+    }
+
     public double GetWalletRate() {
         synchronized(lock) {
             return BraveRewardsNativeWorkerJni.get().getWalletRate(mNativeBraveRewardsNativeWorker);
@@ -424,6 +431,13 @@ public void RecoverWallet(String passPhrase) {
         }
     }
 
+    public void getAdsAccountStatement() {
+        synchronized (lock) {
+            BraveRewardsNativeWorkerJni.get().getAdsAccountStatement(
+                    mNativeBraveRewardsNativeWorker);
+        }
+    }
+
     @CalledByNative
     public void OnRecoverWallet(int errorCode) {
         for (BraveRewardsObserver observer : mObservers) {
@@ -452,6 +466,13 @@ public void SetAutoContributionAmount(double amount) {
         }
     }
 
+    public void getAutoContributionAmount() {
+        synchronized (lock) {
+            BraveRewardsNativeWorkerJni.get().getAutoContributionAmount(
+                    mNativeBraveRewardsNativeWorker);
+        }
+    }
+
     public void StartProcess() {
         synchronized (lock) {
             BraveRewardsNativeWorkerJni.get().startProcess(mNativeBraveRewardsNativeWorker);
@@ -551,6 +572,13 @@ public void OnGetAutoContributeProperties() {
         }
     }
 
+    @CalledByNative
+    public void OnGetAutoContributionAmount(double amount) {
+        for (BraveRewardsObserver observer : mObservers) {
+            observer.onGetAutoContributionAmount(amount);
+        }
+    }
+
     @CalledByNative
     public void OnGetReconcileStamp(long timestamp) {
         for (BraveRewardsObserver observer : mObservers) {
@@ -587,6 +615,15 @@ public void OnGetExternalWallet(int error_code, String external_wallet) {
         }
     }
 
+    @CalledByNative
+    public void OnGetAdsAccountStatement(boolean success, double next_payment_date,
+            int ads_received_this_month, double earnings_this_month, double earnings_last_month) {
+        for (BraveRewardsObserver observer : mObservers) {
+            observer.OnGetAdsAccountStatement(success, next_payment_date, ads_received_this_month,
+                    earnings_this_month, earnings_last_month);
+        }
+    }
+
     @CalledByNative
     public void OnDisconnectWallet(int error_code, String external_wallet) {
         for (BraveRewardsObserver observer : mObservers) {
@@ -618,11 +655,26 @@ public void OnOneTimeTip() {
         }
     }
 
+    @CalledByNative
+    public void onUnblindedTokensReady() {
+        for (BraveRewardsObserver observer : mObservers) {
+            observer.onUnblindedTokensReady();
+        }
+    }
+
+    @CalledByNative
+    public void onReconcileComplete(int resultCode, int rewardsType, double amount) {
+        for (BraveRewardsObserver observer : mObservers) {
+            observer.onReconcileComplete(resultCode, rewardsType, amount);
+        }
+    }
+
     @NativeMethods
     interface Natives {
         void init(BraveRewardsNativeWorker caller);
         void destroy(long nativeBraveRewardsNativeWorker);
         String getWalletBalance(long nativeBraveRewardsNativeWorker);
+        String getExternalWalletType(long nativeBraveRewardsNativeWorker);
         double getWalletRate(long nativeBraveRewardsNativeWorker);
         void getPublisherInfo(long nativeBraveRewardsNativeWorker, int tabId, String host);
         String getPublisherURL(long nativeBraveRewardsNativeWorker, int tabId);
@@ -666,6 +718,8 @@ boolean isCurrentPublisherInRecurrentDonations(
         void setAutoContributeEnabled(
                 long nativeBraveRewardsNativeWorker, boolean isSetAutoContributeEnabled);
         void setAutoContributionAmount(long nativeBraveRewardsNativeWorker, double amount);
+        void getAutoContributionAmount(long nativeBraveRewardsNativeWorker);
         void startProcess(long nativeBraveRewardsNativeWorker);
+        void getAdsAccountStatement(long nativeBraveRewardsNativeWorker);
     }
 }

android/java/org/chromium/chrome/browser/BraveRewardsObserver.java

@@ -16,6 +16,7 @@ default public void OnGetLatestNotification(String id, int type, long timestamp,
   default public void OnNotificationDeleted(String id) {};
   default public void OnGetPendingContributionsTotal(double amount) {};
   default public void OnGetAutoContributeProperties() {};
+  default public void onGetAutoContributionAmount(double amount){};
   default public void OnGetReconcileStamp(long timestamp) {};
   default public void OnRecurringDonationUpdated() {};
   default public void OnResetTheWholeState(boolean success) {};
@@ -27,8 +28,12 @@ default public void OnDisconnectWallet(int error_code,
   default public void OnProcessRewardsPageUrl(int error_code,
           String wallet_type, String action, String json_args ) {};
   default public void OnClaimPromotion(int error_code) {};
+  default public void onUnblindedTokensReady() {}
+  default public void onReconcileComplete(int resultCode, int rewardsType, double amount) {}
   default public void OnRecoverWallet(int errorCode) {};
   default public void OnRefreshPublisher(int status, String publisherKey){};
   default public void OnOneTimeTip(){};
   default public void OnStartProcess(){};
+  default public void OnGetAdsAccountStatement(boolean success, double nextPaymentDate,
+          int adsReceivedThisMonth, double earningsThisMonth, double earningsLastMonth){};
 }