Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): update incoming call ui #743

Merged
merged 3 commits into from
Oct 22, 2024
+17 −6
Merged

fix(ui): update incoming call ui #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b4efc4
fin
Jekrimo Oct 21, 2024
7bc9081
Merge branch 'dev' into incoming-call-ui-updates
phillsatellite Oct 21, 2024
1a1b5dc
Merge branch 'dev' into incoming-call-ui-updates
lgmarchi Oct 21, 2024
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
21 changes: 16 additions & 5 deletions src/lib/components/calling/IncomingCall.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,18 @@
<Text muted>{$user.profile.status_message}</Text>
{/if}
{:else}
<ProfilePicture id={$user.key} hook="friend-profile-picture" size={Size.Large} image={$user.profile.photo.image} status={$user.profile.status} />
<Text>{$user.name}</Text>
<Text>{$_("settings.calling.userInviteToAGroupCall")}</Text>
<ProfilePicture id={$user.key} hook="friend-profile-picture" size={Size.Medium} image={$user.profile.photo.image} status={$user.profile.status} />
<div class="text-container">
<Text>
{@html $_("settings.calling.userInviteToAGroupCall", {
values: {
user: `<span class="bold-text" style="font-weight: bold">${$user.name}</span>`,
group: `<span class="bold-text" style="font-weight: bold">${$callChat.name}</span>`,
},
})}
</Text>
</div>
<ProfilePictureMany users={$users} />
<Text>{$callChat.name}</Text>
{/if}
<Spacer less={true} />
<Controls>
Expand Down Expand Up @@ -127,7 +134,6 @@
gap: var(--gap);
width: 100%;
flex: 1;

.body {
position: absolute;
z-index: 1000;
Expand All @@ -152,6 +158,11 @@
justify-content: center;
align-items: center;
border: var(--border-width) solid var(--success-color);

.text-container {
max-width: 80%;
padding-left: 25px;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
"decline": "Decline",
"hasCancelled": "Has cancelled the call.",
"disconnecting": "Disconnecting...",
"userInviteToAGroupCall": "is inviting you to join a group call",
"userInviteToAGroupCall": "{user} has started a group call in {group}",
"noAnswer": "No answer, leaving the call...",
"everybodyDeniedTheCall": "Everybody Denied the call. Disconnecting...",
"acceptedCall": "Joined, loading...",
Expand Down