Implement changing title dynamically on Android #1071 (#1483)

* Upgrade Gradle version

* Allow playground app to run on x86_64 emulator

* #1071 Allow changing navigation title

* #1071 Add tests for JavaScript

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ScreenStyleStaticTest.java

@@ -11,4 +11,12 @@ public class ScreenStyleStaticTest extends BaseTest {
 		elementByText("PUSH OPTIONS SCREEN").click();
 		assertExists(By.text("Static Title"));
 	}
+
+	@Test
+	public void setTitleDynamically() throws Exception {
+		elementByText("PUSH OPTIONS SCREEN").click();
+		assertExists(By.text("Static Title"));
+		elementByText("DYNAMIC OPTIONS").click();
+		assertExists(By.text("Dynamic Title"));
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -10,6 +10,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
+import com.reactnativenavigation.layout.NavigationOptions;
 import com.reactnativenavigation.parse.JSONParser;
 import com.reactnativenavigation.parse.LayoutNodeParser;
 import com.reactnativenavigation.utils.UiThread;
@@ -42,6 +43,17 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		});
 	}
 
+	@ReactMethod
+	public void setOptions(final String onContainerId, final ReadableMap options) {
+		final NavigationOptions navOptions = NavigationOptions.parse(JSONParser.parse(options));
+		handle(new Runnable() {
+			@Override
+			public void run() {
+				navigator().setOptions(onContainerId, navOptions);
+			}
+		});
+	}
+
 	@ReactMethod
 	public void push(final String onContainerId, final ReadableMap rawLayoutTree) {
 		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));

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

@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import com.reactnativenavigation.layout.NavigationOptions;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.Collection;
@@ -54,6 +55,11 @@ public class Navigator extends ParentController {
 		getView().addView(viewController.getView());
 	}
 
+	public void setOptions(final String containerId, NavigationOptions options) {
+		ViewController target = findControllerById(containerId);
+		target.getParentStackController().setTitle(options.title);
+	}
+
 	public void push(final String fromId, final ViewController viewController) {
 		ViewController from = findControllerById(fromId);
 		if (from != null) {

lib/src/Navigation.js

@@ -33,6 +33,10 @@ class Navigation {
     return this.commands.setRoot(params);
   }
 
+  setOptions(containerId, options) {
+    this.commands.setOptions(containerId, options);
+  }
+
   showModal(params) {
     return this.commands.showModal(params);
   }

lib/src/Navigation.test.js

@@ -30,6 +30,14 @@ describe('Navigation', () => {
     expect(Navigation.commands.setRoot).toHaveBeenCalledWith(params);
   });
 
+  it('setOptions delegates to Commands', async () => {
+    const theContainerId = "7";
+    const params = { title: "T" };
+    Navigation.setOptions(theContainerId, params);
+    expect(Navigation.commands.setOptions).toHaveBeenCalledTimes(1);
+    expect(Navigation.commands.setOptions).toHaveBeenCalledWith(theContainerId, params);
+  });
+
   it('showModal delegates to Commands', async () => {
     Navigation.commands.showModal.mockReturnValue(Promise.resolve('result'));
     const params = {};

lib/src/adapters/NativeCommandsSender.js

@@ -10,6 +10,10 @@ export default class NativeCommandsSender {
     return Promise.resolve(layoutTree);
   }
 
+  setOptions(containerId, options) {
+    this.nativeCommandsModule.setOptions(containerId, options);
+  }
+
   push(onContainerId, layout) {
     this.nativeCommandsModule.push(onContainerId, layout);
     return Promise.resolve(layout);

lib/src/adapters/NativeCommandsSender.test.js

@@ -7,6 +7,7 @@ describe('NativeCommandsSender', () => {
   beforeEach(() => {
     mockNativeModule = {
       setRoot: jest.fn(),
+      setOptions: jest.fn(),
       push: jest.fn(),
       pop: jest.fn(),
       popTo: jest.fn(),
@@ -29,6 +30,11 @@ describe('NativeCommandsSender', () => {
     expect(result).toBeDefined();
   });
 
+  it('setOptions sends to native with containerId and params', () => {
+    uut.setOptions('theContainerId', { title: "Title" });
+    expect(mockNativeModule.setOptions).toHaveBeenCalledTimes(1);
+  });
+
   it('push sends to native and resolves with promise', async () => {
     const theNewContainer = {};
     const result = await uut.push('theContainerId', theNewContainer);

lib/src/commands/Commands.js

@@ -14,6 +14,11 @@ export default class Commands {
     return this.nativeCommandsSender.setRoot(layout);
   }
 
+  setOptions(containerId, options) {
+    const input = _.cloneDeep(options);
+    this.nativeCommandsSender.setOptions(containerId, input);
+  }
+
   showModal(simpleApi) {
     const input = _.cloneDeep(simpleApi);
     const layout = this.layoutTreeParser.parseFromSimpleJSON(input);

lib/src/commands/Commands.test.js

@@ -64,6 +64,20 @@ describe('Commands', () => {
     });
   });
 
+  describe('setOptions', () => {
+    it('deep clones input to avoid mutation errors', () => {
+      const obj = { title: "test" };
+      uut.setOptions('theContainerId', obj);
+      expect(mockCommandsSender.setOptions.mock.calls[0][1]).not.toBe(obj);
+    });
+
+    it('passes options for container', () => {
+      uut.setOptions('theContainerId', { title: "1" });
+      expect(mockCommandsSender.setOptions).toHaveBeenCalledTimes(1);
+      expect(mockCommandsSender.setOptions).toHaveBeenCalledWith('theContainerId', { title: "1" });
+    });
+  });
+
   describe('showModal', () => {
     it('sends command to native after parsing into a correct layout tree', () => {
       uut.showModal({

playground/android/app/build.gradle

@@ -17,6 +17,9 @@ android {
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
     }
     signingConfigs {
         release {

playground/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

playground/src/containers/OptionsScreen.js

@@ -30,9 +30,9 @@ class OptionsScreen extends Component {
   }
 
   onClickDynamicOptions() {
-    // Navigation.setOptions({
-    //   title: 'Dynamic Title'
-    // });
+    Navigation.setOptions(this.props.containerId, {
+      title: 'Dynamic Title'
+    });
   }
 }