Bladeren bron

fix(android) remove no longer needed view clipping hack

This should no longer be necessary since we added it for Android 6
devices a long time ago but we no longer support those.

Fixes: https://github.com/jitsi/jitsi-meet/issues/13514
factor2
Saúl Ibarra Corretgé 1 jaar geleden
bovenliggende
commit
cdc4154cdf

+ 0
- 26
react/features/base/styles/functions.any.ts Bestand weergeven

1
-import Platform from '../react/Platform';
2
-
3
-import { ColorPalette } from './components/styles/ColorPalette';
4
-
5
 declare type StyleSheet = {
1
 declare type StyleSheet = {
6
     [key: string]: string | number | { [key: string]: string | number; };
2
     [key: string]: string | number | { [key: string]: string | number; };
7
 };
3
 };
121
     return combinedStyles;
117
     return combinedStyles;
122
 }
118
 }
123
 
119
 
124
-/**
125
- * Works around a bug in react-native or react-native-webrtc on Android which
126
- * causes Views overlaying RTCView to be clipped. Even though we (may) display
127
- * multiple RTCViews, it is enough to apply the fix only to a View with a
128
- * bounding rectangle containing all RTCviews and their overlaying Views.
129
- *
130
- * @param {StyleSheet} styles - An object which represents a stylesheet.
131
- * @public
132
- * @returns {StyleSheet}
133
- */
134
-export function fixAndroidViewClipping<T extends StyleSheet>(styles: T): T {
135
-    if (Platform.OS === 'android') {
136
-        // @ts-ignore
137
-        styles.borderColor = ColorPalette.appBackground;
138
-
139
-        // @ts-ignore
140
-        styles.borderWidth = 1;
141
-    }
142
-
143
-    return styles;
144
-}
145
-
146
 /**
120
 /**
147
  * Returns an rgba format of the provided color if it's in hex or rgb format.
121
  * Returns an rgba format of the provided color if it's in hex or rgb format.
148
  *
122
  *

+ 2
- 3
react/features/conference/components/native/styles.ts Bestand weergeven

1
-import { fixAndroidViewClipping } from '../../../base/styles/functions.native';
2
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
1
 import BaseTheme from '../../../base/ui/components/BaseTheme.native';
3
 
2
 
4
 export const INSECURE_ROOM_NAME_LABEL_COLOR = BaseTheme.palette.actionDanger;
3
 export const INSECURE_ROOM_NAME_LABEL_COLOR = BaseTheme.palette.actionDanger;
38
     /**
37
     /**
39
      * {@code Conference} Style.
38
      * {@code Conference} Style.
40
      */
39
      */
41
-    conference: fixAndroidViewClipping({
40
+    conference: {
42
         alignSelf: 'stretch',
41
         alignSelf: 'stretch',
43
         backgroundColor: BaseTheme.palette.uiBackground,
42
         backgroundColor: BaseTheme.palette.uiBackground,
44
         flex: 1
43
         flex: 1
45
-    }),
44
+    },
46
 
45
 
47
     displayNameContainer: {
46
     displayNameContainer: {
48
         margin: 10
47
         margin: 10

Laden…
Annuleren
Opslaan