native ui fixes
This commit is contained in:
parent
e578f6c30f
commit
e8cdf38fda
|
@ -40,7 +40,7 @@ export default {
|
||||||
|
|
||||||
buttonLabelSecondary: {
|
buttonLabelSecondary: {
|
||||||
...buttonLabel,
|
...buttonLabel,
|
||||||
color: BaseTheme.palette.text0
|
color: BaseTheme.palette.text04
|
||||||
},
|
},
|
||||||
|
|
||||||
buttonLabelDestructive: {
|
buttonLabelDestructive: {
|
||||||
|
|
|
@ -26,16 +26,14 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
input: {
|
input: {
|
||||||
backgroundColor: BaseTheme.palette.ui03,
|
|
||||||
color: BaseTheme.palette.text01,
|
|
||||||
paddingVertical: 13,
|
|
||||||
paddingHorizontal: BaseTheme.spacing[3],
|
|
||||||
borderRadius: BaseTheme.shape.borderRadius,
|
|
||||||
...BaseTheme.typography.bodyShortRegularLarge,
|
...BaseTheme.typography.bodyShortRegularLarge,
|
||||||
lineHeight: 0,
|
backgroundColor: BaseTheme.palette.ui03,
|
||||||
height: 48,
|
borderColor: BaseTheme.palette.ui03,
|
||||||
|
borderRadius: BaseTheme.shape.borderRadius,
|
||||||
borderWidth: 2,
|
borderWidth: 2,
|
||||||
borderColor: BaseTheme.palette.ui03
|
color: BaseTheme.palette.text01,
|
||||||
|
paddingHorizontal: BaseTheme.spacing[3],
|
||||||
|
height: 48
|
||||||
},
|
},
|
||||||
|
|
||||||
inputDisabled: {
|
inputDisabled: {
|
||||||
|
|
|
@ -236,7 +236,8 @@ class MeetingParticipantList extends PureComponent<Props> {
|
||||||
}
|
}
|
||||||
<Input
|
<Input
|
||||||
clearable = { true }
|
clearable = { true }
|
||||||
customStyles = {{ container: styles.inputContainer,
|
customStyles = {{
|
||||||
|
container: styles.inputContainer,
|
||||||
input: styles.centerInput }}
|
input: styles.centerInput }}
|
||||||
onChange = { this._onSearchStringChange }
|
onChange = { this._onSearchStringChange }
|
||||||
placeholder = { t('participantsPane.search') }
|
placeholder = { t('participantsPane.search') }
|
||||||
|
|
|
@ -131,7 +131,7 @@ ColorSchemeRegistry.register('StartRecordingDialogContent', {
|
||||||
},
|
},
|
||||||
|
|
||||||
loggedIn: {
|
loggedIn: {
|
||||||
paddingBottom: _PADDING
|
paddingHorizontal: _PADDING
|
||||||
},
|
},
|
||||||
|
|
||||||
recordingIcon: {
|
recordingIcon: {
|
||||||
|
|
|
@ -1,15 +1,11 @@
|
||||||
// @flow
|
|
||||||
|
|
||||||
import Clipboard from '@react-native-community/clipboard';
|
import Clipboard from '@react-native-community/clipboard';
|
||||||
import React, { PureComponent } from 'react';
|
import React, { PureComponent } from 'react';
|
||||||
import {
|
import {
|
||||||
Text,
|
Text,
|
||||||
TextInput,
|
|
||||||
View
|
View
|
||||||
} from 'react-native';
|
} from 'react-native';
|
||||||
import type { Dispatch } from 'redux';
|
import type { Dispatch } from 'redux';
|
||||||
|
|
||||||
import { FIELD_UNDERLINE } from '../../../../base/dialog';
|
|
||||||
import { getFeatureFlag, MEETING_PASSWORD_ENABLED } from '../../../../base/flags';
|
import { getFeatureFlag, MEETING_PASSWORD_ENABLED } from '../../../../base/flags';
|
||||||
import { translate } from '../../../../base/i18n';
|
import { translate } from '../../../../base/i18n';
|
||||||
import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
|
import JitsiScreen from '../../../../base/modal/components/JitsiScreen';
|
||||||
|
@ -17,6 +13,7 @@ import { isLocalParticipantModerator } from '../../../../base/participants';
|
||||||
import { connect } from '../../../../base/redux';
|
import { connect } from '../../../../base/redux';
|
||||||
import BaseTheme from '../../../../base/ui/components/BaseTheme';
|
import BaseTheme from '../../../../base/ui/components/BaseTheme';
|
||||||
import Button from '../../../../base/ui/components/native/Button';
|
import Button from '../../../../base/ui/components/native/Button';
|
||||||
|
import Input from '../../../../base/ui/components/native/Input';
|
||||||
import { BUTTON_TYPES } from '../../../../base/ui/constants';
|
import { BUTTON_TYPES } from '../../../../base/ui/constants';
|
||||||
import { isInBreakoutRoom } from '../../../../breakout-rooms/functions';
|
import { isInBreakoutRoom } from '../../../../breakout-rooms/functions';
|
||||||
import { toggleLobbyMode } from '../../../../lobby/actions.any';
|
import { toggleLobbyMode } from '../../../../lobby/actions.any';
|
||||||
|
@ -353,14 +350,14 @@ class SecurityDialog extends PureComponent<Props, State> {
|
||||||
if (showElement) {
|
if (showElement) {
|
||||||
if (typeof _locked === 'undefined') {
|
if (typeof _locked === 'undefined') {
|
||||||
return (
|
return (
|
||||||
<TextInput
|
<Input
|
||||||
|
accessibilityLabel = { t('info.addPassword') }
|
||||||
autoFocus = { true }
|
autoFocus = { true }
|
||||||
onChangeText = { this._onChangeText }
|
clearable = { true }
|
||||||
placeholder = { t('lobby.passwordField') }
|
customStyles = {{ container: styles.passwordInput }}
|
||||||
|
onChange = { this._onChangeText }
|
||||||
|
placeholder = { t('dialog.password') }
|
||||||
placeholderTextColor = { BaseTheme.palette.text03 }
|
placeholderTextColor = { BaseTheme.palette.text03 }
|
||||||
selectionColor = { BaseTheme.palette.action01 }
|
|
||||||
style = { styles.passwordInput }
|
|
||||||
underlineColorAndroid = { FIELD_UNDERLINE }
|
|
||||||
value = { passwordInputValue }
|
value = { passwordInputValue }
|
||||||
{ ...textInputProps } />
|
{ ...textInputProps } />
|
||||||
);
|
);
|
||||||
|
|
|
@ -61,7 +61,7 @@ export default {
|
||||||
|
|
||||||
savedPasswordContainer: {
|
savedPasswordContainer: {
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
marginTop: 30,
|
marginTop: 14,
|
||||||
width: 208
|
width: 208
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -75,19 +75,13 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
passwordInput: {
|
passwordInput: {
|
||||||
borderColor: BaseTheme.palette.action03Active,
|
|
||||||
borderRadius: BaseTheme.spacing[1],
|
|
||||||
borderWidth: 2,
|
|
||||||
color: BaseTheme.palette.text01,
|
color: BaseTheme.palette.text01,
|
||||||
height: BaseTheme.spacing[6],
|
|
||||||
marginTop: BaseTheme.spacing[2],
|
|
||||||
paddingLeft: BaseTheme.spacing[1],
|
|
||||||
width: 208
|
width: 208
|
||||||
},
|
},
|
||||||
|
|
||||||
passwordSetupButtonLabel: {
|
passwordSetupButtonLabel: {
|
||||||
color: BaseTheme.palette.link01,
|
color: BaseTheme.palette.link01,
|
||||||
marginTop: BaseTheme.spacing[4]
|
marginTop: BaseTheme.spacing[3]
|
||||||
},
|
},
|
||||||
|
|
||||||
passwordSetRemotelyContainer: {
|
passwordSetRemotelyContainer: {
|
||||||
|
@ -98,11 +92,11 @@ export default {
|
||||||
|
|
||||||
passwordSetRemotelyText: {
|
passwordSetRemotelyText: {
|
||||||
color: BaseTheme.palette.text01,
|
color: BaseTheme.palette.text01,
|
||||||
marginTop: 22
|
marginTop: BaseTheme.spacing[3]
|
||||||
},
|
},
|
||||||
|
|
||||||
passwordSetRemotelyTextDisabled: {
|
passwordSetRemotelyTextDisabled: {
|
||||||
color: BaseTheme.palette.text02,
|
color: BaseTheme.palette.text02,
|
||||||
marginTop: 22
|
marginTop: BaseTheme.spacing[3]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue