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

Move Brave News Subscribe button to the left of the Tor button #15556

Merged
merged 2 commits into from
Oct 23, 2022
Merged

Move Brave News Subscribe button to the left of the Tor button #15556

merged 2 commits into from
Oct 23, 2022

Conversation

fallaciousreasoning
Copy link
Contributor

Resolves brave/brave-browser#26138

Before:
image

After:
image

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • 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)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • 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:

  1. With the Brave News Subscribe button feature enabled,
  2. Navigate to https://theguardian.com
  3. The subscribe button should be on the left of the Tor button

@fallaciousreasoning fallaciousreasoning self-assigned this Oct 20, 2022
fallaciousreasoning
fallaciousreasoning commented Oct 20, 2022
View reviewed changes
browser/ui/views/location_bar/brave_location_bar_view.h Outdated
@@ -75,6 +76,7 @@ class BraveLocationBarView : public LocationBarView {
friend class ::BraveActionsContainerTest;
friend class ::RewardsBrowserTest;
BraveActionsContainer* brave_actions_ = nullptr;
BraveNewsLocationView* brave_news_location_view = nullptr;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should I migrate all these to use raw_ptr?

Copy link
Member

Choose a reason for hiding this comment

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

Let's do it while you're here :)

Copy link
Member

Choose a reason for hiding this comment

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

brave_news_location_view_

fallaciousreasoning
fallaciousreasoning commented Oct 20, 2022
View reviewed changes
components/brave_today/browser/publishers_controller.cc
const auto& publisher_host = kv.second->site_url.host();
// When https://github.com/brave/brave-browser/issues/26092 is fixed, this
// hack can be removed.
const auto& publisher_host_www = "www." + publisher_host;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the same check we're doing for source suggestions
https://github.com/brave/brave-core/blob/master/components/brave_today/browser/suggestions_controller.cc#L91

Hopefully the back end fix we need should be deployed within the next week or so.

simonhong
simonhong approved these changes Oct 20, 2022
View reviewed changes
Copy link
Member

@simonhong simonhong left a comment

Choose a reason for hiding this comment

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

++ with some trivial comments 👍🏼

browser/ui/views/location_bar/brave_location_bar_view.h Outdated
@@ -75,6 +76,7 @@ class BraveLocationBarView : public LocationBarView {
friend class ::BraveActionsContainerTest;
friend class ::RewardsBrowserTest;
BraveActionsContainer* brave_actions_ = nullptr;
BraveNewsLocationView* brave_news_location_view = nullptr;
Copy link
Member

Choose a reason for hiding this comment

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

Let's do it while you're here :)

browser/ui/views/location_bar/brave_news_location_view.cc
if (!subscribed)
return GetCurrentTextColor();

return dark_mode::GetActiveBraveDarkModeType() ==
Copy link
Member

Choose a reason for hiding this comment

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

Just note: I know this code is existing code.
Handling dark/light color via ColorProvider would be better instead of checking themes direclty in each view.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed, it'd be good to change this

browser/ui/views/location_bar/brave_location_bar_view.h Outdated
@@ -75,6 +76,7 @@ class BraveLocationBarView : public LocationBarView {
friend class ::BraveActionsContainerTest;
friend class ::RewardsBrowserTest;
BraveActionsContainer* brave_actions_ = nullptr;
BraveNewsLocationView* brave_news_location_view = nullptr;
Copy link
Member

Choose a reason for hiding this comment

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

brave_news_location_view_

@fallaciousreasoning fallaciousreasoning requested a review from a team as a code owner October 20, 2022 22:30
@fallaciousreasoning
Copy link
Contributor Author

fallaciousreasoning commented Oct 21, 2022 •
edited
Loading

@bsclifton or @emerick for Brave Rewards client review (I had to touch a test)

bsclifton
bsclifton approved these changes Oct 21, 2022
View reviewed changes
Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

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

rewards test change LGTM! ++

@fallaciousreasoning fallaciousreasoning merged commit 7bce6e5 into master Oct 23, 2022
@fallaciousreasoning fallaciousreasoning deleted the bn-subscribe-position branch October 23, 2022 20:54
@github-actions github-actions bot added this to the 1.47.x - Nightly milestone Oct 23, 2022
@stephendonner
Copy link
Contributor

Verified PASSED using

Brave 1.47.36 Chromium: 107.0.5304.91 (Official Build) nightly (x86_64)
Revision 3d5948960d62418160796d5831a4d2d7d6c90fa8-refs/branch-heads/5304@{#1097}
OS macOS Version 11.7.1 (Build 20G918)

Confirmed the Manage Subscriptions button is to the left of the Tor button

(Original scope also had it to the left of the Share this page button, but that would've required an additional patch to our Chromium codebase, as an override, so we dropped it.)

Light Dark
Screen Shot 2022-11-01 at 3 26 32 PM Screen Shot 2022-11-01 at 3 26 59 PM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bsclifton bsclifton

@simonhong simonhong

@petemill petemill

@emerick emerick

Assignees

@fallaciousreasoning fallaciousreasoning

Labels
None yet
Projects
None yet
Milestone
1.47.x - Release
Development

Successfully merging this pull request may close these issues.

Brave News Button should be to the left of the Tor Button
4 participants
@fallaciousreasoning @stephendonner @bsclifton @simonhong