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

Update rewards UI changes

Browse Source
This commit is contained in:
Deep
2022-01-07 20:45:25 -05:00
parent 976d4a1c87
commit f20978e58e
18 changed files with 69 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/brave_java_resources.gni
+1 -5
View File
@@ -48,7 +48,6 @@ brave_java_resources = [
"java/res/drawable-hdpi/contribute_icon.png",
"java/res/drawable-hdpi/copy_paste.png",
"java/res/drawable-hdpi/cover_photo.png",
"java/res/drawable-hdpi/disclosure.png",
"java/res/drawable-hdpi/down_arrow.png",
"java/res/drawable-hdpi/ecosia.png",
"java/res/drawable-hdpi/grant_icon.png",
@@ -143,7 +142,6 @@ brave_java_resources = [
"java/res/drawable-mdpi/contribute_icon.png",
"java/res/drawable-mdpi/copy_paste.png",
"java/res/drawable-mdpi/cover_photo.png",
"java/res/drawable-mdpi/disclosure.png",
"java/res/drawable-mdpi/down_arrow.png",
"java/res/drawable-mdpi/ecosia.png",
"java/res/drawable-mdpi/grant_icon.png",
@@ -276,7 +274,6 @@ brave_java_resources = [
"java/res/drawable-xhdpi/contribute_icon.png",
"java/res/drawable-xhdpi/copy_paste.png",
"java/res/drawable-xhdpi/cover_photo.png",
"java/res/drawable-xhdpi/disclosure.png",
"java/res/drawable-xhdpi/down_arrow.png",
"java/res/drawable-xhdpi/ecosia.png",
"java/res/drawable-xhdpi/grant_icon.png",
@@ -371,7 +368,6 @@ brave_java_resources = [
"java/res/drawable-xxhdpi/contribute_icon.png",
"java/res/drawable-xxhdpi/copy_paste.png",
"java/res/drawable-xxhdpi/cover_photo.png",
"java/res/drawable-xxhdpi/disclosure.png",
"java/res/drawable-xxhdpi/ecosia.png",
"java/res/drawable-xxhdpi/grant_icon.png",
"java/res/drawable-xxhdpi/group.png",
@@ -463,7 +459,6 @@ brave_java_resources = [
"java/res/drawable-xxxhdpi/contribute_icon.png",
"java/res/drawable-xxxhdpi/copy_paste.png",
"java/res/drawable-xxxhdpi/cover_photo.png",
"java/res/drawable-xxxhdpi/disclosure.png",
"java/res/drawable-xxxhdpi/ecosia.png",
"java/res/drawable-xxxhdpi/grant_icon.png",
"java/res/drawable-xxxhdpi/group.png",
@@ -695,6 +690,7 @@ brave_java_resources = [
"java/res/drawable/ic_verify_wallet_arrow.xml",
"java/res/drawable/ic_vpn.xml",
"java/res/drawable/ic_vpn_shield.xml",
"java/res/drawable/ic_wallet_arrow.xml",
"java/res/drawable/ic_wallet_lock.xml",
"java/res/drawable/ic_wallet_settings.xml",
"java/res/drawable/ic_warning_circle.xml",
android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java
+6 -4
View File
@@ -327,7 +327,8 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
btRewardsSettings.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
mBraveActivity.openNewOrSelectExistingTab(BraveActivity.REWARDS_SETTINGS_URL);
mBraveActivity.openNewOrSelectExistingTab(
BraveActivity.BRAVE_REWARDS_SETTINGS_URL);
dismiss();
}
}));
@@ -526,7 +527,8 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedRegularProfile());
BraveRewardsNativeWorker.getInstance().SetAutoContributeEnabled(true);
if (mBraveActivity != null)
mBraveActivity.openNewOrSelectExistingTab(BraveActivity.REWARDS_SETTINGS_URL);
mBraveActivity.openNewOrSelectExistingTab(
BraveActivity.BRAVE_REWARDS_SETTINGS_URL);
}
}));
@@ -1346,7 +1348,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
assert (BraveReflectionUtil.EqualTypes(
mActivity.getClass(), BraveActivity.class));
BraveActivity.class.cast(mActivity).openNewOrSelectExistingTab(
BraveActivity.REWARDS_SETTINGS_URL);
BraveActivity.BRAVE_REWARDS_SETTINGS_URL);
dismiss();
}
});
@@ -1740,7 +1742,7 @@ public class BraveRewardsPanelPopup implements BraveRewardsObserver, BraveReward
switch (status) {
case BraveRewardsExternalWallet.NOT_CONNECTED:
rightDrawable = R.drawable.disclosure;
rightDrawable = R.drawable.ic_wallet_arrow;
text = R.string.brave_ui_wallet_button_unverified;
btnVerifyWallet.setCompoundDrawablesWithIntrinsicBounds(0, 0, rightDrawable, 0);
break;
android/java/org/chromium/chrome/browser/BraveRewardsUserWalletActivity.java
+1 -1
View File
@@ -26,7 +26,7 @@ import org.chromium.chrome.browser.app.BraveActivity;
import org.chromium.chrome.browser.init.AsyncInitializationActivity;
public class BraveRewardsUserWalletActivity extends AsyncInitializationActivity {
public static final String DISCONNECT_WALLET_URL = "chrome://rewards/#disconnect-wallet";
public static final String DISCONNECT_WALLET_URL = "brave://rewards/#disconnect-wallet";
private String walletType = BraveRewardsNativeWorker.getInstance().getExternalWalletType();
private String walletTypeString;
android/java/org/chromium/chrome/browser/BraveWalletProvider.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class BraveWalletProvider {
public void completeWalletProviderVerification(
ExternalNavigationParams params, BraveExternalNavigationHandler handler) {
String originalUrl = params.getUrl().getSpec();
String url = originalUrl.replaceFirst("^rewards://", "chrome://rewards/");
String url = originalUrl.replaceFirst("^rewards://", "brave://rewards/");
handler.clobberCurrentTabWithFallbackUrl(url, params);
}
}
android/java/org/chromium/chrome/browser/app/BraveActivity.java
+3 -9
View File
@@ -176,12 +176,11 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
public static final int SITE_BANNER_REQUEST_CODE = 33;
public static final int VERIFY_WALLET_ACTIVITY_REQUEST_CODE = 34;
public static final int USER_WALLET_ACTIVITY_REQUEST_CODE = 35;
public static final String ADD_FUNDS_URL = "chrome://rewards/#add-funds";
public static final String REWARDS_SETTINGS_URL = "chrome://rewards/";
public static final String ADD_FUNDS_URL = "brave://rewards/#add-funds";
public static final String BRAVE_REWARDS_SETTINGS_URL = "brave://rewards/";
public static final String BRAVE_REWARDS_SETTINGS_WALLET_VERIFICATION_URL =
"brave://rewards/#verify";
public static final String REWARDS_AC_SETTINGS_URL = "chrome://rewards/contribute";
public static final String REWARDS_AC_SETTINGS_URL = "brave://rewards/contribute";
public static final String REWARDS_LEARN_MORE_URL = "https://brave.com/faq-rewards/#unclaimed-funds";
public static final String BRAVE_TERMS_PAGE =
"https://basicattentiontoken.org/user-terms-of-service/";
@@ -269,7 +268,7 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
} else if (id == R.id.set_default_browser) {
handleBraveSetDefaultBrowserDialog();
} else if (id == R.id.brave_rewards_id) {
openNewOrSelectExistingTab(REWARDS_SETTINGS_URL);
openNewOrSelectExistingTab(BRAVE_REWARDS_SETTINGS_URL);
} else if (id == R.id.brave_wallet_id) {
openBraveWallet();
} else if (id == R.id.brave_news_id) {
@@ -557,11 +556,6 @@ public abstract class BraveActivity<C extends ChromeActivityComponent> extends C
calender.add(Calendar.DATE, DAYS_4);
BraveRewardsHelper.setNextRewardsOnboardingModalDate(calender.getTimeInMillis());
}
if (BraveRewardsHelper.shouldShowRewardsOnboardingModalOnDay4()) {
BraveRewardsHelper.setShowBraveRewardsOnboardingModal(true);
openRewardsPanel();
BraveRewardsHelper.setRewardsOnboardingModalShown(true);
}
if (SharedPreferencesManager.getInstance().readInt(BravePreferenceKeys.BRAVE_APP_OPEN_COUNT)
== 1) {
android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java
+26 -3
View File
@@ -265,7 +265,7 @@ public class BraveRewardsPanel
int deviceWidth = ConfigurationUtils.getDisplayMetrics(mActivity).get("width");
boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity);
mPopupWindow.setWidth((int) (isTablet ? (deviceWidth * 0.6) : (deviceWidth * 0.9)));
mPopupWindow.setWidth((int) (isTablet ? (deviceWidth * 0.6) : (deviceWidth * 0.95)));
mRewardsMainLayout = mPopupView.findViewById(R.id.rewards_main_layout);
@@ -278,7 +278,7 @@ public class BraveRewardsPanel
btnRewardsSettings.setOnClickListener((new View.OnClickListener() {
@Override
public void onClick(View v) {
mBraveActivity.openNewOrSelectExistingTab(BraveActivity.REWARDS_SETTINGS_URL);
mBraveActivity.openNewOrSelectExistingTab(BraveActivity.BRAVE_REWARDS_SETTINGS_URL);
dismiss();
}
}));
@@ -668,7 +668,7 @@ public class BraveRewardsPanel
assert (BraveReflectionUtil.EqualTypes(
mActivity.getClass(), BraveActivity.class));
BraveActivity.class.cast(mActivity).openNewOrSelectExistingTab(
BraveActivity.REWARDS_SETTINGS_URL);
BraveActivity.BRAVE_REWARDS_SETTINGS_URL);
dismiss();
}
});
@@ -1150,6 +1150,29 @@ public class BraveRewardsPanel
}
}
setVerifyWalletButton(walletStatus);
showRewardsFromAdsSummary(walletStatus);
}
private void showRewardsFromAdsSummary(int walletStatus) {
if (mBraveRewardsNativeWorker != null) {
String walletType = mBraveRewardsNativeWorker.getExternalWalletType();
Log.e("NTP", "walletType : " + walletType);
Log.e("NTP", "walletStatus : " + walletStatus);
if (walletStatus == BraveRewardsExternalWallet.VERIFIED
&& (walletType.equals(BraveWalletProvider.UPHOLD)
|| walletType.equals(BraveWalletProvider.BITFLYER)
|| walletType.equals(BraveWalletProvider.GEMINI))) {
mPopupView.findViewById(R.id.auto_contribute_summary_seperator)
.setVisibility(View.GONE);
mPopupView.findViewById(R.id.rewards_from_ads_summary_layout)
.setVisibility(View.GONE);
} else {
mPopupView.findViewById(R.id.auto_contribute_summary_seperator)
.setVisibility(View.VISIBLE);
mPopupView.findViewById(R.id.rewards_from_ads_summary_layout)
.setVisibility(View.VISIBLE);
}
}
}
private void setVerifyWalletButton(@WalletStatus final int status) {
android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java
+7 -5
View File
@@ -395,9 +395,7 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
tab.getId(), tab.getUrl().getSpec());
}
if (PackageUtils.isFirstInstall(getContext()) && tab.getUrl().getSpec() != null
&& (tab.getUrl().getSpec().equals(BraveActivity.REWARDS_SETTINGS_URL)
|| tab.getUrl().getSpec().equals(
BraveActivity.BRAVE_REWARDS_SETTINGS_URL))
&& (tab.getUrl().getSpec().equals(BraveActivity.BRAVE_REWARDS_SETTINGS_URL))
&& !BraveAdsNativeHelper.nativeIsBraveAdsEnabled(
Profile.getLastUsedRegularProfile())
&& BraveRewardsHelper.shouldShowBraveRewardsOnboardingModal()
@@ -687,8 +685,8 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
View braveRewardsOnboardingModalView =
dialog.findViewById(R.id.brave_rewards_onboarding_modal_layout);
braveRewardsOnboardingModalView.setBackgroundColor(
context.getResources().getColor(android.R.color.white));
// braveRewardsOnboardingModalView.setBackgroundColor(
// context.getResources().getColor(android.R.color.white));
braveRewardsOnboardingModalView.setVisibility(View.VISIBLE);
String tosText =
@@ -771,6 +769,10 @@ public abstract class BraveToolbarLayoutImpl extends ToolbarLayout
BraveAdsNativeHelper.nativeSetAdsEnabled(Profile.getLastUsedRegularProfile());
BraveRewardsNativeWorker.getInstance().SetAutoContributeEnabled(true);
BraveRewardsHelper.setShowBraveRewardsOnboardingModal(false);
if (BraveActivity.getBraveActivity() != null) {
BraveRewardsHelper.setShowBraveRewardsOnboardingOnce(true);
BraveActivity.getBraveActivity().openRewardsPanel();
}
dialog.dismiss();
}
}));
android/java/res/drawable-hdpi/disclosure.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 608 B

