Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update payout logic with UI

Browse Source 
Add string resources for payout status
This commit is contained in:
deeppandya
2023-09-05 09:53:58 -04:00
parent 178298ca2d
commit 605647d888
3 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
+39 -20
View File
@@ -144,6 +144,11 @@ public class BraveRewardsPanel
private static final String ERROR_CONVERT_PROBI = "ERROR";
public static final String WALLET_GENERATION_DISABLED_ERROR = "wallet-generation-disabled";
// Payout status
private static final String PAYOUT_STATUS_PENDING = "pending";
private static final String PAYOUT_STATUS_PROCESSING = "processing";
private static final String PAYOUT_STATUS_COMPLETE = "complete";
private static final int CLICK_DISABLE_INTERVAL = 1000; // In milliseconds
public enum NotificationClickAction {
@@ -1022,35 +1027,49 @@ public class BraveRewardsPanel
private void showPayoutStatusBanner(double nextPaymentDate) {
String payoutStatus = mBraveRewardsNativeWorker.getPayoutStatus();
if (mPayoutStatusBannerLayout != null && nextPaymentDate > 0
&& !TextUtils.isEmpty(payoutStatus) && mExternalWallet != null
if (mPayoutStatusBannerLayout != null && !TextUtils.isEmpty(payoutStatus)
&& mExternalWallet != null
&& mExternalWallet.getStatus() == WalletStatus.CONNECTED) {
String currentDate = (String) android.text.format.DateFormat.format("MMMM", new Date());
String nextPayoutDate = (String) android.text.format.DateFormat.format(
"MMMM dd", new Date((long) nextPaymentDate));
Log.e(TAG, "payoutStatus : " + payoutStatus + " nextPayoutDate : " + nextPayoutDate);
mPayoutStatusBannerLayout.setVisibility(View.VISIBLE);
ImageView payoutBannerImg = mPopupView.findViewById(R.id.payout_banner_img);
TextView payoutBannerText = mPopupView.findViewById(R.id.payout_banner_text);
if (payoutStatus.equals("complete")) {
if (payoutStatus.equals(PAYOUT_STATUS_PENDING)) {
if (nextPaymentDate > 0) {
String nextPayoutDate = (String) android.text.format.DateFormat.format(
"MMMM dd", new Date((long) nextPaymentDate));
Log.e(TAG,
"payoutStatus : " + payoutStatus
+ " nextPayoutDate : " + nextPayoutDate);
mPayoutStatusBannerLayout.setBackgroundDrawable(ResourcesCompat.getDrawable(
ContextUtils.getApplicationContext().getResources(),
R.drawable.rewards_panel_payout_processing_bg, null));
payoutBannerImg.setImageResource(R.drawable.ic_notification_auto_contribute);
payoutBannerText.setText(
String.format(mPopupView.getResources().getString(
R.string.rewards_panel_payout_pending_text),
currentDate, nextPayoutDate));
}
} else if (payoutStatus.equals(PAYOUT_STATUS_PROCESSING)) {
mPayoutStatusBannerLayout.setBackgroundDrawable(ResourcesCompat.getDrawable(
ContextUtils.getApplicationContext().getResources(),
R.drawable.rewards_panel_payout_processing_bg, null));
payoutBannerImg.setVisibility(View.GONE);
payoutBannerText.setText(
String.format(mPopupView.getResources().getString(
R.string.rewards_panel_payout_processing_text),
currentDate,
mPopupView.getResources().getString(
R.string.rewards_panel_payout_check_status_text)));
} else if (payoutStatus.equals(PAYOUT_STATUS_COMPLETE)) {
mPayoutStatusBannerLayout.setBackgroundDrawable(ResourcesCompat.getDrawable(
ContextUtils.getApplicationContext().getResources(),
R.drawable.rewards_panel_payout_complete_bg, null));
payoutBannerImg.setImageResource(R.drawable.ic_notification_auto_contribute);
payoutBannerText.setText(
String.format(mPopupView.getResources().getString(
R.string.rewards_panel_payout_pending_text),
currentDate, nextPayoutDate));
} else if (payoutStatus.equals("pending")) {
} else if (payoutStatus.equals("processing")) {
mPayoutStatusBannerLayout.setBackgroundDrawable(ResourcesCompat.getDrawable(
ContextUtils.getApplicationContext().getResources(),
R.drawable.rewards_panel_payout_processing_bg, null));
payoutBannerImg.setImageResource(R.drawable.ic_notification_auto_contribute);
payoutBannerText.setText(
String.format(mPopupView.getResources().getString(
R.string.rewards_panel_payout_pending_text),
currentDate, nextPayoutDate));
payoutBannerText.setText(String.format(
mPopupView.getResources().getString(
R.string.rewards_panel_payout_complete_text),
currentDate, mPopupView.getResources().getString(R.string.support)));
}
}
}
android/java/res/layout/brave_rewards_panel_payout_layout.xml
+1
View File
@@ -19,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_gravity="center_vertical"
android:contentDescription="@null"/>
<TextView