ソースを参照

fix(rn,lobby) match button style

master
Saúl Ibarra Corretgé 3年前
コミット
d78e8fba25

+ 27
- 42
react/features/lobby/components/native/LobbyScreen.js ファイルの表示

42
      * @inheritdoc
42
      * @inheritdoc
43
      */
43
      */
44
     render() {
44
     render() {
45
+        const { _aspectRatio } = this.props;
46
+        let contentStyles;
47
+        let largeVideoContainerStyles;
48
+        let contentContainerStyles;
49
+
50
+        if (_aspectRatio === ASPECT_RATIO_NARROW) {
51
+            largeVideoContainerStyles = styles.largeVideoContainer;
52
+            contentContainerStyles = styles.contentContainer;
53
+        } else {
54
+            contentStyles = styles.contentWide;
55
+            largeVideoContainerStyles = styles.largeVideoContainerWide;
56
+            contentContainerStyles = styles.contentContainerWide;
57
+        }
58
+
45
         return (
59
         return (
46
-            <>
47
-                { this._renderLobby() }
48
-            </>
60
+            <JitsiScreen
61
+                safeAreaInsets = { [ 'right' ] }
62
+                style = { styles.contentWrapper }>
63
+                <View style = { contentStyles }>
64
+                    <View style = { largeVideoContainerStyles }>
65
+                        <LargeVideo />
66
+                    </View>
67
+                    <View style = { contentContainerStyles }>
68
+                        { this._renderContent() }
69
+                        { this._renderToolbarButtons() }
70
+                    </View>
71
+                </View>
72
+            </JitsiScreen>
49
         );
73
         );
50
     }
74
     }
51
 
75
 
73
 
97
 
74
     _renderToolbarButtons: () => React$Element<*>;
98
     _renderToolbarButtons: () => React$Element<*>;
75
 
99
 
76
-    _renderLobby: () => React$Element<*>;
77
-
78
     _onNavigateToLobbyChat: () => void;
100
     _onNavigateToLobbyChat: () => void;
79
 
101
 
80
     /**
102
     /**
87
         navigate(screen.lobby.chat);
109
         navigate(screen.lobby.chat);
88
     }
110
     }
89
 
111
 
90
-    /**
91
-     * Renders the lobby.
92
-     *
93
-     * @inheritdoc
94
-     */
95
-    _renderLobby() {
96
-        const { _aspectRatio } = this.props;
97
-        let contentStyles;
98
-        let largeVideoContainerStyles;
99
-        let contentContainerStyles;
100
-
101
-        if (_aspectRatio === ASPECT_RATIO_NARROW) {
102
-            largeVideoContainerStyles = styles.largeVideoContainer;
103
-            contentContainerStyles = styles.contentContainer;
104
-        } else {
105
-            contentStyles = styles.contentWide;
106
-            largeVideoContainerStyles = styles.largeVideoContainerWide;
107
-            contentContainerStyles = styles.contentContainerWide;
108
-        }
109
-
110
-        return (
111
-            <JitsiScreen
112
-                safeAreaInsets = { [ 'right' ] }
113
-                style = { styles.contentWrapper }>
114
-                <View style = { contentStyles }>
115
-                    <View style = { largeVideoContainerStyles }>
116
-                        <LargeVideo />
117
-                    </View>
118
-                    <View style = { contentContainerStyles }>
119
-                        { this._renderContent() }
120
-                        { this._renderToolbarButtons() }
121
-                    </View>
122
-                </View>
123
-            </JitsiScreen>
124
-        );
125
-    }
126
-
127
     /**
112
     /**
128
      * Renders the joining (waiting) fragment of the screen.
113
      * Renders the joining (waiting) fragment of the screen.
129
      *
114
      *

+ 11
- 4
react/features/lobby/components/native/styles.js ファイルの表示

7
 export default {
7
 export default {
8
     button: {
8
     button: {
9
         alignItems: 'center',
9
         alignItems: 'center',
10
-        borderRadius: 4,
10
+        borderRadius: BaseTheme.shape.borderRadius,
11
         padding: BaseTheme.spacing[2],
11
         padding: BaseTheme.spacing[2],
12
+        height: BaseTheme.spacing[7],
12
         width: '100%'
13
         width: '100%'
13
     },
14
     },
14
 
15
 
70
         alignItems: 'center',
71
         alignItems: 'center',
71
         display: 'flex',
72
         display: 'flex',
72
         justifyContent: 'center',
73
         justifyContent: 'center',
73
-        minHeight: '50%'
74
+        minHeight: '45%'
74
     },
75
     },
75
 
76
 
76
     largeVideoContainerWide: {
77
     largeVideoContainerWide: {
132
         borderColor: SECONDARY_COLOR,
133
         borderColor: SECONDARY_COLOR,
133
         borderRadius: BaseTheme.shape.borderRadius,
134
         borderRadius: BaseTheme.shape.borderRadius,
134
         borderWidth: 2,
135
         borderWidth: 2,
136
+        height: BaseTheme.spacing[7],
135
         marginHorizontal: BaseTheme.spacing[3],
137
         marginHorizontal: BaseTheme.spacing[3],
136
         padding: BaseTheme.spacing[2]
138
         padding: BaseTheme.spacing[2]
137
     },
139
     },
143
     },
145
     },
144
 
146
 
145
     fieldLabel: {
147
     fieldLabel: {
148
+        ...BaseTheme.typography.heading6,
146
         color: BaseTheme.palette.text01,
149
         color: BaseTheme.palette.text01,
147
         marginVertical: BaseTheme.spacing[4],
150
         marginVertical: BaseTheme.spacing[4],
148
         textAlign: 'center'
151
         textAlign: 'center'
200
     },
203
     },
201
 
204
 
202
     primaryButtonText: {
205
     primaryButtonText: {
203
-        color: BaseTheme.palette.text01
206
+        ...BaseTheme.typography.labelButtonLarge,
207
+        color: BaseTheme.palette.text01,
208
+        lineHeight: 30
204
     },
209
     },
205
 
210
 
206
     primaryText: {
211
     primaryText: {
216
     },
221
     },
217
 
222
 
218
     cancelButtonText: {
223
     cancelButtonText: {
219
-        color: BaseTheme.palette.text01
224
+        ...BaseTheme.typography.labelButtonLarge,
225
+        color: BaseTheme.palette.text01,
226
+        lineHeight: 30
220
     },
227
     },
221
 
228
 
222
     // KnockingParticipantList
229
     // KnockingParticipantList

読み込み中…
キャンセル
保存