feat(native): New mobile release UI fixes (#12592)

This commit is contained in:
Calinteodor 2022-11-21 16:07:27 +02:00 committed by GitHub
parent 94ec2c720d
commit a795e0797a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 29 additions and 31 deletions

View File

@ -66,6 +66,9 @@ const Button: React.FC<IProps> = ({
} }
if (type === TERTIARY) { if (type === TERTIARY) {
buttonLabelStyles
= disabled ? styles.buttonLabelTertiaryDisabled : styles.buttonLabelTertiary;
return ( return (
<TouchableRipple <TouchableRipple
accessibilityLabel = { accessibilityLabel } accessibilityLabel = { accessibilityLabel }

View File

@ -23,15 +23,15 @@ export default {
...buttonLabel ...buttonLabel
}, },
buttonContent: {
height: BUTTON_HEIGHT
},
buttonLabelDisabled: { buttonLabelDisabled: {
...buttonLabel, ...buttonLabel,
color: BaseTheme.palette.text03 color: BaseTheme.palette.text03
}, },
buttonContent: {
height: BUTTON_HEIGHT
},
buttonDisabled: { buttonDisabled: {
...button, ...button,
backgroundColor: BaseTheme.palette.actionDisabled backgroundColor: BaseTheme.palette.actionDisabled
@ -54,6 +54,13 @@ export default {
buttonLabelTertiary: { buttonLabelTertiary: {
...buttonLabel, ...buttonLabel,
color: BaseTheme.palette.text01 color: BaseTheme.palette.text01,
textAlign: 'center'
},
buttonLabelTertiaryDisabled: {
...buttonLabel,
color: BaseTheme.palette.text03,
textAlign: 'center'
} }
}; };

View File

@ -79,7 +79,7 @@ class ChatInputBar extends Component<Props, State> {
] }> ] }>
<Input <Input
blurOnSubmit = { false } blurOnSubmit = { false }
customStyles = {{ input: styles.customInput }} customStyles = {{ container: styles.customInputContainer }}
multiline = { false } multiline = { false }
onBlur = { this._onFocused(false) } onBlur = { this._onFocused(false) }
onChange = { this._onChangeText } onChange = { this._onChangeText }

View File

@ -124,8 +124,8 @@ export default {
width: '100%' width: '100%'
}, },
customInput: { customInputContainer: {
width: 272 width: '75%'
}, },
messageBubble: { messageBubble: {

View File

@ -1,5 +1,3 @@
// @flow
import React, { Component } from 'react'; import React, { Component } from 'react';
import { TouchableOpacity, View } from 'react-native'; import { TouchableOpacity, View } from 'react-native';

View File

@ -100,7 +100,6 @@ class LonelyMeetingExperience extends PureComponent<Props> {
icon = { this._renderAddPeopleIcon } icon = { this._renderAddPeopleIcon }
labelKey = 'lonelyMeetingExperience.button' labelKey = 'lonelyMeetingExperience.button'
onClick = { this._onPress } onClick = { this._onPress }
style = { styles.lonelyButton }
type = { BUTTON_TYPES.PRIMARY } /> type = { BUTTON_TYPES.PRIMARY } />
) } ) }
</View> </View>

View File

