Sfoglia il codice sorgente

[RN] No VideoQualityLabel in Picture-in-Picture

master
Lyubo Marinov 7 anni fa
parent
commit
024671165a
1 ha cambiato i file con 31 aggiunte e 13 eliminazioni
  1. 31
    13
      react/features/large-video/components/Labels.native.js

+ 31
- 13
react/features/large-video/components/Labels.native.js Vedi File

@@ -9,11 +9,27 @@ import {
9 9
     isNarrowAspectRatio,
10 10
     makeAspectRatioAware
11 11
 } from '../../base/responsive-ui';
12
-import { isFilmstripVisible } from '../../filmstrip';
13 12
 
14
-import AbstractLabels, { type Props } from './AbstractLabels';
13
+import AbstractLabels, {
14
+    _abstractMapStateToProps,
15
+    type Props as AbstractLabelsProps
16
+} from './AbstractLabels';
15 17
 import styles from './styles';
16 18
 
19
+/**
20
+ * The type of the React {@code Component} props of {@link Labels}.
21
+ */
22
+type Props = AbstractLabelsProps & {
23
+
24
+    /**
25
+     * The indicator which determines whether the UI is reduced (to accommodate
26
+     * smaller display areas).
27
+     *
28
+     * @private
29
+     */
30
+    _reducedUI: boolean
31
+};
32
+
17 33
 /**
18 34
  * A container that renders the conference indicators, if any.
19 35
  */
@@ -25,7 +41,7 @@ class Labels extends AbstractLabels<Props, *> {
25 41
      */
26 42
     render() {
27 43
         const wide = !isNarrowAspectRatio(this);
28
-        const { _filmstripVisible } = this.props;
44
+        const { _filmstripVisible, _reducedUI } = this.props;
29 45
 
30 46
         return (
31 47
             <View
@@ -42,8 +58,14 @@ class Labels extends AbstractLabels<Props, *> {
42 58
                     this._renderRecordingLabel(
43 59
                         JitsiRecordingConstants.mode.STREAM)
44 60
                 }
45
-                {
46
-                    this._renderVideoQualityLabel()
61
+                {/*
62
+                  * Emil, Lyubomir, Nichole, and Zoli said that the Labels
63
+                  * should not be rendered in Picture-in-Picture. Saul argued
64
+                  * that the recording Labels should be rendered. As a temporary
65
+                  * compromise, don't render the VideoQualityLabel at least
66
+                  * because it's not that important.
67
+                  */
68
+                    _reducedUI || this._renderVideoQualityLabel()
47 69
                 }
48 70
             </View>
49 71
         );
@@ -61,18 +83,14 @@ class Labels extends AbstractLabels<Props, *> {
61 83
  * @param {Object} state - The redux state.
62 84
  * @private
63 85
  * @returns {{
64
- *     _filmstripVisible: boolean
86
+ *     _filmstripVisible: boolean,
87
+ *     _reducedUI: boolean
65 88
  * }}
66 89
  */
67 90
 function _mapStateToProps(state) {
68 91
     return {
69
-        /**
70
-         * The indicator which determines whether the filmstrip is visible.
71
-         *
72
-         * @private
73
-         * @type {boolean}
74
-         */
75
-        _filmstripVisible: isFilmstripVisible(state)
92
+        ..._abstractMapStateToProps(state),
93
+        _reducedUI: state['features/base/responsive-ui'].reducedUI
76 94
     };
77 95
 }
78 96
 

Loading…
Annulla
Salva