Skip to content

Commit e55a51a

Browse files
authored
First pass at fixing applyZOrder (#375)
* First pass at fixing applyZOrder * Cleanup using defaults * Fix return types * Fix import * Fix dupe import
1 parent 6d71c1e commit e55a51a

File tree

6 files changed

+24
-3
lines changed

6 files changed

+24
-3
lines changed

android/src/main/java/com/twiliorn/library/TwilioRemotePreview.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ public TwilioRemotePreview(ThemedReactContext context, String trackSid) {
2222
Log.i("CustomTwilioVideoView", "Remote Prview Construct");
2323
Log.i("CustomTwilioVideoView", trackSid);
2424

25-
2625
CustomTwilioVideoView.registerPrimaryVideoView(this.getSurfaceViewRenderer(), trackSid);
2726
}
27+
28+
public void applyZOrder(boolean applyZOrder) {
29+
this.getSurfaceViewRenderer().applyZOrder(applyZOrder);
30+
}
2831
}

android/src/main/java/com/twiliorn/library/TwilioRemotePreviewManager.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public void setTrackId(TwilioRemotePreview view, @Nullable String trackSid) {
5050
CustomTwilioVideoView.registerPrimaryVideoView(view.getSurfaceViewRenderer(), trackSid);
5151
}
5252

53+
@ReactProp(name = "applyZOrder", defaultBoolean = false)
54+
public void setApplyZOrder(TwilioRemotePreview view, boolean applyZOrder) {
55+
view.applyZOrder(applyZOrder);
56+
}
5357

5458
@Override
5559
protected TwilioRemotePreview createViewInstance(ThemedReactContext reactContext) {

android/src/main/java/com/twiliorn/library/TwilioVideoPreview.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ public class TwilioVideoPreview extends RNVideoViewGroup {
1616
public TwilioVideoPreview(ThemedReactContext themedReactContext) {
1717
super(themedReactContext);
1818
CustomTwilioVideoView.registerThumbnailVideoView(this.getSurfaceViewRenderer());
19-
this.getSurfaceViewRenderer().applyZOrder(true);
19+
}
20+
21+
public void applyZOrder(boolean applyZOrder) {
22+
this.getSurfaceViewRenderer().applyZOrder(applyZOrder);
2023
}
2124
}

android/src/main/java/com/twiliorn/library/TwilioVideoPreviewManager.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ public void setScaleType(TwilioVideoPreview view, @Nullable String scaleType) {
3939
}
4040
}
4141

42+
@ReactProp(name = "applyZOrder", defaultBoolean = true)
43+
public void setApplyZOrder(TwilioVideoPreview view, boolean applyZOrder) {
44+
view.applyZOrder(applyZOrder);
45+
}
46+
4247
@Override
4348
@Nullable
4449
public Map getExportedCustomDirectEventTypeConstants() {

src/TwilioVideoLocalView.android.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ import PropTypes from 'prop-types'
1111

1212
const propTypes = {
1313
...View.propTypes,
14+
// Whether to apply Z ordering to this view. Setting this to true will cause
15+
// this view to appear above other Twilio Video views.
16+
applyZOrder: PropTypes.bool,
1417
/**
1518
* How the video stream should be scaled to fit its
1619
* container.

src/TwilioVideoParticipantView.android.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ class TwilioRemotePreview extends React.Component {
2626
importantForAccessibility: PropTypes.string,
2727
accessibilityLabel: PropTypes.string,
2828
nativeID: PropTypes.string,
29-
testID: PropTypes.string
29+
testID: PropTypes.string,
30+
// Whether to apply Z ordering to this view. Setting this to true will cause
31+
// this view to appear above other Twilio Video views.
32+
applyZOrder: PropTypes.bool
3033
}
3134

3235
buildNativeEventWrappers () {

0 commit comments

Comments
 (0)