@ -66,14 +66,13 @@ const TitleBar = (props: IProps): JSX.Element => {
<RecordingLabel mode = { JitsiRecordingConstants.mode.FILE } /> <RecordingLabel mode = { JitsiRecordingConstants.mode.FILE } />
<RecordingLabel mode = { JitsiRecordingConstants.mode.STREAM } /> <RecordingLabel mode = { JitsiRecordingConstants.mode.STREAM } />
</View> </View>
{ {
props._meetingNameEnabled props._meetingNameEnabled
&& <View style = { styles.roomNameView as StyleProp<ViewStyle> }> && <View style = { styles.roomNameView as StyleProp<ViewStyle> }>
<Text <Text
numberOfLines = { 1 } numberOfLines = { 1 }
style = { styles.roomName }> style = { styles.roomName }>
{props._meetingName} { props._meetingName }
</Text> </Text>
</View> </View>
} }

View File

@ -84,10 +84,6 @@ export default {
underlayColor: 'transparent' underlayColor: 'transparent'
}, },
lonelyButton: {
borderRadius: BaseTheme.spacing[4]
},
lonelyMeetingContainer: { lonelyMeetingContainer: {
alignSelf: 'stretch', alignSelf: 'stretch',
alignItems: 'center', alignItems: 'center',
@ -210,7 +206,9 @@ export default {
}, },
insecureRoomNameLabel: { insecureRoomNameLabel: {
backgroundColor: INSECURE_ROOM_NAME_LABEL_COLOR backgroundColor: INSECURE_ROOM_NAME_LABEL_COLOR,
borderRadius: BaseTheme.shape.borderRadius,
height: 32
}, },
raisedHandsCountLabel: { raisedHandsCountLabel: {

View File

@ -107,7 +107,7 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
}; };
const { PRIMARY, TERTIARY } = BUTTON_TYPES; const { PRIMARY, TERTIARY } = BUTTON_TYPES;
const joinButtonDisabled = isJoining || (!displayName && isDisplayNameMandatory); const joinButtonDisabled = !displayName && isDisplayNameMandatory;
useEffect(() => { useEffect(() => {
BackHandler.addEventListener('hardwareBackPress', goBack); BackHandler.addEventListener('hardwareBackPress', goBack);
@ -156,6 +156,7 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
{ roomName } { roomName }
</Text> </Text>
</View> </View>
{/* @ts-ignore */}
<LargeVideo /> <LargeVideo />
</View> </View>
} }
@ -171,6 +172,7 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
<View style = { styles.formWrapper as StyleProp<ViewStyle> }> <View style = { styles.formWrapper as StyleProp<ViewStyle> }>
<Input <Input
// @ts-ignore // @ts-ignore
autoFocus = { true }
customStyles = {{ input: styles.customInput }} customStyles = {{ input: styles.customInput }}
onChange = { onChangeDisplayName } onChange = { onChangeDisplayName }
placeholder = { t('dialog.enterDisplayName') } placeholder = { t('dialog.enterDisplayName') }
@ -179,14 +181,14 @@ const Prejoin: React.FC<IPrejoinProps> = ({ navigation }: IPrejoinProps) => {
accessibilityLabel = 'prejoin.joinMeeting' accessibilityLabel = 'prejoin.joinMeeting'
disabled = { joinButtonDisabled } disabled = { joinButtonDisabled }
labelKey = 'prejoin.joinMeeting' labelKey = 'prejoin.joinMeeting'
onClick = { onJoin } // @ts-ignore
onClick = { !isJoining && onJoin }
style = { styles.joinButton } style = { styles.joinButton }
type = { PRIMARY } /> type = { PRIMARY } />
<Button <Button
accessibilityLabel = 'prejoin.joinMeetingInLowBandwidthMode' accessibilityLabel = 'prejoin.joinMeetingInLowBandwidthMode'
disabled = { joinButtonDisabled } disabled = { joinButtonDisabled }
labelKey = 'prejoin.joinMeetingInLowBandwidthMode' labelKey = 'prejoin.joinMeetingInLowBandwidthMode'
labelStyle = { styles.joinLowBandwidthLabel }
onClick = { onJoinLowBandwidth } onClick = { onJoinLowBandwidth }
type = { TERTIARY } /> type = { TERTIARY } />
</View> </View>

View File

@ -3,13 +3,7 @@ import BaseTheme from '../../base/ui/components/BaseTheme.native';
export default { export default {
joinButton: { joinButton: {
marginTop: BaseTheme.spacing[3] marginVertical: BaseTheme.spacing[3]
},
joinLowBandwidthLabel: {
color: BaseTheme.palette.text01,
marginTop: BaseTheme.spacing[3],
textAlign: 'center'
}, },
buttonStylesBorderless: { buttonStylesBorderless: {

View File

@ -1,5 +1,3 @@
// @flow
import { ColorSchemeRegistry, schemeColor } from '../../../base/color-scheme'; import { ColorSchemeRegistry, schemeColor } from '../../../base/color-scheme';
import BaseTheme from '../../../base/ui/components/BaseTheme.native'; import BaseTheme from '../../../base/ui/components/BaseTheme.native';
@ -11,7 +9,7 @@ const BUTTON_SIZE = 48;
* The style of toolbar buttons. * The style of toolbar buttons.
*/ */
const toolbarButton = { const toolbarButton = {
borderRadius: 3, borderRadius: BaseTheme.shape.borderRadius,
borderWidth: 0, borderWidth: 0,
flex: 0, flex: 0,
flexDirection: 'row', flexDirection: 'row',