OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

IncomingCallBox2 -> IncomingCallBox

pull/21833/head
Travis Ralston 2020-07-17 15:56:58 -06:00
parent 76902a752f
commit c5d732a631
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/css/views/voip/_CallContainer.scss
View File

@ -36,12 +36,12 @@ limitations under the License.
} }
} }
.mx_IncomingCallBox2 { .mx_IncomingCallBox {
min-width: 250px; min-width: 250px;
background-color: $primary-bg-color; background-color: $primary-bg-color;
padding: 8px; padding: 8px;
.mx_IncomingCallBox2_CallerInfo { .mx_IncomingCallBox_CallerInfo {
display: flex; display: flex;
direction: row; direction: row;
@ -68,12 +68,12 @@ limitations under the License.
} }
} }
.mx_IncomingCallBox2_buttons { .mx_IncomingCallBox_buttons {
padding: 8px; padding: 8px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
> .mx_IncomingCallBox2_spacer { > .mx_IncomingCallBox_spacer {
width: 8px; width: 8px;
} }

4
src/components/views/voip/CallContainer.tsx
View File

@ -15,7 +15,7 @@ limitations under the License.
*/ */
import React from 'react'; import React from 'react';
import IncomingCallBox2 from './IncomingCallBox2'; import IncomingCallBox from './IncomingCallBox';
import CallPreview from './CallPreview'; import CallPreview from './CallPreview';
import * as VectorConferenceHandler from '../../../VectorConferenceHandler'; import * as VectorConferenceHandler from '../../../VectorConferenceHandler';
@ -30,7 +30,7 @@ interface IState {
export default class CallContainer extends React.PureComponent<IProps, IState> { export default class CallContainer extends React.PureComponent<IProps, IState> {
public render() { public render() {
return <div className="mx_CallContainer"> return <div className="mx_CallContainer">
<IncomingCallBox2 /> <IncomingCallBox />
<CallPreview ConferenceHandler={VectorConferenceHandler} /> <CallPreview ConferenceHandler={VectorConferenceHandler} />
</div>; </div>;
} }

16
src/components/views/voip/IncomingCallBox2.tsx → src/components/views/voip/IncomingCallBox.tsx
View File

@ -16,8 +16,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14231
import React from 'react'; import React from 'react';
import {MatrixClientPeg} from '../../../MatrixClientPeg'; import {MatrixClientPeg} from '../../../MatrixClientPeg';
import dis from '../../../dispatcher/dispatcher'; import dis from '../../../dispatcher/dispatcher';
@ -35,7 +33,7 @@ interface IState {
incomingCall: any; incomingCall: any;
} }
export default class IncomingCallBox2 extends React.Component<IProps, IState> { export default class IncomingCallBox extends React.Component<IProps, IState> {
private dispatcherRef: string; private dispatcherRef: string;
constructor(props: IProps) { constructor(props: IProps) {
@ -106,8 +104,8 @@ export default class IncomingCallBox2 extends React.Component<IProps, IState> {
} }
} }
return <div className="mx_IncomingCallBox2"> return <div className="mx_IncomingCallBox">
<div className="mx_IncomingCallBox2_CallerInfo"> <div className="mx_IncomingCallBox_CallerInfo">
<PulsedAvatar> <PulsedAvatar>
<RoomAvatar <RoomAvatar
room={room} room={room}
@ -120,16 +118,16 @@ export default class IncomingCallBox2 extends React.Component<IProps, IState> {
<p>{incomingCallText}</p> <p>{incomingCallText}</p>
</div> </div>
</div> </div>
<div className="mx_IncomingCallBox2_buttons"> <div className="mx_IncomingCallBox_buttons">
<FormButton <FormButton
className={"mx_IncomingCallBox2_decline"} className={"mx_IncomingCallBox_decline"}
onClick={this.onRejectClick} onClick={this.onRejectClick}
kind="danger" kind="danger"
label={_t("Decline")} label={_t("Decline")}
/> />
<div className="mx_IncomingCallBox2_spacer" /> <div className="mx_IncomingCallBox_spacer" />
<FormButton <FormButton
className={"mx_IncomingCallBox2_accept"} className={"mx_IncomingCallBox_accept"}
onClick={this.onAnswerClick} onClick={this.onAnswerClick}
kind="primary" kind="primary"
label={_t("Accept")} label={_t("Accept")}