Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Transfer by Dialpad #6217

Merged

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented Jun 18, 2021

Adds a dial pad to the transfer dialog

Extends TabbedView to have a tabs-on-top view as well as tabs-on-left

The transfer dialog really needs to be split out of the invite dialog now, but that requires also splitting out the user search bit into its own component.

There are other general dial pad updates in the designs (adding letters, moving delete button to the text field) that I haven't done here because this PR is already sizeable.

Screenshot 2021-06-23 at 16 22 50

Screenshot 2021-06-23 at 16 22 44

Screenshot 2021-06-23 at 16 22 35

Screenshot 2021-06-23 at 16 22 28

dbkr added 9 commits June 10, 2021 18:01
Also moves more logic out of views and into callhandler via a dispatch

First cut: UI not done yet, put in as a Tab View (the layout doesn't
work at all and overlaps horribly).
Tab style is still wrong though
flexbox and calc()ed heights are not a winning combination, so stay
consistent and use calc()ed heights throughout.

Also, put the delete button back rather than implementing a different
one of those too.
@dbkr dbkr requested review from gaelledel and a team June 18, 2021 18:11
@dbkr dbkr marked this pull request as ready for review June 18, 2021 18:11
Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

Otherwise looks good to me 👍

src/components/views/dialogs/InviteDialog.tsx Show resolved Hide resolved
@@ -825,6 +825,10 @@ export default class InviteDialog extends React.PureComponent<IInviteDialogProps
}
};

private onCancel = () => {
this.props.onFinished([]);
Copy link
Contributor

Choose a reason for hiding this comment

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

If I remember correctly, the first parameter of this onFinished callback is a boolean to notify whether the modal closed successfully or in an error state

Copy link
Member Author

Choose a reason for hiding this comment

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

This one appears to be special and unique and gets passed the list of strings to invite instead... :/

src/components/views/dialogs/InviteDialog.tsx Outdated Show resolved Hide resolved
Comment on lines 337 to 340
border-top: 0px;
border-left: 0px;
border-right: 0px;
border-radius: 0px;
Copy link
Contributor

Choose a reason for hiding this comment

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

Probably out of scope for this review, but we might want to introduce a StyleLint rule that forces unit-less 0.
It's what I usually see in CSS codebases

Copy link
Member Author

Choose a reason for hiding this comment

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

oh yeah - have changed these, but yep, we could probably add a rule

res/css/structures/_TabbedView.scss Outdated Show resolved Hide resolved
@dbkr
Copy link
Member Author

dbkr commented Jun 21, 2021

@gaelledel design tweaks applied: I've update the first screenshot

@dbkr dbkr requested a review from germain-gg June 25, 2021 10:28
@dbkr
Copy link
Member Author

dbkr commented Jun 25, 2021

@gsouquet re-requesting review as quite as lot has changed. Plan is now to merge this to a branch and make more changes to keep the PRs a manageable size for code review but merge once we've achieved the final design.

Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

Makes sense to me! :shipit:

@anoadragon453 anoadragon453 force-pushed the dbkr/transfer_by_dialpad branch from 8a99166 to 91bc871 Compare July 1, 2021 16:13
@dbkr dbkr changed the base branch from develop to feature/transfer_dialpad_improvements July 1, 2021 17:05
@anoadragon453 anoadragon453 merged commit f26212c into feature/transfer_dialpad_improvements Jul 1, 2021
@anoadragon453 anoadragon453 deleted the dbkr/transfer_by_dialpad branch July 1, 2021 17:08
anoadragon453 added a commit that referenced this pull request Jul 7, 2021
This PR builds on top of #6217.

It aims to cover:

    Increasing the size of the dial pad in general.
    Spacing the number buttons out a bit more from each other.
    Shrinking the separator bar between the text entry field and number buttons.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants