initial android subtitle impl

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

@@ -0,0 +1,16 @@
+package com.reactnativenavigation.parse;
+
+public enum Alignment {
+    Center, Fill, Default;
+
+    public static Alignment fromString(String alignment) {
+        switch (alignment) {
+            case "center":
+                return Center;
+            case "fill":
+                return Fill;
+            default:
+                return Default;
+        }
+    }
+}

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

@@ -0,0 +1,56 @@
+package com.reactnativenavigation.parse;
+
+import android.graphics.Typeface;
+import android.support.annotation.Nullable;
+
+import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Fraction;
+import com.reactnativenavigation.parse.params.NullColor;
+import com.reactnativenavigation.parse.params.NullFraction;
+import com.reactnativenavigation.parse.params.NullText;
+import com.reactnativenavigation.parse.params.Text;
+import com.reactnativenavigation.parse.parsers.ColorParser;
+import com.reactnativenavigation.parse.parsers.FractionParser;
+import com.reactnativenavigation.parse.parsers.TextParser;
+import com.reactnativenavigation.utils.TypefaceLoader;
+
+import org.json.JSONObject;
+
+public class SubtitleOptions {
+    public static SubtitleOptions parse(TypefaceLoader typefaceManager, JSONObject json) {
+        final SubtitleOptions options = new SubtitleOptions();
+        if (json == null) {
+            return options;
+        }
+
+        options.text = TextParser.parse(json, "text");
+        options.color = ColorParser.parse(json, "color");
+        options.fontSize = FractionParser.parse(json, "fontSize");
+        options.fontFamily = typefaceManager.getTypeFace(json.optString("fontFamily", ""));
+        options.alignment = Alignment.fromString(TextParser.parse(json, "alignment").get(""));
+
+        return options;
+    }
+
+    public Text text = new NullText();
+    public Color color = new NullColor();
+    public Fraction fontSize = new NullFraction();
+    @Nullable public Typeface fontFamily;
+    public Alignment alignment = Alignment.Default;
+
+    void mergeWith(final SubtitleOptions other) {
+        if (other.text.hasValue()) text = other.text;
+        if (other.color.hasValue()) color = other.color;
+        if (other.fontSize.hasValue()) fontSize = other.fontSize;
+        if (other.fontFamily != null) fontFamily = other.fontFamily;
+        if (other.alignment != Alignment.Default) alignment = other.alignment;
+    }
+
+    void mergeWithDefault(SubtitleOptions defaultOptions) {
+        if (!text.hasValue()) text = defaultOptions.text;
+        if (!color.hasValue()) color = defaultOptions.color;
+        if (!fontSize.hasValue()) fontSize = defaultOptions.fontSize;
+        if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
+        if (alignment == Alignment.Default) alignment = defaultOptions.alignment;
+    }
+}

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

