Commit graph

259 commits

Author SHA1 Message Date
Šimon Brandner
657896c0b9
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 11:00:42 +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
Šimon Brandner
b014763cd2
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 13:14:14 +02:00
David Baker
80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Šimon Brandner
58151d71c5
Handle mid-call output changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:09:53 +02:00
Šimon Brandner
9bceb40820
CallMediaHandler -> MediaDeviceHandler
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
Germain
e9d87478e2
Spaces before/after curlies
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 10:06:31 +01:00
Germain Souquet
88d25ad6af Fix typo in default import name 2021-06-21 15:44:09 +01:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Šimon Brandner
ccfc7fe421
Make call silencing more flexible
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 20:03:02 +02:00
Šimon Brandner
c8cf23b87c
Implement LERP
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 12:21:24 +02:00
Šimon Brandner
61929e3fc2
Implement snapping
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-19 09:34:45 +02:00
Šimon Brandner
946317ddf8
Move moving out of state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-18 19:11:48 +02: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
ab3ccecc96
Use UIStore
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-17 15:52:55 +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
cc46233c9f
Remove emtpy line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 18:26:00 +02:00
Šimon Brandner
a933e08e5f
Also turn off camera when hiding sidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 18:13:28 +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
10e8a1db58
Allow fullscreening in all call types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 17:15:17 +02:00
Šimon Brandner
6d29c19804
Move call controls into a separate method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 16:32:01 +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
d62f959014
Fix imports
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 12:30:56 +02:00
Šimon Brandner
ed148de567
Derive mute state from props
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 12:16:52 +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
176fb9baae
Don't show sidebar in PiP
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 11:03:14 +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
84070bf0ca
Rework how feeds work
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 09:19:58 +02:00
Šimon Brandner
1b2b4714e1
Properly handle feed prop updates
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 09:19:45 +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
619231883f
Add CallViewSidebar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-12 08:09:16 +02:00
Šimon Brandner
1d3bf91e83
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-04 08:19:29 +02:00
Šimon Brandner
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
David Baker
8ef95a6237 Interface dispatcher payload
& use constant in test
2021-06-03 14:38:13 +01:00
David Baker
2c4fa73a45 Map phone number lookup results to their native rooms
When dialing a phone number, also look to see if there's a corresponding
native user for the resulting user, and if so, go to the native room
for that user.
2021-06-02 17:39:13 +01:00
Šimon Brandner
b08b36c14f
Add silencing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-22 20:24:36 +02:00
Šimon Brandner
f949526078
Add a missing ;
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-20 15:54:47 +02:00
Šimon Brandner
5c2abd291a
Do not render the audio element if there is no audio track
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-19 08:46:04 +02:00
Šimon Brandner
adddb0f0d2
Show screensharign button only if connected
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-13 18:11:47 +02:00
Šimon Brandner
834579f778
Don't render any audio non-primary feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-11 13:07:30 +02:00
Šimon Brandner
acd0fa4c0e
Add a comment about when it is possible to screenshare
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 14:42:06 +02:00
Šimon Brandner
90f4ad7a83
Always sort feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-10 13:21:02 +02:00
Šimon Brandner
69b0425c10
Improve and fix sorting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 18:50:13 +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
4c9d9dd214
Enable screenshare in all video calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-08 10:04:26 +02:00
Šimon Brandner
5b2f941ce2
Add button to screenshare
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-07 21:35:32 +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
9755da6f09
Add ?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 19:59:51 +02:00
Šimon Brandner
f79339c2da
Add missing semicolon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:36:11 +02:00
Šimon Brandner
889b90fbc3
Fix const values
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:33:24 +02:00
Šimon Brandner
941a6e1c1b
Don't duplicate code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:16:36 +02:00
Šimon Brandner
0bf2b01f84
Keep PiP in the window when resizing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 18:11:02 +02:00
Šimon Brandner
be2da6376e
Simplifie translation code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 17:49:55 +02:00
Šimon Brandner
d8d380c74d
Always keep the PiP CallView on the screen
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 17:22:45 +02:00
Šimon Brandner
f93ff1c8ae
Add semicolons to event listeners
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:43:13 +02:00
Šimon Brandner
2c9231641b
Add ref to callViewWrapper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:40:59 +02:00
Šimon Brandner
76f503666c
Add default offset
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:40:12 +02:00
Šimon Brandner
0851cf4415
Simplifie things
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:16:08 +02:00
Šimon Brandner
adcdd72a08
preventDefault() and stopPropagation() only if moving
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 15:07:25 +02:00
Šimon Brandner
7042eb38dd
Listen for mouseup on the document
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 08:12:54 +02:00
Šimon Brandner
51e80dd172
Remove onMoving listner from CallView
This is not necessary since we already listen for it in CallPreview

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-03 07:50:21 +02:00
Šimon Brandner
fca5347668
Add preventDefault() and stopPropagation()
This avoids text being selected while dragging

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 21:17:59 +02:00
Šimon Brandner
53b8fd3072
Listen for mousemove on document scale
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 20:57:18 +02:00
Šimon Brandner
241e626e96
Don't listen for onMouseLeave
This would cause problems because the moving element wouldn't catch up with the user

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 20:55:05 +02:00
Šimon Brandner
11222e7a46
Wire up dragging
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 16:26:54 +02:00
Šimon Brandner
f64a950195
Prep basic methods for dragging
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 16:26:41 +02:00
Šimon Brandner
c97bbe11a9
Prep state and props for dragging
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 16:26:03 +02:00
Šimon Brandner
8948c7419c
Call dragCallbacks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 16:24:47 +02:00
Šimon Brandner
bebcb32e8f
Add dragCallbacks
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-02 16:23:35 +02:00
Šimon Brandner
653591e806
Use CallChangeRoom in CallViewForRoom
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:56:26 +02:00
Šimon Brandner
40748d3c94
Make CallHandler emit CallChangeRoom
Let's hope I changed the tests correctly

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:49:07 +02:00
Šimon Brandner
e5b61f0632
Keep rendering AudioFeeds on hold
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 11:29:05 +02:00
Šimon Brandner
4c58a95046
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-28 10:59:47 +02:00
Šimon Brandner
8d014b7fa2
Use getLocalFeeds() for better clarity
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:23:21 +02:00
Šimon Brandner
e367725cce
Fix casing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:05:46 +02:00
Šimon Brandner
a6ad574f4e
Fix typos
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:05:21 +02:00
Šimon Brandner
f3a7ffca60
Remove audio element from VideoFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 12:02:41 +02:00
Šimon Brandner
b612b252e1
Fix a type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 11:59:26 +02:00
Šimon Brandner
08251a761d
Add AudioFeedArrayForCall
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 10:58:32 +02:00
Šimon Brandner
9af176f5e2
Add AudioFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-27 10:20:49 +02:00
Šimon Brandner
81164fe152
Add comment about the js-sdk and new incoming feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-26 16:09:21 +02:00
Š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
David Baker
59c5ab31de Support MSC3086 asserted identity 2021-04-19 20:30:51 +01:00
Šimon Brandner
758112dda9
Add missing somicolons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 07:42:32 +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
33fd09d777
Make private
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 20:21:03 +02:00
Šimon Brandner
56b15edc58
Properly handle media
This might have resulted in the wrong speaker being used or worse

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-12 16:19:05 +02:00
Šimon Brandner
a3da5ee6e6
Don't play audio if the feed is local
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-08 14:32:53 +02:00
Šimon Brandner
adb0877591
Merge branch 'develop' into feed 2021-04-07 19:17:35 +02:00
Šimon Brandner
202ead40c4
Merge branch 'develop' into resizable-call-view 2021-04-04 11:35:26 +02:00
Šimon Brandner
16e6f84f89
Display local feeds when connecting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 09:04:17 +02:00
Šimon Brandner
9324dec0d6
Rename audioOnly to videoMuted
This makes more sense and will match a possible mute events MSC

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 08:50:25 +02:00
Šimon Brandner
346784e530
Add getMember() to CallFeed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 08:33:53 +02:00
Šimon Brandner
c5952f7e23
Remove VideoFeedType
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-04 08:02:51 +02:00
Šimon Brandner
4c64dacba4
Fix class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:16:08 +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
Šimon Brandner
9a2036c212
Add semicolons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-22 07:44:37 +01:00
Šimon Brandner
b257c25c2c
Make functions private
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-22 07:40:36 +01:00