From d78e8fba25feb8ee6adaf61f338fb23931716a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Mon, 2 May 2022 12:29:42 +0200 Subject: [PATCH] fix(rn,lobby) match button style --- .../lobby/components/native/LobbyScreen.js | 87 ++++++++----------- .../lobby/components/native/styles.js | 15 +++- 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/react/features/lobby/components/native/LobbyScreen.js b/react/features/lobby/components/native/LobbyScreen.js index db1db4e31..69f6be5b2 100644 --- a/react/features/lobby/components/native/LobbyScreen.js +++ b/react/features/lobby/components/native/LobbyScreen.js @@ -42,57 +42,6 @@ class LobbyScreen extends AbstractLobbyScreen { * @inheritdoc */ render() { - return ( - <> - { this._renderLobby() } - - ); - } - - _getScreenTitleKey: () => string; - - _onAskToJoin: () => void; - - _onCancel: () => boolean; - - _onChangeDisplayName: Object => void; - - _onChangeEmail: Object => void; - - _onChangePassword: Object => void; - - _onEnableEdit: () => void; - - _onJoinWithPassword: () => void; - - _onSwitchToKnockMode: () => void; - - _onSwitchToPasswordMode: () => void; - - _renderContent: () => React$Element<*>; - - _renderToolbarButtons: () => React$Element<*>; - - _renderLobby: () => React$Element<*>; - - _onNavigateToLobbyChat: () => void; - - /** - * Navigates to the lobby chat screen. - * - * @private - * @returns {void} - */ - _onNavigateToLobbyChat() { - navigate(screen.lobby.chat); - } - - /** - * Renders the lobby. - * - * @inheritdoc - */ - _renderLobby() { const { _aspectRatio } = this.props; let contentStyles; let largeVideoContainerStyles; @@ -124,6 +73,42 @@ class LobbyScreen extends AbstractLobbyScreen { ); } + _getScreenTitleKey: () => string; + + _onAskToJoin: () => void; + + _onCancel: () => boolean; + + _onChangeDisplayName: Object => void; + + _onChangeEmail: Object => void; + + _onChangePassword: Object => void; + + _onEnableEdit: () => void; + + _onJoinWithPassword: () => void; + + _onSwitchToKnockMode: () => void; + + _onSwitchToPasswordMode: () => void; + + _renderContent: () => React$Element<*>; + + _renderToolbarButtons: () => React$Element<*>; + + _onNavigateToLobbyChat: () => void; + + /** + * Navigates to the lobby chat screen. + * + * @private + * @returns {void} + */ + _onNavigateToLobbyChat() { + navigate(screen.lobby.chat); + } + /** * Renders the joining (waiting) fragment of the screen. * diff --git a/react/features/lobby/components/native/styles.js b/react/features/lobby/components/native/styles.js index c1055a679..f2f2f8c8e 100644 --- a/react/features/lobby/components/native/styles.js +++ b/react/features/lobby/components/native/styles.js @@ -7,8 +7,9 @@ const SECONDARY_COLOR = BaseTheme.palette.border04; export default { button: { alignItems: 'center', - borderRadius: 4, + borderRadius: BaseTheme.shape.borderRadius, padding: BaseTheme.spacing[2], + height: BaseTheme.spacing[7], width: '100%' }, @@ -70,7 +71,7 @@ export default { alignItems: 'center', display: 'flex', justifyContent: 'center', - minHeight: '50%' + minHeight: '45%' }, largeVideoContainerWide: { @@ -132,6 +133,7 @@ export default { borderColor: SECONDARY_COLOR, borderRadius: BaseTheme.shape.borderRadius, borderWidth: 2, + height: BaseTheme.spacing[7], marginHorizontal: BaseTheme.spacing[3], padding: BaseTheme.spacing[2] }, @@ -143,6 +145,7 @@ export default { }, fieldLabel: { + ...BaseTheme.typography.heading6, color: BaseTheme.palette.text01, marginVertical: BaseTheme.spacing[4], textAlign: 'center' @@ -200,7 +203,9 @@ export default { }, primaryButtonText: { - color: BaseTheme.palette.text01 + ...BaseTheme.typography.labelButtonLarge, + color: BaseTheme.palette.text01, + lineHeight: 30 }, primaryText: { @@ -216,7 +221,9 @@ export default { }, cancelButtonText: { - color: BaseTheme.palette.text01 + ...BaseTheme.typography.labelButtonLarge, + color: BaseTheme.palette.text01, + lineHeight: 30 }, // KnockingParticipantList