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

Show Bottomsheet when no notification permission #17002

Merged
merged 1 commit into from
Feb 19, 2023
Merged

Show Bottomsheet when no notification permission #17002

merged 1 commit into from
Feb 19, 2023

Conversation

sujitacharya2005
Copy link
Contributor

@sujitacharya2005 sujitacharya2005 commented Feb 2, 2023 •
edited
Loading

Resolves brave/brave-browser#27795

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 wiki
    • npm run lint, npm run presubmit wiki, 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:

az_recorder_20230208_231325.mp4

@sujitacharya2005 sujitacharya2005 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 Feb 2, 2023
@sujitacharya2005 sujitacharya2005 added this to the 1.50.x - Nightly milestone Feb 2, 2023
@sujitacharya2005 sujitacharya2005 marked this pull request as draft February 2, 2023 18:47
@sujitacharya2005 sujitacharya2005 force-pushed the 27795_Show_Bottomsheetwhen_no_notification_permission branch 2 times, most recently from aafcf73 to 09b14b7 Compare February 2, 2023 19:00
deeppandya
deeppandya reviewed Feb 2, 2023
View reviewed changes
android/java/res/drawable/you_are_not_earning_rewards_background.xml Outdated
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2022 The Brave Authors. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

nit : year

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated

@sujitacharya2005 sujitacharya2005 force-pushed the 27795_Show_Bottomsheetwhen_no_notification_permission branch from 09b14b7 to 26371c7 Compare February 2, 2023 19:14
@sujitacharya2005 sujitacharya2005 marked this pull request as ready for review February 3, 2023 18:45
@sujitacharya2005 sujitacharya2005 force-pushed the 27795_Show_Bottomsheetwhen_no_notification_permission branch from 26371c7 to 4739e08 Compare February 5, 2023 10:59
@sujitacharya2005 sujitacharya2005 force-pushed the 27795_Show_Bottomsheetwhen_no_notification_permission branch 4 times, most recently from 8a3fa7b to d1734c2 Compare February 8, 2023 20:13
SergeyZhukovsky
SergeyZhukovsky approved these changes Feb 8, 2023
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 approved these changes Feb 8, 2023
View reviewed changes
Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

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

LGTM

android/java/res/layout/brave_rewards_panel_layout.xml Outdated
<include
android:id="@+id/brave_rewards_panel_notification_layout_id"
layout="@layout/brave_rewards_panel_notification_layout" />


Copy link
Contributor

Choose a reason for hiding this comment

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

nit : new line should be removed here

android/java/res/layout/brave_rewards_panel_notification_layout.xml Outdated
@@ -48,6 +53,9 @@
app:srcCompat="@drawable/ic_close_12"/>

</FrameLayout>

Copy link
Contributor

Choose a reason for hiding this comment

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

nit : we should remove extra new lines here.

android/java/res/layout/brave_rewards_panel_notification_layout.xml
android:id="@+id/brave_rewards_notification_permission_id"
layout="@layout/rewards_notification_permission_request"
android:visibility="gone"
/>
Copy link
Contributor

Choose a reason for hiding this comment

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

nit : remove new line

android/java/res/layout/rewards_notification_permission_request.xml
app:layout_constraintEnd_toEndOf="@+id/turnOnNotification"
app:layout_constraintTop_toBottomOf="@+id/turnOnNotification" />

</androidx.constraintlayout.widget.ConstraintLayout>
Copy link
Contributor

Choose a reason for hiding this comment

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

nit : new line

android/java/res/layout/rewards_you_are_not_earning_dialog.xml
app:layout_constraintVertical_chainStyle="packed"
app:tint="@color/onboarding_text_color" />

</androidx.constraintlayout.widget.ConstraintLayout>
Copy link
Contributor

Choose a reason for hiding this comment

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

nit : new line

@sujitacharya2005 sujitacharya2005 force-pushed the 27795_Show_Bottomsheetwhen_no_notification_permission branch 3 times, most recently from e8af162 to d8ec29a Compare February 16, 2023 15:43
@sujitacharya2005 sujitacharya2005 force-pushed the 27795_Show_Bottomsheetwhen_no_notification_permission branch from d8ec29a to 5e6cdb9 Compare February 19, 2023 06:49
@sujitacharya2005 sujitacharya2005 force-pushed the 27795_Show_Bottomsheetwhen_no_notification_permission branch from 5e6cdb9 to 3d2b5e3 Compare February 19, 2023 13:23
@sujitacharya2005 sujitacharya2005 merged commit 89b27d4 into master Feb 19, 2023
@sujitacharya2005 sujitacharya2005 deleted the 27795_Show_Bottomsheetwhen_no_notification_permission branch February 19, 2023 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deeppandya deeppandya deeppandya approved these changes

@SergeyZhukovsky SergeyZhukovsky SergeyZhukovsky approved these changes

Assignees

@sujitacharya2005 sujitacharya2005

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.50.x - Release
Development

Successfully merging this pull request may close these issues.

Show Bottomsheet in rewards page and show ui in rewards panel when no notification permission
3 participants
@sujitacharya2005 @deeppandya @SergeyZhukovsky