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

Improve UI/UX in calls #7791

Merged
merged 6 commits into from
May 4, 2022
Merged

Improve UI/UX in calls #7791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00e99f7
Update licenses
SimonBrandner Feb 12, 2022
9c77a91
Improve the look and functionality of the CallView
SimonBrandner Feb 12, 2022
301289f
i18n
SimonBrandner Feb 12, 2022
ca3beec
Merge remote-tracking branch 'upstream/develop' into feature/improved…
SimonBrandner Mar 6, 2022
e0693aa
Merge branch 'develop' into feature/improved-call-view
SimonBrandner May 1, 2022
dac4f9f
Merge remote-tracking branch 'upstream/develop' into feature/improved…
SimonBrandner May 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions res/css/views/voip/CallView/_CallViewButtons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
Copyright 2021 - 2022 Šimon Brandner <simon.bra.ag@gmail.com>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -27,7 +27,7 @@ limitations under the License.
position: absolute;
display: flex;
justify-content: center;
bottom: 24px;
bottom: 32px;
opacity: 1;
transition: opacity 0.5s;
z-index: 200; // To be above _all_ feeds
Expand Down
311 changes: 143 additions & 168 deletions res/css/views/voip/_CallView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2020 The Matrix.org Foundation C.I.C.
Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
Copyright 2021 - 2022 Šimon Brandner <simon.bra.ag@gmail.com>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -22,202 +23,176 @@ limitations under the License.
padding-right: 8px;
// XXX: PiPContainer sets pointer-events: none - should probably be set back in a better place
pointer-events: initial;
}

