Parcourir la source

[RN] Consistent margins for Filmstrip and Toolbox

With the introduction of wide and narrow layouts the margins of the
Filmstrip and the Toolbox became inconsistent. For example, the
Filmstrip's top in the wide layout was nearer to the top than the
secondary Toolbar.
master
Lyubo Marinov il y a 8 ans
Parent
révision
2b8a770163

+ 12
- 6
react/features/conference/components/styles.js Voir le fichier

@@ -1,4 +1,5 @@
1 1
 import {
2
+    BoxModel,
2 3
     ColorPalette,
3 4
     createStyleSheet,
4 5
     fixAndroidViewClipping
@@ -41,16 +42,21 @@ export default createStyleSheet({
41 42
     },
42 43
 
43 44
     /**
44
-     * The style of the view which expands over the whole conference area and
45
-     * splits it between both the filmstrip and the toolbox.
45
+     * The style of the {@link View} which expands over the whole
46
+     * {@link Conference} area and splits it between the {@link Filmstrip} and
47
+     * the {@link Toolbox}.
46 48
      */
47 49
     toolboxAndFilmstripContainer: {
48
-        bottom: 0,
50
+        bottom: BoxModel.margin,
49 51
         flexDirection: 'column',
50 52
         justifyContent: 'flex-end',
51
-        left: 0,
53
+        left: BoxModel.margin,
52 54
         position: 'absolute',
53
-        right: 0,
54
-        top: 0
55
+        right: BoxModel.margin,
56
+
57
+        // Both on Android and iOS there is the status bar which may be visible.
58
+        // On iPhone X there is the notch. In the two cases BoxModel.margin is
59
+        // not enough.
60
+        top: BoxModel.margin * 3
55 61
     }
56 62
 });

+ 5
- 8
react/features/filmstrip/components/styles.js Voir le fichier

@@ -1,5 +1,5 @@
1 1
 import { Platform } from '../../base/react';
2
-import { BoxModel, ColorPalette } from '../../base/styles';
2
+import { ColorPalette } from '../../base/styles';
3 3
 
4 4
 /**
5 5
  * The base style of {@link Filmstrip} shared between narrow and wide versions.
@@ -54,10 +54,7 @@ export default {
54 54
     filmstripNarrow: {
55 55
         ...filmstrip,
56 56
         alignItems: 'flex-end',
57
-        height: 90,
58
-        marginBottom: BoxModel.margin,
59
-        marginLeft: BoxModel.margin,
60
-        marginRight: BoxModel.margin
57
+        height: 90
61 58
     },
62 59
 
63 60
     /**
@@ -66,10 +63,10 @@ export default {
66 63
      */
67 64
     filmstripWide: {
68 65
         ...filmstrip,
69
-        bottom: BoxModel.margin,
70
-        left: BoxModel.margin,
66
+        bottom: 0,
67
+        left: 0,
71 68
         position: 'absolute',
72
-        top: BoxModel.margin
69
+        top: 0
73 70
     },
74 71
 
75 72
     /**

+ 2
- 2
react/features/toolbox/components/styles.js Voir le fichier

@@ -111,8 +111,8 @@ export default createStyleSheet({
111 111
         ..._toolbar,
112 112
         bottom: 0,
113 113
         flexDirection: 'column',
114
-        right: BoxModel.margin,
115
-        top: BoxModel.margin * 2
114
+        right: 0,
115
+        top: 0
116 116
     },
117 117
 
118 118
     /**

Chargement…
Annuler
Enregistrer