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.

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

Cross promotional modal dp #6171

Merged
merged 7 commits into from
Jul 24, 2020
Merged

Cross promotional modal dp #6171

merged 7 commits into from
Jul 24, 2020

Conversation

deeppandya
Copy link
Contributor

Resolves : brave/brave-browser#10571

Submitter Checklist:

Test Plan:

Follow the test plan on the issue and follow https://www.figma.com/file/atoL4LN2kd8ILnPGwohUoV/Mobile-onboarding-v2?node-id=697%3A5848 for the design spec

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@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 Jul 22, 2020
@deeppandya deeppandya added this to the 1.13.x - Nightly milestone Jul 22, 2020
@deeppandya deeppandya self-assigned this Jul 22, 2020
Brave works everywhere
</message>
<message name="IDS_DOWNLOAD_BRAVE" desc="Cross promotional modal text">
Download Brave at brave.com on your laptop ot tablet for a faster and more private web
Copy link
Contributor

Choose a reason for hiding this comment

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

laptop or tablet?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops sorry. it's a typo. i will update it

Download Brave at brave.com on your laptop ot tablet for a faster and more private web
</message>
<message name="IDS_BRAVE_URL" desc="Brave url">
brave.com
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure if we need it as string here as it doesn't require translation

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i agree. i will remove it from strings and add it in the class as constant

Copy link
Member

Choose a reason for hiding this comment

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

Where do we use it?

ss.setSpan(foregroundSpan, indexOfSpan,
(indexOfSpan + getResources().getString(R.string.brave_url).length()), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
mCrossPromoText.setText(ss);

Copy link
Contributor

Choose a reason for hiding this comment

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

nit: excessive line

params.height = LinearLayout.LayoutParams.WRAP_CONTENT;
getDialog().getWindow().setAttributes(params);
}
}
Copy link
Contributor

@samartnik samartnik Jul 22, 2020

Choose a reason for hiding this comment

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

nit: in chromium they add empty line at the end of java files, I think we should do it too for consistency

Copy link
Contributor

@samartnik samartnik left a comment

Choose a reason for hiding this comment

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

lgtm

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 65ddf91 into master Jul 24, 2020
@deeppandya deeppandya deleted the cross_promotional_modal_dp branch July 24, 2020 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

[Android] Implement Desktop -> Android cross promotional Modal
3 participants