Merge branch 'v2' of https://github.com/wix/react-native-navigation into v2

e2e/Orientations.test.js

@@ -4,7 +4,7 @@ const testIDs = require('../playground/src/testIDs');
 
 const { elementById } = Utils;
 
-describe('orientation', () => {
+describe(':ios: orientation', () => {
   beforeEach(async () => {
     await device.relaunchApp();
   });

e2e/ScreenStyle.test.js

@@ -35,14 +35,14 @@ describe('screen style', () => {
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
   });
 
-  it('hides topBar onScroll down and shows it on scroll up', async () => {
+  it(':ios: hides topBar onScroll down and shows it on scroll up', async () => {
     await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
     await elementById(testIDs.SCROLLVIEW_SCREEN_BUTTON).tap();
     await elementById(testIDs.TOGGLE_TOP_BAR_HIDE_ON_SCROLL).tap();
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
-    await element(by.id(testIDs.SCROLLVIEW_ELEMENT)).swipe('up', 'fast');
+    await element(by.id(testIDs.SCROLLVIEW_ELEMENT)).swipe('up', 'slow');
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeNotVisible();
-    await element(by.id(testIDs.SCROLLVIEW_ELEMENT)).swipe('down', 'fast');
+    await element(by.id(testIDs.SCROLLVIEW_ELEMENT)).swipe('down', 'slow');
     await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
   });
 
@@ -52,14 +52,14 @@ describe('screen style', () => {
     await expect(element(by.text('TeSt'))).toBeVisible();
   });
 
-  it('hide Tab Bar', async () => {
+  it(':ios: hide Tab Bar', async () => {
     await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
     await expect(elementById(testIDs.BOTTOM_TABS_ELEMENT)).toBeVisible();
     await elementById(testIDs.HIDE_BOTTOM_TABS_BUTTON).tap();
     await expect(elementById(testIDs.BOTTOM_TABS_ELEMENT)).toBeNotVisible();
   });
 
-  it('show Tab Bar', async () => {
+  it(':ios: show Tab Bar', async () => {
     await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
     await elementById(testIDs.HIDE_BOTTOM_TABS_BUTTON).tap();
     await expect(elementById(testIDs.BOTTOM_TABS_ELEMENT)).toBeNotVisible();
@@ -67,7 +67,7 @@ describe('screen style', () => {
     await expect(elementById(testIDs.BOTTOM_TABS_ELEMENT)).toBeVisible();
   });
 
-  it('side menu visibility - left', async () => {
+  it(':ios: side menu visibility - left', async () => {
     await elementById(testIDs.TAB_BASED_APP_SIDE_BUTTON).tap();
     await elementById(testIDs.SHOW_LEFT_SIDE_MENU_BUTTON).tap();
     await expect(elementById(testIDs.HIDE_LEFT_SIDE_MENU_BUTTON)).toBeVisible();
@@ -75,7 +75,7 @@ describe('screen style', () => {
     await expect(elementById(testIDs.CENTERED_TEXT_HEADER)).toBeVisible();
   });
 
-  it('side menu visibility - right', async () => {
+  it(':ios: side menu visibility - right', async () => {
     await elementById(testIDs.TAB_BASED_APP_SIDE_BUTTON).tap();
     await elementById(testIDs.SHOW_RIGHT_SIDE_MENU_BUTTON).tap();
     await expect(elementById(testIDs.HIDE_RIGHT_SIDE_MENU_BUTTON)).toBeVisible();
@@ -83,7 +83,7 @@ describe('screen style', () => {
     await expect(elementById(testIDs.CENTERED_TEXT_HEADER)).toBeVisible();
   });
 
-  it('set right buttons', async () => {
+  it(':ios: set right buttons', async () => {
     await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
     await expect(elementById('buttonOne')).toBeVisible();
     await elementById('buttonOne').tap();

e2e/TopLevelApi.test.js

@@ -18,7 +18,7 @@ describe('top level api', () => {
     await expect(elementByLabel('Hello from a function!')).toBeVisible();
   });
 
-  it('switch to tabs with side menus', async () => {
+  it(':ios: switch to tabs with side menus', async () => {
     await elementById(testIDs.TAB_BASED_APP_SIDE_BUTTON).tap();
     await elementById(testIDs.CENTERED_TEXT_HEADER).swipe('right');
     await expect(elementById(testIDs.HIDE_LEFT_SIDE_MENU_BUTTON)).toBeVisible();
@@ -28,7 +28,6 @@ describe('top level api', () => {
     await elementById(testIDs.PUSH_LIFECYCLE_BUTTON).tap();
     await expect(elementByLabel('didAppear')).toBeVisible();
     await elementById(testIDs.PUSH_TO_TEST_DID_DISAPPEAR_BUTTON).tap();
-    await expect(elementByLabel('Alert')).toBeVisible();
     await expect(elementByLabel('didDisappear')).toBeVisible();
   });
 

lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabOptions.java

@@ -32,6 +32,9 @@ public class BottomTabOptions implements DEFAULT_VALUES {
         if (other.badge.hasValue()) {
             badge = other.badge;
         }
+        if (other.testId.hasValue()) {
+            testId = other.testId;
+        }
     }
 
     void mergeWithDefault(final BottomTabOptions defaultOptions) {

lib/android/app/src/main/java/com/reactnativenavigation/parse/Options.java

@@ -48,6 +48,7 @@ public class Options implements DEFAULT_VALUES {
         result.topTabOptions.mergeWith(topTabOptions);
         result.bottomTabOptions.mergeWith(bottomTabOptions);
         result.bottomTabsOptions.mergeWith(bottomTabsOptions);
+        result.overlayOptions = overlayOptions;
         return result;
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/views/StackLayout.java

@@ -18,7 +18,7 @@ public class StackLayout extends RelativeLayout implements TitleBarButton.OnClic
 
     public StackLayout(Context context) {
         super(context);
-        topBar = new TopBar(context, this);
+        topBar = new TopBar(context, this, this);
         topBar.setId(CompatUtils.generateViewId());
         createLayout();
         setContentDescription("StackLayout");

lib/android/app/src/main/java/com/reactnativenavigation/views/TopBar.java

@@ -24,6 +24,9 @@ import com.reactnativenavigation.parse.params.Bool;
 
 import java.util.ArrayList;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
 @SuppressLint("ViewConstructor")
 public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAwareView {
     private final Toolbar titleBar;
@@ -31,8 +34,9 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     private final TopBarCollapseBehavior collapsingBehavior;
     private final TopBarAnimator animator;
     private TopTabs topTabs;
+    private StackLayout parentView;
 
-    public TopBar(final Context context, TitleBarButton.OnClickListener onClickListener) {
+    public TopBar(final Context context, TitleBarButton.OnClickListener onClickListener, StackLayout parentView) {
         super(context);
         this.onClickListener = onClickListener;
         collapsingBehavior = new TopBarCollapseBehavior(this);
@@ -40,6 +44,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.getMenu();
         topTabs = new TopTabs(getContext());
         this.animator = new TopBarAnimator(this);
+        this.parentView = parentView;
         addView(titleBar);
     }
 
@@ -191,6 +196,16 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         }
     }
 
+    @Override
+    public void setVisibility(int visibility) {
+        super.setVisibility(visibility);
+        if (visibility == View.GONE) {
+            this.parentView.removeView(this);
+        } else if (visibility == View.VISIBLE && this.getParent() == null) {
+            this.parentView.addView(this, MATCH_PARENT, WRAP_CONTENT);
+        }
+    }
+
     public void clear() {
         titleBar.setTitle(null);
         titleBar.setNavigationIcon(null);

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarTest.java

@@ -9,7 +9,7 @@ import static org.assertj.core.api.Java6Assertions.*;
 public class TopBarTest extends BaseTest {
     @Test
     public void title() throws Exception {
-        TopBar topBar = new TopBar(newActivity(), buttonId -> {});
+        TopBar topBar = new TopBar(newActivity(), buttonId -> {}, null);
         assertThat(topBar.getTitle()).isEmpty();
 
         topBar.setTitle("new title");

playground/src/screens/ScrollViewScreen.js

@@ -13,7 +13,8 @@ class ScrollViewScreen extends Component {
         title: 'Collapse',
         drawBehind: true,
         textColor: 'black',
-        textFontSize: 16
+        textFontSize: 16,
+        testID: testIDs.TOP_BAR_ELEMENT
       }
     };
   }

scripts/test.e2e.android.detox.js

@@ -8,5 +8,5 @@ run();
 function run() {
   const conf = release ? `release` : `debug`;
   exec.execSync(`detox build --configuration android.emu.${conf}`);
-  exec.execSync(`detox test --configuration android.emu.${conf} ${process.env.CI ? '--cleanup' : ''}`);
+  exec.execSync(`detox test --configuration android.emu.${conf} ${process.env.CI ? '--cleanup' : ''}  --platform android`);
 }