|
@@ -75,6 +75,8 @@ class WelcomePage extends AbstractWelcomePage {
|
75
|
75
|
componentDidMount() {
|
76
|
76
|
super.componentDidMount();
|
77
|
77
|
|
|
78
|
+ this._updateRoomname();
|
|
79
|
+
|
78
|
80
|
const { dispatch } = this.props;
|
79
|
81
|
|
80
|
82
|
if (this.props._settings.startAudioOnly) {
|
|
@@ -227,19 +229,12 @@ class WelcomePage extends AbstractWelcomePage {
|
227
|
229
|
);
|
228
|
230
|
}
|
229
|
231
|
|
230
|
|
-
|
231
|
|
- const buttonDisabled = this._isJoinDisabled();
|
232
|
|
-
|
233
|
232
|
return (
|
234
|
233
|
<TouchableHighlight
|
235
|
234
|
accessibilityLabel =
|
236
|
235
|
{ t('welcomepage.accessibilityLabel.join') }
|
237
|
|
- disabled = { buttonDisabled }
|
238
|
236
|
onPress = { this._onJoin }
|
239
|
|
- style = { [
|
240
|
|
- styles.button,
|
241
|
|
- buttonDisabled ? styles.buttonDisabled : null
|
242
|
|
- ] }
|
|
237
|
+ style = { styles.button }
|
243
|
238
|
underlayColor = { ColorPalette.white }>
|
244
|
239
|
{ children }
|
245
|
240
|
</TouchableHighlight>
|
|
@@ -268,6 +263,9 @@ class WelcomePage extends AbstractWelcomePage {
|
268
|
263
|
</Header>
|
269
|
264
|
<SafeAreaView style = { styles.roomContainer } >
|
270
|
265
|
<View style = { styles.joinControls } >
|
|
266
|
+ <Text style = { styles.enterRoomText }>
|
|
267
|
+ { t('welcomepage.roomname') }
|
|
268
|
+ </Text>
|
271
|
269
|
<TextInput
|
272
|
270
|
accessibilityLabel = { t(roomnameAccLabel) }
|
273
|
271
|
autoCapitalize = 'none'
|
|
@@ -278,10 +276,8 @@ class WelcomePage extends AbstractWelcomePage {
|
278
|
276
|
onChangeText = { this._onRoomChange }
|
279
|
277
|
onFocus = { this._onFieldFocus }
|
280
|
278
|
onSubmitEditing = { this._onJoin }
|
281
|
|
- placeholder = { t('welcomepage.roomname') }
|
282
|
|
- placeholderTextColor = {
|
283
|
|
- PLACEHOLDER_TEXT_COLOR
|
284
|
|
- }
|
|
279
|
+ placeholder = { this.state.roomPlaceholder }
|
|
280
|
+ placeholderTextColor = { PLACEHOLDER_TEXT_COLOR }
|
285
|
281
|
returnKeyType = { 'go' }
|
286
|
282
|
style = { styles.textInput }
|
287
|
283
|
underlineColorAndroid = 'transparent'
|