Commit Graph

164 Commits

Author SHA1 Message Date
Šimon Brandner
e2bc76a129
Fix voice feed cut-off
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 17:17:21 +02:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
Dariusz Niemczyk
3ab54bce6e
Move CallViewHeader css to separate file 2021-08-03 15:21:14 +02:00
David Baker
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
Andrew Morgan
442992b30e
Fix symbol entry in the in-call dialpad (#6521)
The field had RTL direction set on it, which meant symbols, like *,
appeared at the beginning of the field instead of the end.

RTL was introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/5786,
however its removal seems to have had no adverse affects
from testing.
2021-08-02 10:18:17 +01:00
Šimon Brandner
cb89dd408c
Use mic mute icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:05:26 +02:00
Šimon Brandner
7ed5dee74b
Make colors a bit clearer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 13:17:06 +02:00
Šimon Brandner
277fdf1711
voipcall-plinth-color -> quinary-content-color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:42:18 +02:00
Šimon Brandner
3ef20174f3
Fix issues with the controls disappearing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 18:11:29 +02:00
Šimon Brandner
03a8308ae8
Fix call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:24:18 +02:00
Šimon Brandner
410928745f
IncomingCallBox -> IncomingCallToast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:22 +02:00
Šimon Brandner
8695beb7ca
Fix overflow issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 10:03:22 +02:00
Šimon Brandner
2873bf6c3c
Make feeds bit a smaller
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:50:56 +02:00
Šimon Brandner
72948b9167
Keep aspect ratio for voice feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:45:33 +02:00
Šimon Brandner
7ad62a8b1a
Reorganize some CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 09:06:20 +02:00
Šimon Brandner
d243f7bad8
Move some CSS to a more correct place
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:30:25 +02:00
Šimon Brandner
3fac4adfc7
Fix feed sizing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:14:21 +02:00
Šimon Brandner
dc7f6d8286
Show sidebar in PiP mode
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:45:21 +02:00
Šimon Brandner
3993e698bd
Put the call controls close togather
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 17:22:36 +02:00
Šimon Brandner
0af64504b1
Reverse sidebar order
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:53:53 +02:00
Šimon Brandner
15406eaff2
Put the sidebar to the bottom rather than the top
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:18:48 +02:00
Šimon Brandner
fadb13e9fb
Center all buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 16:02:02 +02:00
Šimon Brandner
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:37:57 +02:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363)
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
Šimon Brandner
91d208d514
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-09 08:26:19 +02:00
Šimon Brandner
fc239ffd01
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 10:53:22 +02:00
David Baker
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad
Dial Pad UI bug fixes
2021-06-23 11:41:41 +01:00
Šimon Brandner
6fb3bdbcd0
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-18 19:02:56 +02:00
Šimon Brandner
88ba24f362
Fix bugs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 18:34:58 +02:00
Šimon Brandner
d89392a1d9
Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-17 15:41:19 +02:00
Šimon Brandner
60ab7aaed5
Support hiding sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:20:13 +02:00
Šimon Brandner
9a67851479
Hide feeds with muted video in certain cases and fix colors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 14:01:09 +02:00
Šimon Brandner
6ae1f533e9
Add min-width
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 13:50:25 +02:00
Šimon Brandner
0c55a6c5bf
Add presenting text
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:50:16 +02:00
Šimon Brandner
e431f41e11
Fix feeds misbehaving
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 10:48:32 +02:00
Šimon Brandner
97b976b171
Adjust for sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:15:26 +02:00
Šimon Brandner
5608e92885
Add styling for CallViewSidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:09:51 +02:00
Šimon Brandner
c678211a42
Add styling for silencing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:24:20 +02:00
Šimon Brandner
228b2ccf2d
Increase z-index of call controls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:06:25 +02:00
Šimon Brandner
430808ae2e
Simplifie CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 16:49:47 +02:00
Šimon Brandner
1f27354439
Add support for up to 4 feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 21:34:56 +02:00
Šimon Brandner
198722eb41
Add classes for screensharing buttons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 20:29:45 +02:00
Šimon Brandner
fe5fb1885f
Add styling for CallPreview and make it fixed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:39:24 +02:00
Šimon Brandner
b8cb72345c
Remove unnecessary margin
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:39:00 +02:00
Ayush PS
b42872daa4 Fixed the Dial Pad and finalized the changes 2021-05-02 22:10:15 +05:30
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:52:23 +02:00
Ayush PS
8660ab000e Merge branch 'develop' into DialPad 2021-04-28 08:55:44 +05:30
Ayush PS
7509481bb9 Added the LTR support for the dialpad 2021-04-28 02:46:43 +05:30
Šimon Brandner
9b2eb8ebc0
Set box-shadow opacity to 20%
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 15:27:11 +02:00
Šimon Brandner
dacb161a64
Fix the look of video feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:03:01 +02:00
Šimon Brandner
e79f94d01e
Somewhat fix the local video issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 20:49:11 +02:00
Ayush PS
3201ed2f0f Added color scheme for the numbers 2021-04-26 01:40:10 +05:30
Šimon Brandner
fbb8cfb188
Rework how media element are handled
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-23 19:41:55 +02:00
Šimon Brandner
cf21658e30
Use suggested box-shadow
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-23 18:29:10 +02:00
Šimon Brandner
2d17ba445a
Increase drop shadow alpha to 0.45
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-23 15:33:10 +02:00
Šimon Brandner
d757b7d788
Merge branch 'develop' into fix-pip-color 2021-04-23 14:10:29 +02:00
Šimon Brandner
2cfd4659e1
Add separate mx_CallView_content class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-16 12:50:23 +02:00
Šimon Brandner
202ead40c4
Merge branch 'develop' into resizable-call-view 2021-04-04 11:35:26 +02:00
Šimon Brandner
27ec3af03a
Merge branch 'develop' into feed
Looking forward to merging again! :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:15:55 +02:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Ayush PS
1488457c33 Added the class -button-bg-color for all themes 2021-03-25 01:31:45 +05:30
Ayush PS
3df9557df2 Dial Pad UI fix 2021-03-24 14:00:09 +05:30
Šimon Brandner
bb13dc49a6
Make CallView use CallFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-10 12:18:57 +01:00
Šimon Brandner
0e5297fcb0
Fix local feed size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-03 16:44:43 +01:00
Šimon Brandner
2e535d2a99
Fix CSS to make it work with resizing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 20:33:34 +01:00
Šimon Brandner
f86e6fe643
Add resize CallViewForRoom CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 20:32:13 +01:00
Šimon Brandner
9ffef8f072
Fix VoIP PIP frame color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-01 13:44:22 +01:00
Šimon Brandner
effb9666f2
Fix portrait videocalls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-22 20:10:30 +01:00
David Baker
d4470d2ed2 Actually this is right colour 2021-01-13 16:55:38 +00:00
David Baker
150e8c9d56 Fix incoming call box on dark theme 2021-01-13 15:31:26 +00:00
David Baker
4b43929aa3 Add in-call dialpad for DTMF sending
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573
2021-01-04 20:01:43 +00:00
David Baker
452fbb076b Add a dialpad UI for PSTN lookup
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
2020-12-23 19:02:01 +00:00
David Baker
0d4b2f48dc Probably better to just remove this 2020-12-21 11:25:04 +00:00
David Baker
aee861956c Remove secondary call avatar
and change 'paused' to 'on hold'
2020-12-18 19:40:57 +00:00
David Baker
63e99ecf93 Visual fixups for call UI
* Add bottom margin on PiP view
 * Remove avatar blurring & pause icon for held calls
 * Change background of incoming call box to match PiP view
 * Put drop shadow & border radius on PiP view & incoming call box
   rather than the CallContainer they're in (so they each have their own
   drop shadow / rounded corners).
 * Add margin between incoming call box and PiP view
