Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bre onboarding 2 android #7292

Merged
merged 3 commits into from
Dec 1, 2020
Merged

Bre onboarding 2 android #7292

merged 3 commits into from
Dec 1, 2020

Conversation

deeppandya
Copy link
Contributor

Resolves : brave/brave-browser#12533

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@deeppandya deeppandya added CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-ios Do not run CI builds for iOS labels Dec 1, 2020
@deeppandya deeppandya added this to the 1.19.x - Nightly milestone Dec 1, 2020
@deeppandya deeppandya requested a review from a team as a code owner December 1, 2020 09:40
@deeppandya deeppandya self-assigned this Dec 1, 2020
emerick
emerick reviewed Dec 1, 2020
View reviewed changes
android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java Outdated
@@ -122,9 +123,11 @@ public void RemovePublisherObserver(PublisherObserver observer) {
}

public void OnNotifyFrontTabUrlChanged(int tabId, String url) {

Log.e("NTP", "OnNotifyFrontTabUrlChanged");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these logs just for debugging purposes? Should they be removed?

android/java/org/chromium/chrome/browser/BraveRewardsOnboardingPagerAdapter.java Outdated
Comment on lines 27 to 28
private static final int WITH_7_OPTIONS = 7;
private static final int WITH_8_OPTIONS = 8;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe these should be called FEWER_OPTIONS and MORE_OPTIONS? Just thinking it will save some time if these numbers change in the future. Up to you!

android/java/org/chromium/chrome/browser/BraveRewardsOnboardingPagerAdapter.java
Comment on lines +110 to +119
double contribute = 15;
if (checkedId == R.id.contribute_5_radio) {
contribute = 5;
} else if (checkedId == R.id.contribute_15_radio) {
contribute = 15;
} else if (checkedId == R.id.contribute_25_radio) {
contribute = 25;
} else if (checkedId == R.id.contribute_50_radio) {
contribute = 50;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feels like a switch statement might be a better fit here than an if-else, but it's up to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@emerick for switch-case, R.id.contribute_50_radio should be constant so we can't use it here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah OK, I didn't look carefully enough sorry!

android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java Outdated
// BraveRewardsHelper.updateBraveRewardsOpenCount();
// }
// }
if (root!= null && PackageUtils.isFirstInstall(mActivity)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Space after root :-)

emerick
emerick approved these changes Dec 1, 2020
View reviewed changes
Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

SergeyZhukovsky
SergeyZhukovsky approved these changes Dec 1, 2020
View reviewed changes
Copy link
Member

@SergeyZhukovsky SergeyZhukovsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@deeppandya deeppandya merged commit e98808f into master Dec 1, 2020
@deeppandya deeppandya deleted the bre_onboarding_2_android branch December 1, 2020 18:57
brave-builds pushed a commit that referenced this pull request Dec 1, 2020
@brave-browser-releases
Uplift of #7292 (squashed) to beta
2ada5df
@brave-builds brave-builds mentioned this pull request Dec 1, 2020
Merged
4 tasks
@LaurenWags
Copy link
Member

LaurenWags commented Dec 3, 2020 •
edited
Loading

Verification in progress using 1.20.5 on LG Nexus 5 with Android 5.1 Bravearm.apk.
Using https://www.figma.com/file/0dbMYs8Wp8W3RgrG1yTdki/RE-1.0?node-id=541%3A19529 for verification.

Confirmed onboarding overlay/modal on panel

Screenshot_2020-12-02-19-53-55

NTP SI onboarding overlay/modal to be confirmed when this is checked on 1.18.x (cc @kjozwiak)

Onboarding overlay/modal on chrome://rewards page to be implemented with brave/brave-browser#13008 in a follow up issue.

Confirmed quick onboarding tour (pre-opt in)

Screenshot_2020-12-02-19-54-18
Screenshot_2020-12-02-19-55-02
Screenshot_2020-12-02-19-55-07
Screenshot_2020-12-02-19-55-10
Screenshot_2020-12-02-19-55-15
Screenshot_2020-12-02-19-55-20
Screenshot_2020-12-02-19-55-30

Confirmed (small) onboarding overlay/modal on panel

Screenshot_2020-12-02-19-53-59

Confirmed quick onboarding tour (post-opt in)

  • Confirmed clicking on "Start using Brave Rewards" launches a tour.
  • Other than the settings card, tour matches screenshots of pre-opt in tour.
  • Note, if ads are not enabled in time the "Settings" card is not shown. I was not able to get the Settings card/slide to show. I believe this is expected per discussion with @deeppandya
Confirmed panel offers refresher tour on second panel open after starting Brave Rewards

Screenshot_2020-12-02-21-07-09

Confirmed ttps://github.com/brave/brave-browser/issues/12992 is fixed

Hide Brave Rewards icon

Confirmed able to Hide Brave Rewards icon on a clean install of 1.20.5.
Installed 1.17.43 (Nightly version pre-BRE) and hid Brave Rewards icon. Upgraded to 1.20.5. Confirmed Brave Rewards icon is still hidden.

@GeetaSarvadnya GeetaSarvadnya mentioned this pull request Dec 14, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emerick emerick emerick approved these changes

@SergeyZhukovsky SergeyZhukovsky SergeyZhukovsky approved these changes

@marshall marshall Awaiting requested review from marshall

Assignees

@deeppandya deeppandya

Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.19.x - Release
Development

Successfully merging this pull request may close these issues.

brave rewards not being removed from URL even though disabled via settings
4 participants
@deeppandya @LaurenWags @emerick @SergeyZhukovsky