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

Cleanup of #5187 #6326

Merged
merged 9 commits into from
Jun 22, 2022
Merged

Cleanup of #5187 #6326

merged 9 commits into from
Jun 22, 2022

Conversation

bmarty
Copy link
Member

@bmarty bmarty commented Jun 16, 2022

See #5187 for more details.

Will squash and merge to cleanup git history.

After my change:

image

Fixes #5114

ahmed-radhouane and others added 8 commits March 3, 2022 16:07
 - update bottom sheet behaviour on canceling to be the same as the decline bottom click.
 - Change actions UI.
 - Add Changelog file.

Signed-off-by: Your Name <your@email.example.org>
 - update button text color in bottom sheet styles in syles_bottom_sheet.xml from black to white.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 - update changelog file.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
 - improvment after PR review.

Signed-off-by: Ahmed Radhouane Belkilani <arbelkilani@gmail.com>
#5114 : Update design and behaviour on widget bottom sheet
@bmarty bmarty requested review from a team, Claire1817 and mnaturel and removed request for a team June 16, 2022 14:00
@bmarty bmarty marked this pull request as ready for review June 16, 2022 14:41
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@@ -102,8 +102,9 @@ class RoomWidgetPermissionBottomSheet :
}

override fun onCancel(dialog: DialogInterface) {
viewModel.handle(RoomWidgetPermissionActions.BlockWidget)
Copy link
Contributor

@mnaturel mnaturel Jun 17, 2022

Choose a reason for hiding this comment

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

Maybe we should reuse the existing doDecline method?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. It is up to you but we could create a sub method without including call to dismiss() as you suggested?

Copy link
Contributor

@mnaturel mnaturel left a comment

Choose a reason for hiding this comment

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

I have just added a small remark to mutualize some code.

@bmarty bmarty merged commit 29d4916 into develop Jun 22, 2022
@bmarty bmarty deleted the feature/bma/bottom_sheet_buttons branch June 22, 2022 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update design and behaviour on widget bottom sheet
4 participants