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

Add dialpad to transfer dialog + various dialpad UI improvements#6363

Merged
anoadragon453 merged 8 commits into
developfrom
feature/transfer_dialpad_improvements
Jul 15, 2021
Merged

Add dialpad to transfer dialog + various dialpad UI improvements#6363
anoadragon453 merged 8 commits into
developfrom
feature/transfer_dialpad_improvements

Conversation

@anoadragon453
Copy link
Copy Markdown
Member

This PR simply merges the feature branch feature/transfer_dialpad_improvements to develop. This branch is the combination of PRs #6217, #6301, #6325 and #6338, which have already been independently reviewed.

See each linked PR for the details, but the high-level summary is that the call transfer dialog now has a built in dial pad for transferring a call to a number you can dial:

image

as well as various improvements to the dial pad itself such as better sizing, letters under the buttons and a better-placed backspace button:

image

Design by @gaelledel, implementation by @dbkr and myself.

Signed-off-by: Andrew Morgan <andrewm@element.io>

dbkr and others added 6 commits July 1, 2021 18:08
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
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.
This PR adds letters and a + underneath the dial pad buttons.
@anoadragon453 anoadragon453 requested a review from a team July 13, 2021 11:13
Copy link
Copy Markdown
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.

Mainly looks good to me! Thank you for working on that

Before merging that in develop could you extract all the hardcoded colour into _dark.scss, _legacy-dark.scss, _light.scss and _legacy-dark.scss

Comment thread res/css/views/dialogs/_InviteDialog.scss Outdated
Comment thread res/css/views/dialogs/_InviteDialog.scss Outdated
Comment thread res/css/views/elements/_DialPadBackspaceButton.scss
Comment thread res/css/views/elements/_DialPadBackspaceButton.scss Outdated
Comment thread res/css/views/voip/_DialPadContextMenu.scss Outdated
@jryans
Copy link
Copy Markdown
Collaborator

jryans commented Jul 13, 2021

@anoadragon453 Did a design review already happen? I did not notice a green check from @gaelledel on the other PRs...

@anoadragon453
Copy link
Copy Markdown
Member Author

@jryans yes, it was reviewed at the end of the work in #6338.

@anoadragon453
Copy link
Copy Markdown
Member Author

Thanks for the review @gsouquet. It turns out all of those colours were already variables 😅. I noticed a few more instances of #6F7882 being hardcoded in _legacy-dark.scss as well, though the colour is only officially named in _dark.scss:

$quaternary-fg-color: #6F7882;

$voice-record-stop-border-color: #6F7882;
$voice-record-waveform-incomplete-fg-color: #6F7882;
$voice-record-icon-color: #6F7882;

  1. Would we use variables from _dark.scss in legacy-dark.scss and if so,
  2. Do you want to fix that up? Either in this PR or a separate one?

@anoadragon453 anoadragon453 requested a review from germain-gg July 13, 2021 16:53
@germain-gg
Copy link
Copy Markdown
Contributor

As far as I understand _dark.scss and _legacy-dark.scss are two separate things and the latter is used independently in some hardened Element themes.
If you can fix it as part of this PR that is great, but I do not want to needlessly block you from getting that PR across

@t3chguy
Copy link
Copy Markdown
Member

t3chguy commented Jul 14, 2021

the latter is used independently in some hardened Element themes.

Actually is the base for all custom themes, not at all exclusive to Hardened Element https://github.com/vector-im/element-web/blob/develop/docs/theming.md#custom-themes https://github.com/aaronraimist/element-themes

And is used as-is on some legacy customer deployments

@anoadragon453
Copy link
Copy Markdown
Member Author

@gsouquet I think we should move this fix to another PR as we have a customer waiting on this PR landing.

But thanks for the information both!

@anoadragon453 anoadragon453 merged commit f4788a6 into develop Jul 15, 2021
@anoadragon453 anoadragon453 deleted the feature/transfer_dialpad_improvements branch July 15, 2021 08:56
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.

5 participants