Add image resources
Update existing changes
This commit is contained in:
deeppandya
@@ -106,6 +106,8 @@ public class BraveRewardsPanel
|
||||
"https://support.brave.com/hc/en-us/articles/6539887971469";
|
||||
public static final String NEW_SIGNUP_DISABLED_URL =
|
||||
"https://support.brave.com/hc/en-us/articles/9312922941069";
|
||||
private static final String ADS_PAYOUT_STATUS_URL = "https://community.brave.com/t/ads-payout-status-update/287895";
|
||||
private static final String SUPPORT_URL = "https://support.brave.com";
|
||||
private static final String BRAVE_REWARDS_PAGE = "https://brave.com/rewards";
|
||||
private static final String BRAVE_REWARDS_CHANGES_PAGE = "https://brave.com/rewards-changes";
|
||||
|
||||
@@ -1038,13 +1040,10 @@ public class BraveRewardsPanel
|
||||
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);
|
||||
payoutBannerImg.setImageResource(R.drawable.ic_payout_status_pending);
|
||||
payoutBannerText.setText(
|
||||
String.format(mPopupView.getResources().getString(
|
||||
R.string.rewards_panel_payout_pending_text),
|
||||
@@ -1055,21 +1054,24 @@ public class BraveRewardsPanel
|
||||
ContextUtils.getApplicationContext().getResources(),
|
||||
R.drawable.rewards_panel_payout_processing_bg, null));
|
||||
payoutBannerImg.setVisibility(View.GONE);
|
||||
payoutBannerText.setText(
|
||||
String.format(mPopupView.getResources().getString(
|
||||
SpannableString spannableBannerText = spannableClickSpan(String.format(mPopupView.getResources().getString(
|
||||
R.string.rewards_panel_payout_processing_text),
|
||||
currentDate,
|
||||
mPopupView.getResources().getString(
|
||||
R.string.rewards_panel_payout_check_status_text)));
|
||||
R.string.rewards_panel_payout_check_status_text)), mPopupView.getResources().getString(R.string.rewards_panel_payout_check_status_text), ADS_PAYOUT_STATUS_URL);
|
||||
payoutBannerText.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
payoutBannerText.setText(spannableBannerText);
|
||||
} 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(
|
||||
payoutBannerImg.setImageResource(R.drawable.ic_payout_status_complete);
|
||||
SpannableString spannableBannerText = spannableClickSpan(String.format(
|
||||
mPopupView.getResources().getString(
|
||||
R.string.rewards_panel_payout_complete_text),
|
||||
currentDate, mPopupView.getResources().getString(R.string.support)));
|
||||
currentDate, mPopupView.getResources().getString(R.string.support)), mPopupView.getResources().getString(R.string.support), SUPPORT_URL);
|
||||
payoutBannerText.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
payoutBannerText.setText(spannableBannerText);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1651,6 +1653,23 @@ public class BraveRewardsPanel
|
||||
return ss;
|
||||
}
|
||||
|
||||
private SpannableString spannableClickSpan(String mainText, String clickableText, String clickUrl) {
|
||||
Spanned textMain = BraveRewardsHelper.spannedFromHtmlString(mainText);
|
||||
|
||||
SpannableString ss = new SpannableString(textMain.toString());
|
||||
|
||||
NoUnderlineClickableSpan clickableSpan = new NoUnderlineClickableSpan(
|
||||
mActivity, R.color.brave_rewards_modal_theme_color, (textView) -> {
|
||||
CustomTabActivity.showInfoPage(mActivity, clickUrl);
|
||||
});
|
||||
int clickableTextIndex = mainText.indexOf(clickableText);
|
||||
|
||||
ss.setSpan(clickableSpan, clickableTextIndex,
|
||||
clickableTextIndex + clickableText.length(),
|
||||
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
|
||||
return ss;
|
||||
}
|
||||
|
||||
private void showRewardsResponseModal(boolean isSuccess, String errorMessage) {
|
||||
if (mRewardsResponseModal == null) {
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="29dp"
|
||||
android:height="32dp"
|
||||
android:viewportWidth="29"
|
||||
android:viewportHeight="32">
|
||||
<path
|
||||
android:fillColor="#878FFE"
|
||||
android:pathData="M14.151,30.774C14.151,31.448 13.605,31.993 12.932,31.993C12.258,31.993 11.712,31.448 11.712,30.774C11.712,30.101 12.258,29.555 12.932,29.555C13.605,29.555 14.151,30.101 14.151,30.774Z" />
|
||||
<path
|
||||
android:fillColor="#878FFE"
|
||||
android:pathData="M4.927,21.696L0,21.696L0.514,16.152L4.927,16.769L4.927,21.696Z" />
|
||||
<path
|
||||
android:fillColor="#878FFE"
|
||||
android:pathData="M4.057,2.243L6.149,1.001L10.108,7.673L7.125,8.633L4.057,2.243Z" />
|
||||
<path
|
||||
android:fillColor="#878FFE"
|
||||
android:pathData="M22.106,17.247C22.106,18.173 21.355,18.924 20.429,18.924C19.502,18.924 18.751,18.173 18.751,17.247C18.751,16.321 19.502,15.57 20.429,15.57C21.355,15.57 22.106,16.321 22.106,17.247Z" />
|
||||
<path
|
||||
android:fillColor="#878FFE"
|
||||
android:pathData="M25.162,22.931C25.581,22.893 25.908,23.288 25.793,23.692L25.219,25.708C25.181,25.84 25.19,25.982 25.245,26.108L26.072,28.034C26.238,28.421 25.964,28.854 25.543,28.869L23.449,28.946C23.311,28.951 23.179,29.003 23.076,29.094L21.5,30.476C21.184,30.753 20.687,30.627 20.542,30.231L19.822,28.263C19.775,28.134 19.684,28.025 19.566,27.954L17.765,26.883C17.403,26.667 17.371,26.156 17.702,25.896L19.351,24.603C19.459,24.518 19.535,24.398 19.566,24.264L20.028,22.22C20.121,21.809 20.597,21.62 20.947,21.855L22.686,23.024C22.801,23.101 22.938,23.136 23.075,23.123L25.162,22.931Z" />
|
||||
<path
|
||||
android:fillColor="#878FFE"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M24.826,3.868C25.233,2.943 24.847,2.199 24.413,2.008C23.958,1.808 23.752,1.277 23.952,0.823C24.152,0.368 24.683,0.162 25.137,0.362C26.751,1.072 27.148,3.054 26.471,4.592C25.795,6.129 24.065,7.175 22.452,6.465C21.997,6.266 21.791,5.735 21.991,5.281C22.191,4.826 22.721,4.62 23.176,4.82C23.61,5.011 24.419,4.792 24.826,3.868Z" />
|
||||
</vector>
|
||||
@@ -0,0 +1,10 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="16dp"
|
||||
android:height="16dp"
|
||||
android:viewportWidth="16"
|
||||
android:viewportHeight="16">
|
||||
<path
|
||||
android:pathData="M15.334,14.002V15.334C15.334,15.702 15.036,16 14.667,16H8.668C8.3,16 8.001,15.702 8.001,15.334V13.336C8.001,12.968 8.3,12.67 8.668,12.67V12.004H8.001C7.633,12.004 7.335,11.706 7.335,11.338V9.34C7.335,8.972 7.633,8.674 8.001,8.674H14C14.369,8.674 14.667,8.972 14.667,9.34V10.672H15.334C15.702,10.672 16,10.97 16,11.338V13.336C16,13.704 15.702,14.002 15.334,14.002ZM9.335,14.668H14V14.002H9.335V14.668ZM13.334,10.006H8.668V10.672H9.335H13.334V10.006ZM14.667,12.004H14H10.001V12.67H14.667V12.004ZM11.378,7.604C10.514,6.435 9.472,5.655 9.063,5.302H4.9C3.756,6.284 1.33,8.623 1.33,10.642C1.33,13.208 2.745,14.668 5.335,14.668H6.002C6.369,14.668 6.669,14.972 6.669,15.334C6.669,15.696 6.369,16 6.002,16H5.335C2.001,16 0,13.941 0,10.642C0,8.033 2.722,5.433 3.801,4.501C3.3,3.667 2.498,2.113 2.708,1.069C2.786,0.679 2.996,0.364 3.312,0.158C4.038,-0.31 4.66,0.435 5.034,0.88C5.088,0.943 5.157,1.026 5.226,1.104C5.229,1.099 5.231,1.094 5.234,1.09C5.465,0.685 5.851,0.007 6.664,0.007C7.383,0.007 7.75,0.354 7.97,0.562C7.996,0.587 8.02,0.613 8.046,0.635C8.29,0.626 8.391,0.558 8.582,0.431C8.854,0.25 9.226,0 9.917,0C10.455,0 10.909,0.331 11.133,0.884C11.486,1.757 11.269,3.285 10.263,4.555C10.811,5.004 11.686,5.795 12.454,6.834C12.67,7.127 12.604,7.536 12.307,7.748C12.009,7.962 11.593,7.897 11.378,7.604ZM9.869,1.311C9.622,1.319 9.521,1.387 9.329,1.514C9.057,1.696 8.685,1.945 7.994,1.945C7.514,1.945 7.223,1.671 7.05,1.507C6.896,1.361 6.848,1.317 6.664,1.317C6.609,1.353 6.469,1.599 6.393,1.731C6.197,2.077 5.898,2.6 5.293,2.6C4.765,2.6 4.392,2.17 4.033,1.743C4.161,2.36 4.629,3.319 5.049,3.993H8.984C9.686,3.245 9.963,2.351 9.964,1.796C9.965,1.521 9.904,1.369 9.869,1.311Z"
|
||||
android:fillColor="#339AF0"
|
||||
android:fillType="evenOdd"/>
|
||||
</vector>
|
||||
Reference in New Issue
Block a user