Browse Source

fix(rn,bottom-sheet) fixed surface color

Also fix properly showing the remote menu.
master
Calinteodor 3 years ago
parent
commit
4e43a31ec9
No account linked to committer's email address

+ 3
- 1
react/features/base/dialog/components/native/BottomSheet.js View File

142
                     <SafeAreaView
142
                     <SafeAreaView
143
                         style = { [
143
                         style = { [
144
                             styles.sheetItemContainer,
144
                             styles.sheetItemContainer,
145
-                            _styles.sheet,
145
+                            renderHeader
146
+                                ? _styles.sheetHeader
147
+                                : _styles.sheet,
146
                             style,
148
                             style,
147
                             {
149
                             {
148
                                 maxHeight: _height - 100
150
                                 maxHeight: _height - 100

+ 9
- 1
react/features/base/dialog/components/native/styles.js View File

2
 
2
 
3
 import { StyleSheet } from 'react-native';
3
 import { StyleSheet } from 'react-native';
4
 
4
 
5
+import BaseTheme from '../../../../base/ui/components/BaseTheme.native';
5
 import { ColorSchemeRegistry, schemeColor } from '../../../color-scheme';
6
 import { ColorSchemeRegistry, schemeColor } from '../../../color-scheme';
6
 import { BoxModel, ColorPalette } from '../../../styles';
7
 import { BoxModel, ColorPalette } from '../../../styles';
7
 import { PREFERRED_DIALOG_SIZE } from '../../constants';
8
 import { PREFERRED_DIALOG_SIZE } from '../../constants';
192
      * Bottom sheet's base style.
193
      * Bottom sheet's base style.
193
      */
194
      */
194
     sheet: {
195
     sheet: {
195
-        backgroundColor: ColorPalette.black,
196
+        backgroundColor: BaseTheme.palette.ui02,
196
         borderTopLeftRadius: 16,
197
         borderTopLeftRadius: 16,
197
         borderTopRightRadius: 16
198
         borderTopRightRadius: 16
199
+    },
200
+
201
+    /**
202
+     * Bottom sheet's base style with header.
203
+     */
204
+    sheetHeader: {
205
+        backgroundColor: BaseTheme.palette.ui02
198
     }
206
     }
199
 });
207
 });
200
 
208
 

+ 4
- 6
react/features/filmstrip/components/native/Thumbnail.js View File

159
                     participant
159
                     participant
160
                 }));
160
                 }));
161
             }
161
             }
162
-
163
-            return null;
162
+        } else {
163
+            dispatch(openDialog(RemoteVideoMenu, {
164
+                participant
165
+            }));
164
         }
166
         }
165
-
166
-        dispatch(openDialog(RemoteVideoMenu, {
167
-            participant
168
-        }));
169
     }, [ participant, dispatch ]);
167
     }, [ participant, dispatch ]);
170
 
168
 
171
     return (
169
     return (

Loading…
Cancel
Save