android/java/res/drawable-mdpi/disclosure.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 449 B

android/java/res/drawable-xhdpi/disclosure.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 718 B

android/java/res/drawable-xxhdpi/disclosure.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

android/java/res/drawable-xxxhdpi/disclosure.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

android/java/res/drawable/ic_unverified_state.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="15dp"
android:height="14dp"
android:viewportWidth="14"
android:viewportHeight="15">
android:viewportHeight="14">
<path
android:pathData="M7,14.8096C3.1401,14.8096 0,11.6695 0,7.8096C0,3.9497 3.1401,0.8096 7,0.8096C10.8599,0.8096 14,3.9497 14,7.8096C14,11.6695 10.8599,14.8096 7,14.8096ZM6.8553,10.5267C6.7404,10.6586 6.5788,10.7262 6.4167,10.7262C6.2883,10.7262 6.1594,10.6842 6.0527,10.5985L3.1354,8.2652C2.884,8.0639 2.8432,7.697 3.0444,7.445C3.2462,7.1936 3.6137,7.1527 3.864,7.354L6.3449,9.3385L10.0613,5.0924C10.2737,4.8497 10.6418,4.8252 10.8844,5.037C11.1265,5.2493 11.151,5.618 10.9387,5.8601L6.8553,10.5267Z"
android:fillColor="#DADCE8"
android/java/res/drawable/ic_wallet_arrow.xml
+4
View File
@@ -0,0 +1,4 @@
<vector android:height="16dp" android:viewportHeight="18"
android:viewportWidth="18" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff" android:fillType="evenOdd" android:pathData="M17.7656,8.937C17.7656,13.6241 13.9527,17.437 9.2656,17.437C4.5793,17.437 0.7656,13.6241 0.7656,8.937C0.7656,4.25 4.5793,0.437 9.2656,0.437C13.9527,0.437 17.7656,4.25 17.7656,8.937ZM2.1823,8.937C2.1823,12.8428 5.3599,16.0203 9.2656,16.0203C13.1714,16.0203 16.349,12.8428 16.349,8.937C16.349,5.0313 13.1714,1.8537 9.2656,1.8537C5.3599,1.8537 2.1823,5.0313 2.1823,8.937ZM11.1831,8.4362C11.3212,8.5743 11.3906,8.7557 11.3906,8.937C11.3906,9.1184 11.3212,9.2997 11.1831,9.4378L8.3497,12.2711C8.0735,12.5481 7.6244,12.5481 7.3482,12.2711C7.0712,11.9942 7.0712,11.5465 7.3482,11.2696L9.6807,8.937L7.3482,6.6045C7.0712,6.3275 7.0712,5.8798 7.3482,5.6029C7.6244,5.3259 8.0735,5.3259 8.3497,5.6029L11.1831,8.4362Z"/>
</vector>
android/java/res/layout/brave_rewards_panel_publisher_layout.xml
+5 -5
View File
@@ -44,7 +44,6 @@
android:gravity="start"
android:maxLines="1"
android:fontFamily="@font/poppins_regular"
android:layout_marginBottom="8dp"
android:textColor="@color/rewards_panel_text_color"
android:textSize="20sp" />
@@ -58,12 +57,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center"
android:drawablePadding="8dp"
android:gravity="start"
android:drawablePadding="4dp"
android:gravity="start|center_vertical"
android:text="@string/unverified_creator"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingTop="4dp"
android:textAlignment="center"
android:fontFamily="@font/poppins_regular"
android:paddingBottom="4dp"
android:background="@drawable/unverified_48_rounded_bg"
android/java/res/layout/brave_rewards_panel_summary_layout.xml
+1
View File
@@ -69,6 +69,7 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/rewards_from_ads_summary_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android/java/res/layout/brave_rewards_panel_tip_layout.xml
+3 -2
View File
@@ -127,10 +127,11 @@
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center_horizontal"
android:padding="16dp"
android:gravity="center"
android:padding="8dp"
android:fontFamily="@font/poppins_regular"
android:text="@string/send_tip"
android:textStyle="bold"
android:textColor="@android:color/white" />
</LinearLayout>
android/java/res/layout/wallet_balance_layout.xml
+9 -4
View File
@@ -47,19 +47,20 @@
<TextView
android:id="@+id/btn_verify_wallet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="32dp"
android:background="@drawable/wallet_verify_button"
android:drawablePadding="8dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingTop="6dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:paddingBottom="6dp"
android:text="@string/brave_ui_wallet_button_unverified"
android:textAllCaps="false"
android:textColor="@android:color/white"
android:textSize="14sp"
android:gravity="center_vertical"
android:fontFamily="@font/poppins_regular"
app:drawableEndCompat="@drawable/disclosure" />
app:drawableEndCompat="@drawable/ic_wallet_arrow" />
</FrameLayout>
@@ -67,12 +68,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:paddingBottom="8dp"
android:orientation="horizontal">
<FrameLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_gravity="bottom"
android:paddingStart="32dp">
<LinearLayout
@@ -122,6 +125,7 @@
android:alpha="0.65"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:layout_marginTop="-8dp"
android:textSize="14sp" />
</LinearLayout>
@@ -197,6 +201,7 @@
android:alpha="0.65"
android:textColor="@android:color/white"
android:fontFamily="@font/poppins_regular"
android:layout_marginTop="-8dp"
android:textSize="14sp" />
</LinearLayout>