@@ -19,20 +19,6 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 import org.json.JSONObject;
 
 public class TitleOptions {
-    public enum Alignment {
-        Center, Fill, Default;
-
-        public static Alignment fromString(String alignment) {
-            switch (alignment) {
-                case "center":
-                    return Center;
-                case "fill":
-                    return Fill;
-                default:
-                    return Default;
-            }
-        }
-    }
 
     public static TitleOptions parse(TypefaceLoader typefaceManager, JSONObject json) {
         final TitleOptions options = new TitleOptions();

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

@@ -23,6 +23,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
         if (json == null) return options;
 
         options.title = TitleOptions.parse(typefaceManager, json.optJSONObject("title"));
+        options.subtitle = SubtitleOptions.parse(typefaceManager, json.optJSONObject("subtitle"));
         options.background = TopBarBackgroundOptions.parse(json.optJSONObject("background"));
         options.visible = BoolParser.parse(json, "visible");
         options.animate = BoolParser.parse(json,"animate");
@@ -36,6 +37,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
     }
 
     public TitleOptions title = new TitleOptions();
+    public SubtitleOptions subtitle = new SubtitleOptions();
     public Text testId = new NullText();
     public TopBarBackgroundOptions background = new TopBarBackgroundOptions();
     public Bool visible = new NullBool();
@@ -47,6 +49,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
 
     void mergeWith(final TopBarOptions other) {
         title.mergeWith(other.title);
+        subtitle.mergeWith(other.subtitle);
         background.mergeWith(other.background);
         if (other.testId.hasValue()) testId = other.testId;
         if (other.visible.hasValue()) visible = other.visible;
@@ -59,6 +62,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
 
     void mergeWithDefault(TopBarOptions defaultOptions) {
         title.mergeWithDefault(defaultOptions.title);
+        subtitle.mergeWithDefault(defaultOptions.subtitle);
         background.mergeWithDefault(defaultOptions.background);
         if (!visible.hasValue()) visible = defaultOptions.visible;
         if (!animate.hasValue()) animate = defaultOptions.animate;

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -38,6 +38,7 @@ public class OptionsPresenter {
 
     private void applyTopBarOptions(TopBarOptions options, AnimationsOptions animationOptions, Component component) {
         if (options.title.text.hasValue()) topBar.setTitle(options.title.text.get());
+        if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
         if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component.get(), options.title.alignment);
         topBar.setBackgroundColor(options.background.color);
         topBar.setBackgroundComponent(options.background.component);
@@ -122,9 +123,13 @@ public class OptionsPresenter {
     private void mergeTopBarOptions(TopBarOptions options, AnimationsOptions animationsOptions, Component component) {
         if (options.title.text.hasValue()) topBar.setTitle(options.title.text.get());
         if (options.title.component.hasValue()) topBar.setTitleComponent(options.title.component.get(), options.title.alignment);
-        if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color);
         if (options.title.color.hasValue()) topBar.setTitleTextColor(options.title.color);
         if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize);
+
+        if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
+
+        if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color);
+
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
 
         if (options.title.fontFamily != null) topBar.setTitleTypeface(options.title.fontFamily);

lib/android/app/src/main/java/com/reactnativenavigation/views/titlebar/TitleBar.java

@@ -12,7 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.reactnativenavigation.parse.TitleOptions;
+import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Fraction;
@@ -58,7 +58,7 @@ public class TitleBar extends Toolbar {
         if (color.hasValue()) setTitleTextColor(color.get());
     }
 
-    public void setComponent(String componentName, TitleOptions.Alignment alignment) {
+    public void setComponent(String componentName, Alignment alignment) {
         clearTitle();
         reactViewController.setComponent(componentName);
         addView(reactViewController.getView(), getComponentLayoutParams(alignment));
@@ -164,9 +164,9 @@ public class TitleBar extends Toolbar {
         return null;
     }
 
-    public Toolbar.LayoutParams getComponentLayoutParams(TitleOptions.Alignment alignment) {
+    public Toolbar.LayoutParams getComponentLayoutParams(Alignment alignment) {
         LayoutParams lp = new LayoutParams(MATCH_PARENT, getHeight());
-        if (alignment == TitleOptions.Alignment.Center) {
+        if (alignment == Alignment.Center) {
             lp.gravity = Gravity.CENTER;
         }
         return lp;

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

@@ -16,8 +16,8 @@ import com.reactnativenavigation.anim.AnimationListener;
 import com.reactnativenavigation.anim.TopBarAnimator;
 import com.reactnativenavigation.anim.TopBarCollapseBehavior;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
+import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.AnimationOptions;
-import com.reactnativenavigation.parse.TitleOptions;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Fraction;
@@ -79,6 +79,10 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         return titleBar.getTitle();
     }
 
+    public void setSubtitle(String subtitle) {
+        titleBar.setSubtitle(subtitle);
+    }
+
     public void setTestId(String testId) {
         setTag(testId);
     }
@@ -95,7 +99,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setTitleTypeface(typeface);
     }
 
-    public void setTitleComponent(String componentName, TitleOptions.Alignment alignment) {
+    public void setTitleComponent(String componentName, Alignment alignment) {
         titleBar.setComponent(componentName, alignment);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/parse/OptionsTest.java

@@ -84,7 +84,7 @@ public class OptionsTest extends BaseTest {
         assertThat(result.fabOptions.hideOnScroll.get()).isEqualTo(FAB_HIDE_ON_SCROLL);
         assertThat(result.fabOptions.alignVertically.get()).isEqualTo(FAB_ALIGN_VERTICALLY);
         assertThat(result.fabOptions.alignHorizontally.get()).isEqualTo(FAB_ALIGN_HORIZONTALLY);
-        assertThat(result.topBarOptions.title.alignment).isEqualTo(TitleOptions.Alignment.Center);
+        assertThat(result.topBarOptions.title.alignment).isEqualTo(Alignment.Center);
     }
 
     @NonNull

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

@@ -52,13 +52,13 @@ public class ExternalComponentViewControllerTest extends BaseTest {
     }
 
     @Test
-    public void createView_returnsFrameLayout() throws Exception {
+    public void createView_returnsFrameLayout() {
         ExternalComponentLayout view = uut.getView();
         assertThat(FrameLayout.class.isAssignableFrom(view.getClass())).isTrue();
     }
 
     @Test
-    public void createView_createsExternalComponent() throws Exception {
+    public void createView_createsExternalComponent() {
         ExternalComponentLayout view = uut.getView();
         verify(componentCreator, times(1)).create((FragmentActivity) activity, reactInstanceManager, ec.passProps);
         assertThat(view.getChildCount()).isGreaterThan(0);

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

@@ -13,7 +13,9 @@ import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
+import com.reactnativenavigation.mocks.TypefaceLoaderMock;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.SubtitleOptions;
 import com.reactnativenavigation.parse.TopBarBackgroundOptions;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Fraction;
@@ -196,4 +198,16 @@ public class OptionsApplyingTest extends BaseTest {
         assertThat(((ColorDrawable) stackController.getTopBar().getTitleBar().getBackground()).getColor()).isEqualTo(Color.TRANSPARENT);
         assertThat(ViewUtils.findChildrenByClassRecursive(stackController.getTopBar(), TopBarBackgroundView.class)).isNotNull();
     }
+
+    @Test
+    public void appliesSubtitle() throws Exception {
+        JSONObject json = new JSONObject();
+        json.put("text", "sub");
+        uut.options.topBarOptions.subtitle = SubtitleOptions.parse(new TypefaceLoaderMock(), json);
+        uut.ensureViewIsCreated();
+        stackController.push(uut, new MockPromise());
+        uut.onViewAppeared();
+
+        assertThat(stackController.getTopBar().getTitleBar().getSubtitle()).isEqualTo("sub");
+    }
 }

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

@@ -8,6 +8,7 @@ import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.OrientationOptions;
+import com.reactnativenavigation.parse.SubtitleOptions;
 import com.reactnativenavigation.parse.TitleOptions;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Color;
@@ -87,6 +88,9 @@ public class OptionsMergingTest extends BaseTest {
         titleOptions.fontSize = new Fraction(1.0f);
         titleOptions.fontFamily = Typeface.DEFAULT_BOLD;
         options.topBarOptions.title = titleOptions;
+        SubtitleOptions subtitleOptions = new SubtitleOptions();
+        subtitleOptions.text = new Text("Sub");
+        options.topBarOptions.subtitle = subtitleOptions;
         options.topBarOptions.background.color = new Color(0);
         options.topBarOptions.testId = new Text("test123");
         options.topBarOptions.animate = new Bool(false);
@@ -137,6 +141,7 @@ public class OptionsMergingTest extends BaseTest {
 
     private void assertTopBarOptions(int t) {
         verify(topBar, times(t)).setTitle(any());
+        verify(topBar, times(t)).setSubtitle(any());
         verify(topBar, times(t)).setTitleComponent(any(), any());
         verify(topBar, times(t)).setBackgroundColor(any());
         verify(topBar, times(t)).setTitleTextColor(any());

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

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
-import com.reactnativenavigation.parse.TitleOptions;
+import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.react.ReactView;
@@ -144,14 +144,14 @@ public class TitleBarTest extends BaseTest {
 
     @Test
     public void setComponent_addsComponentToTitleBar() {
-        uut.setComponent("com.rnn.CustomView", TitleOptions.Alignment.Center);
+        uut.setComponent("com.rnn.CustomView", Alignment.Center);
         verify(uut, times(1)).addView(any(TitleBarReactView.class), any(Toolbar.LayoutParams.class));
     }
 
     @Test
     public void setComponent_alignFill() {
-        uut.setComponent("com.rnn.CustomView", TitleOptions.Alignment.Fill);
-        verify(uut, times(1)).getComponentLayoutParams(TitleOptions.Alignment.Fill);
+        uut.setComponent("com.rnn.CustomView", Alignment.Fill);
+        verify(uut, times(1)).getComponentLayoutParams(Alignment.Fill);
         ArgumentCaptor<Toolbar.LayoutParams> lpCaptor = ArgumentCaptor.forClass(Toolbar.LayoutParams.class);
         verify(uut, times(1)).addView(any(TitleBarReactView.class), lpCaptor.capture());
         assertThat(lpCaptor.getValue().width == ViewGroup.LayoutParams.MATCH_PARENT);
@@ -159,8 +159,8 @@ public class TitleBarTest extends BaseTest {
 
     @Test
     public void setComponent_alignCenter() {
-        uut.setComponent("com.rnn.CustomView", TitleOptions.Alignment.Center);
-        verify(uut, times(1)).getComponentLayoutParams(TitleOptions.Alignment.Center);
+        uut.setComponent("com.rnn.CustomView", Alignment.Center);
+        verify(uut, times(1)).getComponentLayoutParams(Alignment.Center);
         ArgumentCaptor<Toolbar.LayoutParams> lpCaptor = ArgumentCaptor.forClass(Toolbar.LayoutParams.class);
         verify(uut, times(1)).addView(any(TitleBarReactView.class), lpCaptor.capture());
         assertThat(lpCaptor.getValue().width == ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -169,7 +169,7 @@ public class TitleBarTest extends BaseTest {
 
     @Test
     public void clear() {
-        uut.setComponent("someComponent", TitleOptions.Alignment.Center);
+        uut.setComponent("someComponent", Alignment.Center);
         uut.clear();
         assertThat(uut.getTitle()).isNullOrEmpty();
         assertThat(uut.getMenu().size()).isZero();

playground/src/screens/OptionsScreen.js

@@ -24,6 +24,9 @@ class OptionsScreen extends Component {
           fontFamily: 'HelveticaNeue-Italic',
           largeTitle: false
         },
+        subtitle: {
+          text: 'Static'
+        },
         background: {
           component: 'TopBarBackground'
         },