From b970463325460096f26b156688e13f1cb813240c Mon Sep 17 00:00:00 2001 From: Carlos Santos <4a.santos@gmail.com> Date: Thu, 23 May 2024 11:39:01 +0200 Subject: [PATCH] ov-components: Removed Angular Material legacy modules --- .../admin/dashboard/dashboard.component.css | 2 + .../admin/dashboard/dashboard.component.html | 2 +- .../src/lib/admin/login/login.component.css | 15 ++++++-- .../src/lib/admin/login/login.component.html | 2 +- .../dialogs/delete-recording.component.ts | 2 +- .../components/dialogs/dialog.component.ts | 2 +- .../dialogs/pro-feature-dialog.component.ts | 2 +- .../dialogs/recording-dialog.component.ts | 12 +++--- .../activities-panel.component.css | 38 ++++++++++++++----- .../activities-panel.component.html | 6 +-- .../broadcasting-activity.component.html | 27 ++++++++----- .../recording-activity.component.css | 24 +++++++++++- .../recording-activity.component.html | 19 ++++++---- .../background-effects-panel.component.css | 2 + .../lib/components/panel/panel.component.css | 5 +++ .../participant-panel-item.component.css | 29 +++++++++++--- .../participant-panel-item.component.html | 16 ++++---- .../settings-panel.component.css | 35 +++++++++++++---- .../settings-panel.component.html | 22 ++++++----- .../pre-join/pre-join.component.css | 3 +- .../components/session/session.component.css | 10 +++-- .../settings/captions/captions.component.css | 14 +++---- .../settings/captions/captions.component.html | 2 +- .../lang-selector/lang-selector.component.css | 3 ++ .../lang-selector.component.html | 18 ++++++--- .../lang-selector/lang-selector.component.ts | 4 +- .../nickname-input.component.css | 2 +- .../nickname-input.component.html | 4 +- .../components/stream/stream.component.css | 17 ++++++++- .../components/stream/stream.component.html | 2 +- .../lib/components/stream/stream.component.ts | 2 +- .../components/toolbar/toolbar.component.css | 10 ++--- .../components/toolbar/toolbar.component.ts | 2 +- .../openvidu-angular/src/lib/lang/cn.json | 3 +- .../openvidu-angular/src/lib/lang/de.json | 3 +- .../openvidu-angular/src/lib/lang/en.json | 3 +- .../openvidu-angular/src/lib/lang/es.json | 3 +- .../openvidu-angular/src/lib/lang/fr.json | 3 +- .../openvidu-angular/src/lib/lang/hi.json | 3 +- .../openvidu-angular/src/lib/lang/it.json | 3 +- .../openvidu-angular/src/lib/lang/ja.json | 3 +- .../openvidu-angular/src/lib/lang/nl.json | 3 +- .../openvidu-angular/src/lib/lang/pt.json | 3 +- .../lib/models/notification-options.model.ts | 4 +- .../lib/openvidu-angular.material.module.ts | 28 +++++++------- .../services/action/action.service.spec.ts | 4 +- .../src/lib/services/action/action.service.ts | 4 +- .../src/app/app.module.ts | 6 +-- .../src/app/openvidu-call/call.component.html | 6 +-- .../openvidu-webcomponent.component.scss | 8 ++-- openvidu-components-angular/src/styles.scss | 10 ++--- 51 files changed, 301 insertions(+), 154 deletions(-) diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.css index c663c62686..b0e2bbd14b 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.css @@ -177,11 +177,13 @@ display: table; text-align: center; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ ::ng-deep .mat-form-field-appearance-fill .mat-form-field-flex { padding: 0px !important; background-color: var(--ov-light-color) !important; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ ::ng-deep .mat-form-field-wrapper { height: 100% !important; } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.html index f898c805cd..92d5c02e3b 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.html +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/dashboard/dashboard.component.html @@ -62,7 +62,7 @@ " class="item" > - +
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.css index aaa938cb04..f1e3e74419 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.css @@ -1,13 +1,17 @@ + +/* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */ mat-card { max-width: 220px; margin: auto; margin-top: 10vh; } +/* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */ mat-card-content { margin-bottom: 8px; } +/* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */ mat-card-actions { padding-top: 0px; } @@ -21,7 +25,7 @@ mat-card-actions { mat-spinner { margin: auto; } -.mat-card-actions { +.mat-mdc-card-actions { margin: 0; } @@ -52,17 +56,20 @@ mat-spinner { width: 100%; } -::ng-deep .mat-input-element { +::ng-deep .mat-mdc-input-element { caret-color: #000000; } -::ng-deep .mat-primary .mat-option.mat-selected:not(.mat-option-disabled) { +/* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */ +::ng-deep .mat-primary .mat-mdc-option.mat-selected:not(.mat-option-disabled) { color: #000000; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ ::ng-deep .mat-form-field-label { color: var(--ov-panel-text-color) !important; } -::ng-deep .mat-form-field.mat-focused .mat-form-field-ripple { +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ +::ng-deep .mat-mdc-form-field.mat-focused .mat-form-field-ripple { background-color: var(--ov-panel-text-color) !important; } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.html index 1134fa8390..db5eb5da09 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.html +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/admin/login/login.component.html @@ -9,7 +9,7 @@
- +
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/delete-recording.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/delete-recording.component.ts index 9d79ae55b5..018aa9dfbb 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/delete-recording.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/delete-recording.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; +import { MatDialogRef } from '@angular/material/dialog'; /** * @internal diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/dialog.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/dialog.component.ts index 537843e951..eadad33db4 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/dialog.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DialogData } from '../../models/dialog.model'; /** diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/pro-feature-dialog.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/pro-feature-dialog.component.ts index 888793988a..edb47a7522 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/pro-feature-dialog.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/pro-feature-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DialogData } from '../../models/dialog.model'; diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/recording-dialog.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/recording-dialog.component.ts index 9011189637..e1927a0b25 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/recording-dialog.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/dialogs/recording-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject } from '@angular/core'; -import { MatLegacyDialogRef as MatDialogRef, MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA } from '@angular/material/legacy-dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { RecordingDialogData } from '../../models/dialog.model'; /** @@ -17,11 +17,11 @@ import { RecordingDialogData } from '../../models/dialog.model'; `, styles: [ ` - video { - max-height: 64vh; - max-width: 100%; - } - ` + video { + max-height: 64vh; + max-width: 100%; + } + ` ] }) export class RecordingDialogComponent { diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.css index a3a547eed1..fbf42f8af5 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.css @@ -9,34 +9,49 @@ display: inherit; background-color: var(--ov-light-color); border-radius: var(--ov-panel-radius); + margin: auto; + padding: 10px; } -.activity-icon mat-icon { - margin: auto; +::ng-deep .mat-mdc-list-item-icon { + margin: auto !important; } + +.activity-title, .activity-subtitle { - font-style: italic; - font-size: 11px !important; + margin: 0; + color: var(--ov-panel-text-color); } + .activity-title { font-weight: bold !important; } +.activity-subtitle { + font-style: italic; + font-size: 11px !important; +} + .activity-action-buttons { font-weight: 600; position: absolute; right: 15px; - top: 15px; + top: 0px; } ::ng-deep .mat-content { display: block !important; - } -::ng-deep .mat-list-text { +/* .activity-icon mat-icon { + margin: auto; +} */ + +/* TODO(mdc-migration): The following rule targets internal classes of list that may no longer apply for the MDC version. */ +::ng-deep .mdc-list-item__content { padding-left: 10px !important; + align-self: center !important; } ::ng-deep .mat-expansion-panel-header { @@ -44,7 +59,7 @@ height: 65px !important; } -::ng-deep .mat-list-base .mat-list-item .mat-list-item-content, +::ng-deep .mat-mdc-list-base .mat-mdc-list-item .mat-list-item-content, .mat-list-base .mat-list-option .mat-list-item-content { padding: 0px !important; } @@ -63,4 +78,9 @@ ::ng-deep .no-body .mat-expansion-panel-content { display: none !important; -} \ No newline at end of file +} + +::ng-deep .mdc-list-item--with-leading-icon.mdc-list-item--with-two-lines.mdc-list-item--with-trailing-meta .mdc-list-item__end::before { + max-height: 24px; + height: 24px; +} diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.html index 5c73cbbf64..d470ba5159 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.html +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/activities-panel.component.html @@ -1,12 +1,12 @@ -
-
+
+

Activities

-
+
sensors error sensors
-

{{ 'PANEL.STREAMING.TITLE' | translate }}

-

{{ 'PANEL.STREAMING.SUBTITLE' | translate }}

-
+

{{ 'PANEL.STREAMING.TITLE' | translate }}

+

{{ 'PANEL.STREAMING.SUBTITLE' | translate }}

+
{{ broadcastingStatus | uppercase }} @@ -59,7 +64,9 @@

{{ 'PANEL.STREAMING.TITLE' | translate }}

{{ 'PANEL.STREAMING.TITLE' | translate }} diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.css index db8a9fe31e..9b0052ddd6 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.css @@ -6,13 +6,23 @@ border-radius: var(--ov-panel-radius); } +.recording-title { + margin: 0px; +} + .time-container { padding: 2px; } .recording-icon { font-size: 32px !important; - height: 32px !important; width: 32px !important; + margin: 0 !important; + align-self: center !important; + display: flex; + flex-wrap: wrap; + height: auto; + align-content: center; + color: var(--ov-panel-text-color) !important; } .recording-duration { @@ -111,6 +121,18 @@ mat-expansion-panel { margin: 0px 0px 5px 0px; } +::ng-deep .mdc-list { + padding: 0px; +} + +::ng-deep .mdc-list-item__secondary-text { + display: flex; +} + +::ng-deep .mat-mdc-list-item-unscoped-content { + height: 0px !important; +} + .blink { animation: blinker 1.5s linear infinite !important; } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.html index 93e7da77a8..c049e8896c 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.html +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/panel/activities-panel/recording-activity/recording-activity.component.html @@ -1,9 +1,9 @@ - +
- + video_camera_front error radio_button_checked
-

{{ 'PANEL.RECORDING.TITLE' | translate }}

-

{{ 'PANEL.RECORDING.SUBTITLE' | translate }}

-
+

{{ 'PANEL.RECORDING.TITLE' | translate }}

+

{{ 'PANEL.RECORDING.SUBTITLE' | translate }}

+
{{ 'PANEL.RECORDING.CONTENT_TITLE' | tra
{{ recording.duration | duration }} - | {{ recording.size / 1024 / 1024 | number: '1.1-2' }} MBs + | {{ recording.size / 1024 / 1024 | number : '1.1-2' }} MBs
-
{{ recording.createdAt | date: 'HH:mm - dd/MM/yyyy' }}
+
{{ recording.createdAt | date : 'HH:mm - dd/MM/yyyy' }}
-
+
{{ 'PANEL.SETTINGS.TITLE' | translate }} [selected]="selectedOption === settingsOptions.GENERAL" [value]="settingsOptions.GENERAL" > - manage_accounts + manage_accounts
{{ 'PANEL.SETTINGS.GENERAL' | translate }}
{{ 'PANEL.SETTINGS.TITLE' | translate }} [selected]="selectedOption === settingsOptions.VIDEO" [value]="settingsOptions.VIDEO" > - videocam + videocam
{{ 'PANEL.SETTINGS.VIDEO' | translate }}
{{ 'PANEL.SETTINGS.TITLE' | translate }} [selected]="selectedOption === settingsOptions.AUDIO" [value]="settingsOptions.AUDIO" > - mic + mic
{{ 'PANEL.SETTINGS.AUDIO' | translate }}
{{ 'PANEL.SETTINGS.TITLE' | translate }} [value]="settingsOptions.CAPTIONS" id="captions-opt" > - closed_caption + closed_caption
{{ 'PANEL.SETTINGS.CAPTIONS' | translate }}
@@ -58,9 +60,9 @@

{{ 'PANEL.SETTINGS.TITLE' | translate }}

- language -
{{ 'PANEL.SETTINGS.LANGUAGE' | translate }}
- + language +
{{ 'PANEL.SETTINGS.LANGUAGE' | translate }}
+
diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.css index 65724c5328..9f851e1d7b 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/pre-join/pre-join.component.css @@ -15,8 +15,6 @@ #toolbar ::ng-deep .lang-button { height: 25px !important; font-size: 14px !important; - line-height: 0px; - align-items: unset !important; } .spacer { flex: 1 1 auto; @@ -98,6 +96,7 @@ hr { margin-bottom: 0px !important; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ .mat-form-field-appearance-fill .mat-form-field-flex { /* background-color: var(--ov-text-color); */ border-radius: var(--ov-video-radius); diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/session/session.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/session/session.component.css index 24cb6f6aa0..5d67f203d4 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/session/session.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/session/session.component.css @@ -85,22 +85,26 @@ } } +/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version. */ ::ng-deep .mat-button-toggle-appearance-standard .mat-button-toggle-label-content { padding: 1px !important; } -::ng-deep .mat-input-element { +::ng-deep .mat-mdc-input-element { caret-color: #000000; } -::ng-deep .mat-primary .mat-option.mat-selected:not(.mat-option-disabled) { +/* TODO(mdc-migration): The following rule targets internal classes of option that may no longer apply for the MDC version. */ +::ng-deep .mat-primary .mat-mdc-option.mat-selected:not(.mat-option-disabled) { color: #000000; } +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ ::ng-deep .mat-form-field-label { color: var(--ov-panel-text-color) !important; } -::ng-deep .mat-form-field.mat-focused .mat-form-field-ripple { +/* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */ +::ng-deep .mat-mdc-form-field.mat-focused .mat-form-field-ripple { background-color: var(--ov-panel-text-color) !important; } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.css index 75903da396..1d4a2d1bb5 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.css @@ -2,6 +2,10 @@ margin-top: 10px; } +.lang-section-item { + height: fit-content !important +} + .section-description { color: var(--ov-panel-text-color); font-size: 12px; @@ -18,14 +22,6 @@ text-align: center; } -.pro-feture p { +.pro-feture p { font-size: 14px; } - -::ng-deep .mat-slide-toggle.mat-checked .mat-slide-toggle-bar { - background-color: var(--ov-tertiary-color); -} - -::ng-deep .mat-slide-toggle.mat-checked .mat-slide-toggle-thumb { - background-color: var(--ov-light-color); -} diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.html index 6a01c75496..29e9d5774f 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.html +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/captions/captions.component.html @@ -13,7 +13,7 @@
- +
{{ 'PANEL.SETTINGS.LANGUAGE' | translate }}
- - \ No newline at end of file + diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts index 6074516c87..1e620de639 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/lang-selector/lang-selector.component.ts @@ -1,6 +1,6 @@ import { AfterViewInit, Component, OnInit, Output, ViewChild, EventEmitter, OnDestroy } from '@angular/core'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; -import { MatLegacySelect as MatSelect } from '@angular/material/legacy-select'; +import { MatMenuTrigger } from '@angular/material/menu'; +import { MatSelect } from '@angular/material/select'; import { StorageService } from '../../../services/storage/storage.service'; import { TranslateService } from '../../../services/translate/translate.service'; import { LangOption } from '../../../models/lang.model'; diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.css index f4fd326264..c15d221b60 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.css @@ -6,7 +6,7 @@ margin: auto 10px auto auto; } -#nickname-input-container button.mat-button-disabled { +#nickname-button { color: #000000 !important; } diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.html b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.html index 2c7d3478a0..69f7cb0aef 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.html +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/settings/nickname-input/nickname-input.component.html @@ -1,8 +1,8 @@
- - + {{ 'PREJOIN.NICKNAME' | translate }}
- diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts index 051c50a21f..10c0d048a5 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/stream/stream.component.ts @@ -1,6 +1,6 @@ import { animate, style, transition, trigger } from '@angular/animations'; import { Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; -import { MatLegacyMenuPanel as MatMenuPanel, MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatMenuPanel, MatMenuTrigger } from '@angular/material/menu'; import { PublisherProperties } from 'openvidu-browser'; import { Subscription } from 'rxjs'; import { VideoSizeIcon } from '../../models/icon.model'; diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css index 84c706fff7..cc62f01959 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.css @@ -23,8 +23,8 @@ #media-buttons-container:not(#media-buttons-container > button) button, /* Applying css for external additional buttons*/ ::ng-deep #media-buttons-container:not(#media-buttons-container > button) button { - width: 40px; - height: 40px; + width: 48px; + height: 48px; background-color: var(--ov-secondary-color); margin: 6px; } @@ -126,7 +126,7 @@ #leave-btn { background-color: var(--ov-warn-color) !important; border-radius: var(--ov-leave-button-radius) !important; - width: 60px !important; + width: 68px !important; } .tooltipList { @@ -141,13 +141,13 @@ top: -6px; } -.mat-icon-button[disabled] { +.mat-mdc-icon-button[disabled] { color: #fff; } .divider { margin: 8px 0px; } -::ng-deep .mat-menu-item { +::ng-deep .mat-mdc-menu-item { /* margin-bottom: 10px; */ height: 40px; line-height: 40px; diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts index 2a8fb61ef4..8dac7ce4b6 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/components/toolbar/toolbar.component.ts @@ -18,7 +18,7 @@ import { DocumentService } from '../../services/document/document.service'; import { PanelService } from '../../services/panel/panel.service'; import { MediaChange } from '@angular/flex-layout'; -import { MatLegacyMenuTrigger as MatMenuTrigger } from '@angular/material/legacy-menu'; +import { MatMenuTrigger } from '@angular/material/menu'; import { Session } from 'openvidu-browser'; import { ToolbarAdditionalButtonsDirective, diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/cn.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/cn.json index a385a28a59..509c2e641e 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/cn.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/cn.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "参与者", "CAMERA": "摄像头", - "SCREEN": "屏幕" + "SCREEN": "屏幕", + "YOU": "你" }, "SETTINGS": { "TITLE": "设置", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/de.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/de.json index 1745cfae3c..ba70ad8288 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/de.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/de.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "Teilnehmer", "CAMERA": "KAMERA", - "SCREEN": "BILDSCHIRM" + "SCREEN": "BILDSCHIRM", + "YOU": "Sie" }, "SETTINGS": { "TITLE": "Einstellungen", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/en.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/en.json index 94cc434dae..ef22008c8a 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/en.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/en.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "Participants", "CAMERA": "CAMERA", - "SCREEN": "SCREEN" + "SCREEN": "SCREEN", + "YOU": "You" }, "SETTINGS": { "TITLE": "Settings", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/es.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/es.json index 21bb8747c5..02580def38 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/es.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/es.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "Participantes", "CAMERA": "CÁMARA", - "SCREEN": "PANTALLA" + "SCREEN": "PANTALLA", + "YOU": "Tú" }, "SETTINGS": { "TITLE": "Configuración", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/fr.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/fr.json index 9d945f9faa..574eba0689 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/fr.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/fr.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "Participants", "CAMERA": "CAMÉRA", - "SCREEN": "ÉCRAN" + "SCREEN": "ÉCRAN", + "YOU": "vous" }, "SETTINGS": { "TITLE": "Paramètres", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/hi.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/hi.json index aec8269b0a..f45e2903f5 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/hi.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/hi.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "सदस्य", "CAMERA": "कैमरा", - "SCREEN": "स्क्रीन" + "SCREEN": "स्क्रीन", + "YOU": "आप" }, "SETTINGS": { "TITLE": "सेटिंग्स", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/it.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/it.json index 2f6e9e63a9..013cc055aa 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/it.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/it.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "Partecipanti", "CAMERA": "CAMERA", - "SCREEN": "SCREEN" + "SCREEN": "SCREEN", + "YOU": "Tu" }, "SETTINGS": { "TITLE": "Impostazioni", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/ja.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/ja.json index e51b09177b..ecd31f82ba 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/ja.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/ja.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "参加者", "CAMERA": "カメラ", - "SCREEN": "スクリーン" + "SCREEN": "スクリーン", + "YOU": "あなた" }, "SETTINGS": { "TITLE": "設定", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/nl.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/nl.json index a8712ab766..c66e1ca871 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/nl.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/nl.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "Deelnemers", "CAMERA": "CAMERA", - "SCREEN": "SCHERM" + "SCREEN": "SCHERM", + "YOU": "Jij" }, "SETTINGS": { "TITLE": "Instellingen", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/pt.json b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/pt.json index f5c35fb250..e7f81ea5f1 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/pt.json +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/lang/pt.json @@ -70,7 +70,8 @@ "PARTICIPANTS": { "TITLE": "Participantes", "CAMERA": "CÂMERA", - "SCREEN": "TELA" + "SCREEN": "TELA", + "YOU": "Você" }, "SETTINGS": { "TITLE": "Configurações", diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/models/notification-options.model.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/models/notification-options.model.ts index 19a182cf37..fc4fe99bd5 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/models/notification-options.model.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/models/notification-options.model.ts @@ -1,4 +1,4 @@ -import { MatLegacySnackBarConfig as MatSnackBarConfig } from '@angular/material/legacy-snack-bar'; +import { MatSnackBarConfig } from '@angular/material/snack-bar'; /** * @internal @@ -8,4 +8,4 @@ export interface INotificationOptions { buttonActionText?: string; cssClassName?: string; config?: MatSnackBarConfig; -} \ No newline at end of file +} diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.material.module.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.material.module.ts index f56fdcf1bc..506f406dc7 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.material.module.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/openvidu-angular.material.module.ts @@ -1,25 +1,25 @@ import { MatBadgeModule } from '@angular/material/badge'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; -import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card'; -import { MatLegacyOptionModule as MatOptionModule } from '@angular/material/legacy-core'; -import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog'; -import { MatLegacyFormFieldModule as MatFormFieldModule } from '@angular/material/legacy-form-field'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatOptionModule } from '@angular/material/core'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; import { MatGridListModule } from '@angular/material/grid-list'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input'; -import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner'; -import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; -import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select'; +import { MatInputModule } from '@angular/material/input'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; +import { MatSelectModule } from '@angular/material/select'; import { MatSidenavModule } from '@angular/material/sidenav'; -import { MatLegacySliderModule as MatSliderModule } from '@angular/material/legacy-slider'; +import { MatSliderModule } from '@angular/material/slider'; import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { FlexLayoutModule } from '@angular/flex-layout'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; -import { MatLegacyListModule as MatListModule } from '@angular/material/legacy-list'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatListModule } from '@angular/material/list'; import { MatDividerModule } from '@angular/material/divider'; import { MatExpansionModule } from '@angular/material/expansion'; -import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle'; +import {MatSlideToggleModule} from '@angular/material/slide-toggle'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NgModule } from '@angular/core'; diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.spec.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.spec.ts index ce62ea445c..77f34c2f03 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.spec.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.spec.ts @@ -1,6 +1,6 @@ import { TestBed } from '@angular/core/testing'; -import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog'; -import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { MatSnackBarModule } from '@angular/material/snack-bar'; import { ActionService } from './action.service'; diff --git a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.ts b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.ts index a32ae2d0be..d630edfdeb 100644 --- a/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.ts +++ b/openvidu-components-angular/projects/openvidu-angular/src/lib/services/action/action.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; -import { MatLegacyDialog as MatDialog, MatLegacyDialogConfig as MatDialogConfig, MatLegacyDialogRef as MatDialogRef } from '@angular/material/legacy-dialog'; -import { MatLegacySnackBar as MatSnackBar } from '@angular/material/legacy-snack-bar'; +import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { Subscription } from 'rxjs'; import { DeleteDialogComponent } from '../../components/dialogs/delete-recording.component'; import { DialogTemplateComponent } from '../../components/dialogs/dialog.component'; diff --git a/openvidu-components-angular/src/app/app.module.ts b/openvidu-components-angular/src/app/app.module.ts index f5bc917924..fde652c5a4 100644 --- a/openvidu-components-angular/src/app/app.module.ts +++ b/openvidu-components-angular/src/app/app.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; -import { MatLegacyCheckboxModule as MatCheckboxModule } from '@angular/material/legacy-checkbox'; +import { MatCheckboxModule } from '@angular/material/checkbox'; import { BrowserModule } from '@angular/platform-browser'; -import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button'; +import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; -import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu'; +import { MatMenuModule } from '@angular/material/menu'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { AppComponent } from './app.component'; import { AppRoutingModule } from './app.routing.module'; diff --git a/openvidu-components-angular/src/app/openvidu-call/call.component.html b/openvidu-components-angular/src/app/openvidu-call/call.component.html index f4266de202..e32f862f86 100644 --- a/openvidu-components-angular/src/app/openvidu-call/call.component.html +++ b/openvidu-components-angular/src/app/openvidu-call/call.component.html @@ -12,7 +12,7 @@ { name: 'Spanish', lang: 'es-ES' }, { name: 'English', lang: 'en-US' } ]" - [prejoin]="false" + [prejoin]="true" [participantName]="'Participant'" [videoMuted]="false" [audioMuted]="false" @@ -27,8 +27,8 @@ [toolbarParticipantsPanelButton]="true" [toolbarDisplayLogo]="true" [toolbarDisplaySessionName]="true" - [streamResolution]="'160x120'" - [streamFrameRate]="2" + [streamResolution]="'640x480'" + [streamFrameRate]="25" [streamDisplayParticipantName]="true" [streamDisplayAudioDetection]="true" [streamSettingsButton]="true" diff --git a/openvidu-components-angular/src/app/openvidu-webcomponent/openvidu-webcomponent.component.scss b/openvidu-components-angular/src/app/openvidu-webcomponent/openvidu-webcomponent.component.scss index 2f2e360c13..cc5fd13140 100644 --- a/openvidu-components-angular/src/app/openvidu-webcomponent/openvidu-webcomponent.component.scss +++ b/openvidu-components-angular/src/app/openvidu-webcomponent/openvidu-webcomponent.component.scss @@ -13,9 +13,9 @@ // If you specify typography styles for the components you use elsewhere, you should delete this line. // If you don't need the default component typographies but still want the hierarchy styles, // you can delete this line and instead use: -// `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());` -@include mat.all-legacy-component-typographies(); -@include mat.legacy-core(); +// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());` +@include mat.all-component-typographies(); +@include mat.core(); // Define the palettes for your theme using the Material Design palettes available in palette.scss // (imported above). For each palette, you can optionally specify a default, lighter, and darker @@ -41,7 +41,7 @@ $openvidu-components-theme: mat.define-light-theme( // Include theme styles for core and each component used in your app. // Alternatively, you can import and @include the theme mixins for each component // that you are using. -@include mat.all-legacy-component-themes($openvidu-components-theme); +@include mat.all-component-themes($openvidu-components-theme); @font-face { font-family: 'Material Icons'; diff --git a/openvidu-components-angular/src/styles.scss b/openvidu-components-angular/src/styles.scss index 8e12897591..965973bd50 100644 --- a/openvidu-components-angular/src/styles.scss +++ b/openvidu-components-angular/src/styles.scss @@ -16,14 +16,14 @@ // If you specify typography styles for the components you use elsewhere, you should delete this line. // If you don't need the default component typographies but still want the hierarchy styles, // you can delete this line and instead use: -// `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());` -@include mat.all-legacy-component-typographies(); -@include mat.legacy-core(); +// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());` +@include mat.all-component-typographies(); +@include mat.core(); // Define the palettes for your theme using the Material Design palettes available in palette.scss // (imported above). For each palette, you can optionally specify a default, lighter, and darker // hue. Available color palettes: https://material.io/design/color/ -$openvidu-components-primary: mat-palette($mat-blue-grey, 50, 300); +$openvidu-components-primary: mat-palette($mat-blue-grey, 500, 300); $openvidu-components-accent: mat-palette($mat-amber, 500, 700, A100); // The warn palette is optional (defaults to red). @@ -42,7 +42,7 @@ $openvidu-components-theme: mat.define-light-theme(( // Include theme styles for core and each component used in your app. // Alternatively, you can import and @include the theme mixins for each component // that you are using. -@include mat.all-legacy-component-themes($openvidu-components-theme); +@include mat.all-component-themes($openvidu-components-theme); // Custom openvidu-components styles