Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-04-06 07:20:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'livekit' into toger5/tiles_based_on_rtc_member

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2024-11-06 16:33:57 +00:00
parent eec44702f7 bfffddfa92
commit b1798e7f4b
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -86,7 +86,7 @@
"livekit-client": "^2.5.7",
"lodash": "^4.17.21",
"loglevel": "^1.9.1",
"matrix-js-sdk": "matrix-org/matrix-js-sdk#0a29063bc9e61ee70ca43820d4bb91f6a27f1237",
"matrix-js-sdk": "matrix-org/matrix-js-sdk#e11f9defb9b9603ee2d982a8fd2b0c9577fbf48c",
"matrix-widget-api": "^1.8.2",
"normalize.css": "^8.0.1",
"observable-hooks": "^4.2.3",

12
public/locales/de/app.json
View File

@@ -64,6 +64,12 @@
"crypto_version": "Krypto-Version:{{version}}",
"device_id": "Geräte-ID: {{id}}",
"disconnected_banner": "Die Verbindung zum Server wurde getrennt.",
"e2ee_encryption_status": {
"connecting": "Verbinden...",
"key_invalid": "Der Medien-Krypto-Schlüssel für diese Person ist ungültig",
"key_missing": "Aktueller Medien-Krypto-Schlüssel für diese Person noch nicht erhalten",
"password_invalid": "Diese Person verwendet ein anderes Passwort, sodass Sie nicht mit ihr kommunizieren können"
},
"full_screen_view_description": "<0>Übermittelte Problemberichte helfen uns, Fehler zu beheben.</0>",
"full_screen_view_h1": "<0>Hoppla, etwas ist schiefgelaufen.</0>",
"group_call_loader": {
@@ -90,7 +96,7 @@
"title": "An bestehendem Anruf teilnehmen?"
},
"layout_grid_label": "Raster",
"layout_spotlight_label": "Rampenlicht",
"layout_spotlight_label": "Fokus",
"lobby": {
"ask_to_join": "Beitritt anfragen",
"join_as_guest": "Als Gast beitreten",
@@ -142,12 +148,12 @@
"feedback_tab_body": "Falls du auf Probleme stößt oder einfach nur eine Rückmeldung geben möchtest, sende uns bitte eine kurze Beschreibung.",
"feedback_tab_description_label": "Deine Rückmeldung",
"feedback_tab_h4": "Rückmeldung geben",
"feedback_tab_send_logs_label": "Debug-Protokolle einschließen",
"feedback_tab_send_logs_label": "Debug-Protokolle anhängen",
"feedback_tab_thank_you": "Danke, wir haben deine Rückmeldung erhalten!",
"feedback_tab_title": "Rückmeldung",
"more_tab_title": "Mehr",
"opt_in_description": "<0></0><1></1>Du kannst deine Zustimmung durch Abwählen dieses Kästchens zurückziehen. Falls du dich aktuell in einem Anruf befindest, wird diese Einstellung nach dem Ende des Anrufs wirksam.",
"preferences_tab_body": "Hier können zusätzliche Optionen individuell konfigurieren werden",
"preferences_tab_body": "Hier können zusätzliche Optionen für individuelle Anforderungen eingestellt werden",
"preferences_tab_h4": "Einstellungen",
"preferences_tab_show_hand_raised_timer_description": "Einen Timer anzeigen, wenn ein Teilnehmer seine Hand hebt",
"preferences_tab_show_hand_raised_timer_label": "Dauer des Handhebens anzeigen",

4
src/reactions/RaisedHandIndicator.test.tsx
View File

@@ -33,10 +33,10 @@ describe("RaisedHandIndicator", () => {
);
expect(container.firstChild).toMatchSnapshot();
});
test("renders a smaller indicator when minature is specified", () => {
test("renders a smaller indicator when miniature is specified", () => {
const dateTime = new Date();
const { container } = render(
<RaisedHandIndicator raisedHandTime={dateTime} minature showTimer />,
<RaisedHandIndicator raisedHandTime={dateTime} miniature showTimer />,
);
expect(container.firstChild).toMatchSnapshot();
});

8
src/reactions/RaisedHandIndicator.tsx
View File

@@ -27,12 +27,12 @@ const durationFormatter = new DurationFormat(undefined, {
export function RaisedHandIndicator({
raisedHandTime,
minature,
miniature,
showTimer,
onClick,
}: {
raisedHandTime?: Date;
minature?: boolean;
miniature?: boolean;
showTimer?: boolean;
onClick?: () => void;
}): ReactNode {
@@ -78,12 +78,12 @@ export function RaisedHandIndicator({
const content = (
<div
className={classNames(styles.raisedHandWidget, {
[styles.raisedHandWidgetLarge]: !minature,
[styles.raisedHandWidgetLarge]: !miniature,
})}
>
<div
className={classNames(styles.raisedHand, {
[styles.raisedHandLarge]: !minature,
[styles.raisedHandLarge]: !miniature,
})}
>
<span role="img" aria-label="raised hand">

2
src/reactions/__snapshots__/RaisedHandIndicator.test.tsx.snap
View File

@@ -1,6 +1,6 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`RaisedHandIndicator > renders a smaller indicator when minature is specified 1`] = `
exports[`RaisedHandIndicator > renders a smaller indicator when miniature is specified 1`] = `
<div
class="raisedHandWidget"
>

8
src/tile/MediaView.tsx
View File

@@ -72,11 +72,7 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
<animated.div
className={classNames(styles.media, className, {
[styles.mirror]: mirror,
[styles.videoMuted]:
!videoEnabled ||
![EncryptionStatus.Connecting, EncryptionStatus.Okay].includes(
encryptionStatus,
),
[styles.videoMuted]: !videoEnabled,
})}
style={style}
ref={ref}
@@ -118,7 +114,7 @@ export const MediaView = forwardRef<HTMLDivElement, Props>(
)}
<RaisedHandIndicator
raisedHandTime={raisedHandTime}
minature={avatarSize < 96}
miniature={avatarSize < 96}
showTimer={handRaiseTimerVisible}
onClick={raisedHandOnClick}
/>

16
yarn.lock
View File

@@ -5990,9 +5990,9 @@ matrix-events-sdk@0.0.1:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
matrix-js-sdk@matrix-org/matrix-js-sdk#0a29063bc9e61ee70ca43820d4bb91f6a27f1237:
version "34.9.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/0a29063bc9e61ee70ca43820d4bb91f6a27f1237"
matrix-js-sdk@matrix-org/matrix-js-sdk#e11f9defb9b9603ee2d982a8fd2b0c9577fbf48c:
version "34.10.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e11f9defb9b9603ee2d982a8fd2b0c9577fbf48c"
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0"
@@ -6008,7 +6008,7 @@ matrix-js-sdk@matrix-org/matrix-js-sdk#0a29063bc9e61ee70ca43820d4bb91f6a27f1237:
p-retry "4"
sdp-transform "^2.14.1"
unhomoglyph "^1.0.6"
uuid "10"
uuid "11"
matrix-widget-api@^1.8.2:
version "1.9.0"
@@ -8092,10 +8092,10 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
uuid@10:
version "10.0.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==
uuid@11:
version "11.0.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.0.2.tgz#a8d68ba7347d051e7ea716cc8dcbbab634d66875"
integrity sha512-14FfcOJmqdjbBPdDjFQyk/SdT4NySW4eM0zcG+HqbHP5jzuH56xO3J1DGhgs/cEMCfwYi3HQI1gnTO62iaG+tQ==
validate-npm-package-license@^3.0.1:
version "3.0.4"