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

Onboarding v2 dp 1.13.x (uplift to 1.13.x) #6263

Merged
merged 29 commits into from
Aug 25, 2020
Merged

Onboarding v2 dp 1.13.x (uplift to 1.13.x) #6263

merged 29 commits into from
Aug 25, 2020

Conversation

deeppandya
Copy link
Contributor

@deeppandya deeppandya commented Jul 30, 2020 •
edited by kjozwiak
Loading

Uplift of #6234

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@deeppandya deeppandya added this to the 1.13.x - Beta milestone Jul 30, 2020
@deeppandya deeppandya requested a review from a team July 30, 2020 08:58
@deeppandya deeppandya self-assigned this Jul 30, 2020
@deeppandya deeppandya changed the base branch from master to 1.13.x July 30, 2020 08:58
@deeppandya deeppandya removed the request for review from bridiver July 30, 2020 08:58
@kjozwiak
Copy link
Member

kjozwiak commented Aug 6, 2020

@deeppandya mind taking a look at this? Looks like the following files have conflicts as per the above:

  • android/brave_java_resources.gni
  • android/java/org/chromium/chrome/browser/BraveActivity.java

This was referenced Aug 11, 2020
Merged
Merged
Merged
Merged
@kjozwiak
Copy link
Member

kjozwiak commented Aug 24, 2020 •
edited
Loading

@deeppandya mind fixing the following merge conflict?

  • browser/ui/android/strings/android_brave_strings.grd

@deeppandya
Copy link
Contributor Author

@deeppandya mind fixing the following merge conflict?

  • browser/ui/android/strings/android_brave_strings.grd

@kjozwiak it's done

@deeppandya
Add UI for onboardingv2
2b8e1d6 
Add resources for onboardingv2
@deeppandya
Add onboarding images
5198b8a
@deeppandya
Add resources in .gni
253d048 
Update UI
@deeppandya
Update code with androidx library
63c1fe1 
Update UI
@deeppandya
Add Lottie library for animations
95e5724
@deeppandya
Add animations
e78ea91 
Update code for animations
@deeppandya
Update newtabpage animation on page selection
6f8a590 
Add third party library for graph/chart
@deeppandya
Add data table for brave stats
3a25a1e
@deeppandya
Update view pager indicators
b151e82 
Add data table for brave stats

Update code for brave stats
@deeppandya
Update view pager with dark/light mode
5c15e17
@deeppandya
Update brave stats for animation
1858ae0
@deeppandya
Add stats icon
d81a885
@deeppandya
Update NTP for stats icon
7cb81f0 
Update code with pref
@deeppandya
Update brave stats model code
4d132ea
@deeppandya
Add Brave stats UI
0101114 
Add datatable for saved bandwidth
@deeppandya
Upfdate code for saved bandwidth
b914fe9 
Update code for stat site

Update code with Saved bandwidth
@deeppandya
Update Bravestats UI for onboarding v2
d4621e5 
Update BraveNewTabPageLayout for CR84

Remove Search onboarding

Remove graph/chart library
@deeppandya
Add highlighted view
37601f5 
Update code for highlighted view
@deeppandya
Open fragment in portrait
788e629
@deeppandya
Add resources for existing onboarding
1c79ec2 
Update code for4 animated bg
@deeppandya
Update shields tooltip
e445e6e
@deeppandya
Update UI with highlight view
b595c92 
Update existing UI accordingly
@deeppandya
Update brave stats db code
29d5270 
Update UI for updated brave stats code

Refactor code

Update onboarding image

Remove previous onborading images

Remove unused images

Refactor code to avoid warnings

Remove unused onboarding code
@deeppandya
Update layout for brave stats warning page
b415d4d 
Refactor onboarding
@deeppandya
Enable search onboarding
e36872c 
Fix CI error
@deeppandya
Fix lint error
0aea225 
Fix resources related error

Fix resources related error

Fix private tab test
@deeppandya
Update code to fix tests
dc01c7c
@deeppandya
Fix desktop build failure due to wrong use of Android-specific code
a3f2b77
srirambv
srirambv approved these changes Aug 25, 2020
View reviewed changes
Copy link
Contributor

@srirambv srirambv left a comment

Choose a reason for hiding this comment

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

Uplift to 1.13.x approved after deliberating with @brave/uplift-approvers.

@srirambv srirambv merged commit 391947b into 1.13.x Aug 25, 2020
@srirambv srirambv deleted the onboarding_v2_dp_1.13.x branch August 25, 2020 15:06
@deeppandya deeppandya mentioned this pull request Aug 31, 2020
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@srirambv srirambv srirambv approved these changes

Assignees

@deeppandya deeppandya

Labels
None yet
Projects
None yet
Milestone
1.13.x - Release #1
Development

Successfully merging this pull request may close these issues.

[Desktop] Verify Wallet drop down not displayed when in Pending state - follow up to 10023
3 participants
@deeppandya @kjozwiak @srirambv