Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix react-native-youtube support #6220

Merged
merged 1 commit into from
May 18, 2020
Merged

Fix react-native-youtube support #6220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...roid/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.reactnativenavigation.viewcontrollers.navigator;

import android.app.Activity;
import android.view.View;
import android.view.ViewGroup;

import com.facebook.react.ReactInstanceManager;
Expand Down Expand Up @@ -63,8 +64,8 @@ public void setEventEmitter(EventEmitter eventEmitter) {
public void setContentLayout(ViewGroup contentLayout) {
this.contentLayout = contentLayout;
contentLayout.addView(rootLayout);
contentLayout.addView(modalsLayout);
contentLayout.addView(overlaysLayout);
modalsLayout.setVisibility(View.GONE); contentLayout.addView(modalsLayout);
overlaysLayout.setVisibility(View.GONE); contentLayout.addView(overlaysLayout);
}

public Navigator(final Activity activity, ChildControllersRegistry childRegistry, ModalStack modalStack, OverlayManager overlayManager, RootPresenter rootPresenter) {
Expand Down
8 changes: 8 additions & 0 deletions .../app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,14 @@ public void setContentLayout() {
uut.setContentLayout(contentLayout);
}

@Test
public void setContentLayout_modalAndOverlayLayoutsAreGONE() {
ViewGroup contentLayout = Mockito.mock(ViewGroup.class);
uut.setContentLayout(contentLayout);
assertThat(uut.getModalsLayout().getVisibility()).isEqualTo(View.GONE);
assertThat(uut.getOverlaysLayout().getVisibility()).isEqualTo(View.GONE);
}

@Test
public void bindViews() {
verify(rootPresenter).setRootContainer(uut.getRootLayout());
Expand Down