Use resolved child options when applying stack child options

When a stack’s child appears we previously applied the child’s options on the stack, without merging the child and the stack’s options.
This commit fixes this by resolving options of all visible children when applying child options.

e2e/ScreenStyle.test.js

@@ -9,7 +9,7 @@ describe('screen style', () => {
     await device.relaunchApp();
   });
 
-  test('declare a options on component component', async () => {
+  test('declare options on a component', async () => {
     await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
     await expect(elementByLabel('Static Title')).toBeVisible();
   });

lib/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.reactnativenavigation">
 
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+
     <application>
         <activity
             android:name="com.facebook.react.devsupport.DevSettingsActivity"

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

@@ -78,5 +78,6 @@ public class BottomTabOptions {
         if (!fontSize.hasValue()) fontSize = defaultOptions.fontSize;
         if (!selectedFontSize.hasValue()) selectedFontSize = defaultOptions.selectedFontSize;
         if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
+        if (!testId.hasValue()) testId = defaultOptions.testId;
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java

@@ -45,7 +45,8 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 	    if (CollectionUtils.isNullOrEmpty(getChildControllers())) return initialOptions;
         return getCurrentChild()
                 .resolveCurrentOptions()
-                .mergeWith(initialOptions);
+                .copy()
+                .withDefaultOptions(initialOptions);
     }
 
     @Override

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -77,7 +77,7 @@ public class StackController extends ParentController<StackLayout> {
     @Override
     public void applyChildOptions(Options options, Component child) {
         super.applyChildOptions(options, child);
-        presenter.applyChildOptions(options, child);
+        presenter.applyChildOptions(resolveCurrentOptions(), child);
         if (child instanceof ReactComponent) {
             fabOptionsPresenter.applyOptions(this.options.fabOptions, (ReactComponent) child, getView());
         }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ParentControllerTest.java

@@ -194,7 +194,13 @@ public class ParentControllerTest extends BaseTest {
     public void resolveCurrentOptions_mergesWithCurrentChild() {
         ViewController child1 = Mockito.mock(ViewController.class);
         when(child1.getView()).thenReturn(new FrameLayout(activity));
-        Options childOptions = spy(new Options());
+        Options copiedChildOptions = spy(new Options());
+        Options childOptions = spy(new Options() {
+            @Override
+            public Options copy() {
+                return copiedChildOptions;
+            }
+        });
         when(child1.resolveCurrentOptions()).thenReturn(childOptions);
 
         children.add(child1);
@@ -203,7 +209,7 @@ public class ParentControllerTest extends BaseTest {
         assertThat(uut.getCurrentChild()).isEqualTo(child1);
         uut.resolveCurrentOptions();
         verify(child1).resolveCurrentOptions();
-        verify(childOptions).mergeWith(uut.initialOptions);
+        verify(copiedChildOptions).withDefaultOptions(uut.initialOptions);
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java

@@ -830,6 +830,24 @@ public class StackControllerTest extends BaseTest {
         assertThat(captor.getValue().fabOptions.hasValue()).isFalse();
     }
 
+    @Test
+    public void applyChildOptions_appliesResolvedOptions() {
+        disablePushAnimation(child1, child2);
+
+        uut.push(child1, new CommandListenerAdapter());
+
+        assertThat(uut.getTopBar().getTitle()).isNullOrEmpty();
+
+        Options uutOptions = new Options();
+        uutOptions.topBar.title.text = new Text("UUT");
+        uut.mergeOptions(uutOptions);
+
+        assertThat(uut.getTopBar().getTitle()).isEqualTo("UUT");
+
+        uut.push(child2, new CommandListenerAdapter());
+        assertThat(uut.getTopBar().getTitle()).isEqualTo("UUT");
+    }
+
     @Test
     public void mergeChildOptions_presenterDoesNotApplyOptionsIfViewIsNotShown() {
         ViewController vc = mock(ViewController.class);