.mx_CallView_large {
padding-bottom: 10px;
margin: $container-gap-width;
// The left side gap is fully handled by this margin. To prohibit bleeding on webkit browser.
margin-right: calc($container-gap-width / 2);
margin-bottom: 10px;
display: flex;
flex-direction: column;
flex: 1;

.mx_CallView_voice {
flex: 1;
}

&.mx_CallView_belowWidget {
margin-top: 0;
}
}
.mx_CallView_toast {
position: absolute;
top: 74px;

.mx_CallView_pip {
width: 320px;
padding-bottom: 8px;
background-color: $system;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.2);
border-radius: 8px;
padding: 4px 8px;

.mx_CallView_video_hold,
.mx_CallView_voice {
height: 180px;
}
border-radius: 4px;
z-index: 50;

.mx_CallViewButtons {
bottom: 13px;
// Same on both themes
color: white;
background-color: #17191c;
}

.mx_CallViewButtons_button {
width: 34px;
height: 34px;
.mx_CallView_content_wrapper {
display: flex;
justify-content: center;

&::before {
width: 22px;
height: 22px;
}
}

.mx_CallView_holdTransferContent {
padding-top: 10px;
padding-bottom: 25px;
}
}

.mx_CallView_content {
position: relative;
display: flex;
justify-content: center;
border-radius: 8px;

> .mx_VideoFeed {
width: 100%;
height: 100%;

&.mx_VideoFeed_voice {
overflow: hidden;

.mx_CallView_content {
position: relative;

display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

.mx_VideoFeed_video {
height: 100%;
background-color: #000;
flex: 1;
overflow: hidden;

border-radius: 10px;

padding: 10px;
padding-right: calc(20% + 20px); // Space for the sidebar

background-color: $call-view-content-background;

.mx_CallView_status {
z-index: 50;
color: $accent-fg-color;
}

.mx_CallView_avatarsContainer {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;

div {
margin-left: 12px;
margin-right: 12px;
}
}

.mx_CallView_holdBackground {
position: absolute;
left: 0;
right: 0;

width: 100%;
height: 100%;

background-repeat: no-repeat;
background-size: cover;
background-position: center;
filter: blur(20px);

&::after {
content: "";
display: block;
position: absolute;
width: 100%;
height: 100%;
left: 0;
right: 0;
background-color: rgba(0, 0, 0, 0.6);
}
}

&.mx_CallView_content_hold .mx_CallView_status {
font-weight: bold;
text-align: center;

&::before {
display: block;
margin-left: auto;
margin-right: auto;
content: "";
width: 40px;
height: 40px;
background-image: url("$(res)/img/voip/paused.svg");
background-position: center;
background-size: cover;
}

.mx_CallView_pip &::before {
width: 30px;
height: 30px;
}

.mx_AccessibleButton_hasKind {
padding: 0px;
}
}
}
}

&:not(.mx_CallView_sidebar) .mx_CallView_content {
padding: 0;
width: 100%;
height: 100%;

.mx_VideoFeed_primary {
aspect-ratio: unset;
border: 0;

.mx_VideoFeed_mic {
left: 10px;
bottom: 10px;
width: 100%;
height: 100%;
}
}
}

.mx_CallView_voice {
align-items: center;
justify-content: center;
flex-direction: column;
background-color: $inverted-bg-color;
}
&.mx_CallView_pip {
width: 320px;
padding-bottom: 8px;

.mx_CallView_voice_avatarsContainer {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
div {
margin-left: 12px;
margin-right: 12px;
}
}
border-radius: 8px;

.mx_CallView_voice .mx_CallView_holdTransferContent {
// This masks the avatar image so when it's blurred, the edge is still crisp
.mx_CallView_voice_avatarContainer {
border-radius: 2000px;
overflow: hidden;
position: relative;
}
}
background-color: $system;
box-shadow: 0px 4px 20px rgba(0, 0, 0, 0.2);

.mx_CallViewButtons {
bottom: 13px;

.mx_CallView_holdTransferContent {
height: 20px;
padding-top: 20px;
padding-bottom: 15px;
color: $accent-fg-color;
user-select: none;
.mx_CallViewButtons_button {
width: 34px;
height: 34px;

&::before {
width: 22px;
height: 22px;
}
}
}

.mx_AccessibleButton_hasKind {
padding: 0px;
font-weight: bold;
.mx_CallView_content {
min-height: 180px;
}
}
}

.mx_CallView_video {
width: 100%;
height: 100%;
z-index: 30;
overflow: hidden;
}
&.mx_CallView_large {
display: flex;
flex-direction: column;
align-items: center;

.mx_CallView_video_hold {
overflow: hidden;
flex: 1;

// we keep these around in the DOM: it saved wiring them up again when the call
// is resumed and keeps the container the right size
.mx_VideoFeed {
visibility: hidden;
}
}
padding-bottom: 10px;

.mx_CallView_video_holdBackground {
position: absolute;
width: 100%;
height: 100%;
left: 0;
right: 0;
background-repeat: no-repeat;
background-size: cover;
background-position: center;
filter: blur(20px);
&::after {
content: "";
display: block;
position: absolute;
width: 100%;
height: 100%;
left: 0;
right: 0;
background-color: rgba(0, 0, 0, 0.6);
margin: $container-gap-width;
// The left side gap is fully handled by this margin. To prohibit bleeding on webkit browser.
margin-right: calc($container-gap-width / 2);
margin-bottom: 10px;
}
}

.mx_CallView_video .mx_CallView_holdTransferContent {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
font-weight: bold;
color: $accent-fg-color;
text-align: center;

&::before {
display: block;
margin-left: auto;
margin-right: auto;
content: "";
width: 40px;
height: 40px;
background-image: url("$(res)/img/voip/paused.svg");
background-position: center;
background-size: cover;
}
.mx_CallView_pip &::before {
width: 30px;
height: 30px;
}
.mx_AccessibleButton_hasKind {
padding: 0px;
&.mx_CallView_belowWidget {
margin-top: 0;
}
}

.mx_CallView_presenting {
position: absolute;
margin-top: 18px;
padding: 4px 8px;
border-radius: 4px;

// Same on both themes
color: white;
background-color: #17191c;
}
4 changes: 3 additions & 1 deletion res/css/views/voip/_CallViewHeader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2021 The Matrix.org Foundation C.I.C.
Copyright 2021 - 2022 Šimon Brandner <simon.bra.ag@gmail.com>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,8 +20,9 @@ limitations under the License.
display: flex;
flex-direction: row;
align-items: center;
justify-content: left;
justify-content: space-between;
flex-shrink: 0;
width: 100%;

&.mx_CallViewHeader_pip {
cursor: pointer;
Expand Down
Loading