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

Disable unblock button #1205

Merged
merged 7 commits into from
May 30, 2023
Merged

Conversation

bemusementpark
Copy link

@bemusementpark bemusementpark commented May 19, 2023

This PR adds a new disabled state to Widget.Session.Button.Common.DestructiveOutline and utilises it in BlockedContactsActivity when no recipients are selected.

This PR also:

  1. adds a ripple downstate to that button and Widget.Session.Button.Common.ProminentOutline as these buttons often appear together.

  2. utilises CardView to mask the items of the list so they don't spill over the rounded corners of their parent.

  3. fixes a minor logic error, where the adapter would hold onto selected recipients after they were unblocked.

device-2023-05-22-222403.webm

Screenshot_20230519_172011
Screenshot_20230519_171041

@mpretty-cyro mpretty-cyro merged commit 22ed2dd into oxen-io:dev May 30, 2023
@bemusementpark bemusementpark deleted the disable-unblock branch May 30, 2023 00:33
@mpretty-cyro mpretty-cyro mentioned this pull request Jun 5, 2023
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.

3 participants