From d3a26f9b4e01a4702acad5af8dc57866808ec209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Fri, 27 Mar 2020 13:48:33 +0100
Subject: [PATCH] rn,welcome-page: use random room name generator

---
 .../welcome/components/AbstractWelcomePage.js | 13 ------------
 .../welcome/components/WelcomePage.native.js  | 20 ++++++++-----------
 react/features/welcome/components/styles.js   | 16 +++++++--------
 3 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/react/features/welcome/components/AbstractWelcomePage.js b/react/features/welcome/components/AbstractWelcomePage.js
index 37eec745f..b482271c1 100644
--- a/react/features/welcome/components/AbstractWelcomePage.js
+++ b/react/features/welcome/components/AbstractWelcomePage.js
@@ -7,7 +7,6 @@ import type { Dispatch } from 'redux';
 import { createWelcomePageEvent, sendAnalytics } from '../../analytics';
 import { appNavigate } from '../../app';
 import { isCalendarEnabled } from '../../calendar-sync';
-import { isRoomValid } from '../../base/conference';
 
 /**
  * {@code AbstractWelcomePage}'s React {@code Component} prop types.
@@ -155,18 +154,6 @@ export class AbstractWelcomePage extends Component<Props, *> {
         clearTimeout(this.state.updateTimeoutId);
     }
 
-    /**
-     * Determines whether the 'Join' button is (to be) disabled i.e. There's no
-     * valid room name typed into the respective text input field.
-     *
-     * @protected
-     * @returns {boolean} If the 'Join' button is (to be) disabled, true;
-     * otherwise, false.
-     */
-    _isJoinDisabled() {
-        return this.state.joining || !isRoomValid(this.state.room);
-    }
-
     _onJoin: () => void;
 
     /**
diff --git a/react/features/welcome/components/WelcomePage.native.js b/react/features/welcome/components/WelcomePage.native.js
index f2c7ce1e1..9ed619a4c 100644
--- a/react/features/welcome/components/WelcomePage.native.js
+++ b/react/features/welcome/components/WelcomePage.native.js
@@ -75,6 +75,8 @@ class WelcomePage extends AbstractWelcomePage {
     componentDidMount() {
         super.componentDidMount();
 
+        this._updateRoomname();
+
         const { dispatch } = this.props;
 
         if (this.props._settings.startAudioOnly) {
@@ -227,19 +229,12 @@ class WelcomePage extends AbstractWelcomePage {
             );
         }
 
-
-        const buttonDisabled = this._isJoinDisabled();
-
         return (
             <TouchableHighlight
                 accessibilityLabel =
                     { t('welcomepage.accessibilityLabel.join') }
-                disabled = { buttonDisabled }
                 onPress = { this._onJoin }
-                style = { [
-                    styles.button,
-                    buttonDisabled ? styles.buttonDisabled : null
-                ] }
+                style = { styles.button }
                 underlayColor = { ColorPalette.white }>
                 { children }
             </TouchableHighlight>
@@ -268,6 +263,9 @@ class WelcomePage extends AbstractWelcomePage {
                     </Header>
                     <SafeAreaView style = { styles.roomContainer } >
                         <View style = { styles.joinControls } >
+                            <Text style = { styles.enterRoomText }>
+                                { t('welcomepage.roomname') }
+                            </Text>
                             <TextInput
                                 accessibilityLabel = { t(roomnameAccLabel) }
                                 autoCapitalize = 'none'
@@ -278,10 +276,8 @@ class WelcomePage extends AbstractWelcomePage {
                                 onChangeText = { this._onRoomChange }
                                 onFocus = { this._onFieldFocus }
                                 onSubmitEditing = { this._onJoin }
-                                placeholder = { t('welcomepage.roomname') }
-                                placeholderTextColor = {
-                                    PLACEHOLDER_TEXT_COLOR
-                                }
+                                placeholder = { this.state.roomPlaceholder }
+                                placeholderTextColor = { PLACEHOLDER_TEXT_COLOR }
                                 returnKeyType = { 'go' }
                                 style = { styles.textInput }
                                 underlineColorAndroid = 'transparent'
diff --git a/react/features/welcome/components/styles.js b/react/features/welcome/components/styles.js
index ff84ddd61..f1d5591aa 100644
--- a/react/features/welcome/components/styles.js
+++ b/react/features/welcome/components/styles.js
@@ -4,7 +4,7 @@ import { StyleSheet } from 'react-native';
 
 import { BoxModel, ColorPalette } from '../../base/styles';
 
-export const PLACEHOLDER_TEXT_COLOR = 'rgba(255, 255, 255, 0.3)';
+export const PLACEHOLDER_TEXT_COLOR = 'rgba(255, 255, 255, 0.5)';
 
 export const SIDEBAR_AVATAR_SIZE = 100;
 
@@ -64,14 +64,6 @@ export default {
         paddingHorizontal: 20
     },
 
-    /**
-     * Renders the button visually disabled.
-     */
-    buttonDisabled: {
-        backgroundColor: '#cccccc',
-        borderColor: '#999999'
-    },
-
     /**
      * Join button text style.
      */
@@ -91,6 +83,12 @@ export default {
         textAlign: 'center'
     },
 
+    enterRoomText: {
+        color: TEXT_COLOR,
+        fontSize: 18,
+        marginBottom: BoxModel.margin
+    },
+
     /**
      * The welcome screen header style.
      */