Просмотр исходного кода

[RN] Assorted hintbox fixes

* Align hint box text to center

* Fix disappearing hint box on android
j8
Zoltan Bettenbuk 7 лет назад
Родитель
Сommit
2412239206

+ 2
- 1
react/features/welcome/components/PagedList.android.js Просмотреть файл

@@ -51,7 +51,6 @@ export default class PagedList extends AbstractPagedList {
51 51
                 ] }>
52 52
                 <ViewPagerAndroid
53 53
                     initialPage = { DEFAULT_PAGE }
54
-                    keyboardDismissMode = 'on-drag'
55 54
                     onPageSelected = { this._onPageSelected }
56 55
                     peekEnabled = { true }
57 56
                     ref = { this._setPagerReference }
@@ -67,6 +66,7 @@ export default class PagedList extends AbstractPagedList {
67 66
                 </ViewPagerAndroid>
68 67
                 <View style = { styles.pageIndicatorContainer }>
69 68
                     <TouchableOpacity
69
+                        disabled = { disabled }
70 70
                         onPress = { this._onSelectPage(0) }
71 71
                         style = { styles.pageIndicator } >
72 72
                         <View style = { styles.pageIndicator }>
@@ -86,6 +86,7 @@ export default class PagedList extends AbstractPagedList {
86 86
                         </View>
87 87
                     </TouchableOpacity>
88 88
                     <TouchableOpacity
89
+                        disabled = { disabled }
89 90
                         onPress = { this._onSelectPage(1) }
90 91
                         style = { styles.pageIndicator } >
91 92
                         <View style = { styles.pageIndicator }>

+ 2
- 1
react/features/welcome/components/WelcomePage.native.js Просмотреть файл

@@ -48,6 +48,7 @@ class WelcomePage extends AbstractWelcomePage {
48 48
     constructor(props) {
49 49
         super(props);
50 50
 
51
+        this.state._fieldFocused = false;
51 52
         this.state.hintBoxAnimation = new Animated.Value(0);
52 53
 
53 54
         // Bind event handlers so they are only bound once per instance.
@@ -230,7 +231,7 @@ class WelcomePage extends AbstractWelcomePage {
230 231
             return (
231 232
                 <Animated.View style = { this._getHintBoxStyle() }>
232 233
                     <View style = { styles.hintTextContainer } >
233
-                        <Text>
234
+                        <Text style = { styles.hintText }>
234 235
                             { t('welcomepage.roomnameHint') }
235 236
                         </Text>
236 237
                     </View>

+ 7
- 0
react/features/welcome/components/styles.js Просмотреть файл

@@ -114,6 +114,13 @@ export default createStyleSheet({
114 114
         paddingVertical: 2 * BoxModel.padding
115 115
     },
116 116
 
117
+    /**
118
+     * The text of the hint box.
119
+     */
120
+    hintText: {
121
+        textAlign: 'center'
122
+    },
123
+
117 124
     /**
118 125
      * Container for the text on the hint box.
119 126
      */

Загрузка…
Отмена
Сохранить