2020-12-18 18:08:04 +00:00
David Baker
89240b84fb Only want margins on the large view 2020-12-10 15:52:03 +00:00
David Baker
5282c6bbe8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 12:36:11 +00:00
David Baker
8f24656603 Make margins & header font match widgets 2020-12-08 19:26:57 +00:00
David Baker
70964e43f6 Fix font weights in hold text 2020-12-08 19:05:58 +00:00
David Baker
b9d70cb1a3 Fix indentation 2020-12-07 18:40:29 +00:00
David Baker
365d6982ce Add secondary call avatar to main voice content view 2020-12-07 18:28:43 +00:00
David Baker
8a58c9dea0 Update UI for two calls in the PiP view
and also merge hold_ui changes
2020-12-07 17:56:36 +00:00
David Baker
747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
David Baker
3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
David Baker
c7f1d97b1a Round off the sharp corners
Before you have someone's eye out
2020-12-07 15:38:55 +00:00
David Baker
ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker
6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker
0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker
1ce63f0fa7 Line 1 / 2 Support
Support one active call plus one call on hold
2020-12-03 17:45:49 +00:00
David Baker
4a503fb32e Fix VoIP call plinth on dark theme
Fixes https://github.com/vector-im/element-web/issues/15873
2020-12-02 12:14:41 +00:00
David Baker
4ca35fabef Visual tweaks 2020-12-01 13:44:24 +00:00
David Baker
2a02e57a95 Add UI for hold functionality 2020-11-26 14:35:09 +00:00
David Baker
729d59160d Rename buttons in CSS & remove unused 2020-11-23 15:27:37 +00:00
David Baker
576ba21210 Comment nonzero opacity 2020-11-23 15:13:19 +00:00
David Baker
49bd66c377 Change fullscreen button to expand button in PIP view
and fix call controls which didn't appear in video call
2020-11-19 16:36:23 +00:00
David Baker
50965e41eb Remove call bar
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
2020-11-19 15:15:31 +00:00
David Baker
a2d58e2f1f Make new in-call UI work
* Buttons on the main view will disappear after 1 second of the user
not moving the mouse over the call view.
 * PIP view has no buttons, and not moveable yet
 * No call status in room view yet
 * Room status bar is still there currently
2020-11-18 14:22:38 +00:00
David Baker
6caca97942 lint 2020-11-12 18:12:38 +00:00
David Baker
c921567831 WIP: the new call views work now
just need to add the buttons and then get rid of the status bar
2020-11-12 18:09:56 +00:00
David Baker
90bbc082dc
Copyright
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-11-05 09:25:52 +00:00