diff --git a/Project/src/App.css b/Project/src/App.css index 2dcbd3f4..d13e61b4 100644 --- a/Project/src/App.css +++ b/Project/src/App.css @@ -49,8 +49,8 @@ body { sans-serif !important; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - background-color: #161514; - color: #edebe9 !important; + background-color: #0D1114; + color: #c5c5c5 !important; font-weight: 500; } @@ -75,6 +75,7 @@ h3, h4, h5, h6 { + color: #ffffff; margin-top: 0; margin-bottom: .5rem; font-weight: unset; @@ -259,17 +260,18 @@ ul { } .ms-TextField-fieldGroup { - height:23px; - border-bottom: 1px solid #605e5c !important; border: 0px; box-sizing: unset; + background-color: #0D1114; } .ms-TextField-field { - font-size: 14px; - background-color: #161514; + border: 1px solid #3b3b3b !important; + background-color: #0D1114; color: #edebe9; - height: 23px; + border-radius: 20px; + height: 35px; + padding-left: 1em; } .ms-TextField-field::placeholder { @@ -277,12 +279,12 @@ ul { } .ms-TextField-field:hover { - background-color: #161514; + background-color: #0D1114; color: #edebe9; } .ms-TextField-wrapper>label { - color: #edebe9; + color: #c5c5c5; font-weight: 400; font-size: 12px; } @@ -313,9 +315,9 @@ div.ms-Checkbox>input[type="checkbox"]+label.ms-Checkbox-label>span.ms-Checkbox- .primary-button { font-size: 14px; height: 40px; - color: #edebe9; - background-color: #201f1e; - border: 1px solid #adadad; + color: #000000; + background-color: #e1e1e1; + border: 1px solid #e1e1e1; outline: none; margin-right: 1em; margin-bottom: 1em; @@ -340,9 +342,9 @@ div.ms-Checkbox>input[type="checkbox"]+label.ms-Checkbox-label>span.ms-Checkbox- .secondary-button { font-size: 14px; height: 40px; - color: #edebe9; - background-color: #201f1e; - border: 1px solid #adadad; + color: #000000; + background-color: #e1e1e1; + border: 1px solid #e1e1e1; outline: none; margin-right: 1em; margin-bottom: 1em; diff --git a/Project/src/MakeCall/CallCard.js b/Project/src/MakeCall/CallCard.js index 2d699213..f302064f 100644 --- a/Project/src/MakeCall/CallCard.js +++ b/Project/src/MakeCall/CallCard.js @@ -41,6 +41,8 @@ export default class CallCard extends React.Component { this.capabilitiesFeature = this.call.feature(Features.Capabilities); this.capabilities = this.capabilitiesFeature.capabilities; this.dominantSpeakersFeature = this.call.feature(Features.DominantSpeakers); + this.recordingFeature = this.call.feature(Features.Recording); + this.transcriptionFeature = this.call.feature(Features.Transcription); if (Features.Reaction) { this.meetingReaction = this.call.feature(Features.Reaction); } @@ -95,7 +97,9 @@ export default class CallCard extends React.Component { showDataChannel: false, showAddParticipantPanel: false, reactionRows:[], - pptLiveActive: false + pptLiveActive: false, + isRecordingActive: false, + isTranscriptionActive: false }; this.selectedRemoteParticipants = new Set(); this.dataChannelRef = React.createRef(); @@ -122,6 +126,8 @@ export default class CallCard extends React.Component { this.call.feature(Features.Spotlight).off('spotlightChanged', this.spotlightStateChangedHandler); this.call.feature(Features.RaiseHand).off('raisedHandEvent', this.raiseHandChangedHandler); this.call.feature(Features.RaiseHand).off('loweredHandEvent', this.raiseHandChangedHandler); + this.recordingFeature.off('isRecordingActiveChanged', this.isRecordingActiveChangedHandler); + this.transcriptionFeature.off('isTranscriptionActiveChanged', this.isTranscriptionActiveChangedHandler); if (Features.Reaction) { this.call.feature(Features.Reaction).off('reaction', this.reactionChangeHandler); } @@ -442,6 +448,8 @@ export default class CallCard extends React.Component { this.dominantSpeakersFeature.on('dominantSeapkersChanged', this.dominantSpeakersChanged); this.meetingReaction?.on('reaction', this.reactionChangeHandler); this.pptLiveFeature?.on('isActiveChanged', this.pptLiveChangedHandler); + this.recordingFeature.on('isRecordingActiveChanged', this.isRecordingActiveChangedHandler); + this.transcriptionFeature.on('isTranscriptionActiveChanged', this.isTranscriptionActiveChangedHandler); } } @@ -503,6 +511,14 @@ export default class CallCard extends React.Component { this.identifier, this.spotlightFeature.getSpotlightedParticipants())}) } + isRecordingActiveChangedHandler = (event) => { + this.setState({ isRecordingActive: this.recordingFeature.isRecordingActive }) + } + + isTranscriptionActiveChangedHandler = (event) => { + this.setState({ isTranscriptionActive: this.transcriptionFeature.isTranscriptionActive }) + } + raiseHandChangedHandler = (event) => { this.setState({isHandRaised: utils.isParticipantHandRaised(this.identifier, this.raiseHandFeature.getRaisedHands())}) } @@ -1101,7 +1117,7 @@ export default class CallCard extends React.Component { } -