Subtitle options merge

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

@@ -40,10 +40,12 @@ public class OptionsPresenter {
         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.title.color.hasValue()) topBar.setTitleTextColor(options.title.color.get());
-        topBar.setTitleFontSize(options.title.fontSize);
+        if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize.get());
 
         if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
         if (options.subtitle.color.hasValue()) topBar.setSubtitleColor(options.subtitle.color.get());
+        if (options.subtitle.fontFamily != null) topBar.setSubtitleFontFamily(options.subtitle.fontFamily);
+        if (options.subtitle.fontSize.hasValue()) topBar.setTitleFontSize(options.subtitle.fontSize.get());
 
         topBar.setBackgroundColor(options.background.color);
         topBar.setBackgroundComponent(options.background.component);
@@ -127,7 +129,7 @@ public class OptionsPresenter {
         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.title.color.hasValue()) topBar.setTitleTextColor(options.title.color.get());
-        if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize);
+        if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize.get());
 
         if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
         if (options.subtitle.color.hasValue()) topBar.setSubtitleColor(options.subtitle.color.get());

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

@@ -15,7 +15,6 @@ import android.widget.TextView;
 import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
-import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TitleBarReactViewController;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
@@ -68,11 +67,9 @@ public class TitleBar extends Toolbar {
         if (color.hasValue()) setBackgroundColor(color.get());
     }
 
-    public void setTitleFontSize(Fraction size) {
+    public void setTitleFontSize(float size) {
         TextView titleTextView = getTitleTextView();
-        if (titleTextView != null && size.hasValue()) {
-            titleTextView.setTextSize(size.get());
-        }
+        if (titleTextView != null) titleTextView.setTextSize(size);
     }
 
     public void setTitleTypeface(Typeface typeface) {
@@ -88,6 +85,7 @@ public class TitleBar extends Toolbar {
 
     public void clear() {
         clearTitle();
+        clearSubtitle();
         clearRightButtons();
         clearLeftButton();
         clearComponent();
@@ -97,6 +95,10 @@ public class TitleBar extends Toolbar {
         setTitle(null);
     }
 
+    private void clearSubtitle() {
+        setSubtitle(null);
+    }
+
     private void clearComponent() {
         reactViewController.destroy();
         reactViewController = new TitleBarReactViewController((Activity) getContext(), reactViewCreator);

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

@@ -88,6 +88,10 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setSubtitleTextColor(color);
     }
 
+    public void setSubtitleFontFamily(Typeface fontFamily) {
+
+    }
+
     public void setTestId(String testId) {
         setTag(testId);
     }
@@ -96,7 +100,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setTitleTextColor(color);
     }
 
-    public void setTitleFontSize(Fraction size) {
+    public void setTitleFontSize(float size) {
         titleBar.setTitleFontSize(size);
     }
 

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

@@ -1,19 +1,24 @@
 package com.reactnativenavigation.parse;
 
-import android.graphics.*;
-import android.support.annotation.*;
+import android.graphics.Typeface;
+import android.support.annotation.NonNull;
 
-import com.reactnativenavigation.*;
-import com.reactnativenavigation.mocks.*;
-import com.reactnativenavigation.parse.params.*;
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.TypefaceLoaderMock;
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.parse.params.Number;
-import com.reactnativenavigation.utils.*;
+import com.reactnativenavigation.parse.params.Text;
+import com.reactnativenavigation.utils.TypefaceLoader;
 
-import org.json.*;
-import org.junit.*;
-import org.mockito.*;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
 
-import static org.assertj.core.api.Java6Assertions.*;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.when;
 
 public class OptionsTest extends BaseTest {
 
@@ -30,6 +35,11 @@ public class OptionsTest extends BaseTest {
     private static final int TOP_BAR_TEXT_COLOR = 0xff123456;
     private static final int TOP_BAR_FONT_SIZE = 18;
     private static final String TOP_BAR_FONT_FAMILY = "HelveticaNeue-CondensedBold";
+    private static final int SUBTITLE_FONT_SIZE = 14;
+    private static final int SUBTITLE_TEXT_COLOR = 0xff123457;
+    private static final String SUBTITLE_FONT_FAMILY = "HelveticaNeue-Condensed";
+    private static final Typeface SUBTITLE_TYPEFACE = Typeface.create("HelveticaNeue-Condensed", Typeface.NORMAL);
+    private static final String SUBTITLE_ALIGNMENT = "center";
     private static final Typeface TOP_BAR_TYPEFACE = Typeface.create("HelveticaNeue-CondensedBold", Typeface.BOLD);
     private static final String TITLE_ALIGNMENT = "center";
     private static final Bool TOP_BAR_VISIBLE = new Bool(true);
@@ -45,11 +55,13 @@ public class OptionsTest extends BaseTest {
     @Override
     public void beforeEach() {
         mockLoader = Mockito.mock(TypefaceLoaderMock.class);
+        when(mockLoader.getTypeFace("HelveticaNeue-Condensed")).then((Answer<Typeface>) invocation -> SUBTITLE_TYPEFACE);
+        when(mockLoader.getTypeFace("HelveticaNeue-CondensedBold")).then((Answer<Typeface>) invocation -> TOP_BAR_TYPEFACE);
         Mockito.doReturn(TOP_BAR_TYPEFACE).when(mockLoader).getTypeFace(TOP_BAR_FONT_FAMILY);
     }
 
     @Test
-    public void parsesNullAsDefaultEmptyOptions() throws Exception {
+    public void parsesNullAsDefaultEmptyOptions() {
         assertThat(Options.parse(mockLoader, null)).isNotNull();
     }
 
@@ -69,6 +81,10 @@ public class OptionsTest extends BaseTest {
         assertThat(result.topBarOptions.title.color.get()).isEqualTo(TOP_BAR_TEXT_COLOR);
         assertThat(result.topBarOptions.title.fontSize.get()).isEqualTo(TOP_BAR_FONT_SIZE);
         assertThat(result.topBarOptions.title.fontFamily).isEqualTo(TOP_BAR_TYPEFACE);
+        assertThat(result.topBarOptions.subtitle.color.get()).isEqualTo(SUBTITLE_TEXT_COLOR);
+        assertThat(result.topBarOptions.subtitle.fontSize.get()).isEqualTo(SUBTITLE_FONT_SIZE);
+        assertThat(result.topBarOptions.subtitle.alignment).isEqualTo(Alignment.fromString(SUBTITLE_ALIGNMENT));
+        assertThat(result.topBarOptions.subtitle.fontFamily).isEqualTo(SUBTITLE_TYPEFACE);
         assertThat(result.topBarOptions.visible.get()).isEqualTo(TOP_BAR_VISIBLE.get());
         assertThat(result.topBarOptions.drawBehind.get()).isEqualTo(TOP_BAR_DRAW_BEHIND.get());
         assertThat(result.topBarOptions.hideOnScroll.get()).isEqualTo(TOP_BAR_HIDE_ON_SCROLL.get());
@@ -100,6 +116,7 @@ public class OptionsTest extends BaseTest {
     private JSONObject createTopBar(boolean visible) throws JSONException {
         return new JSONObject()
                 .put("title", createTitle())
+                .put("subtitle", createSubtitle())
                 .put("background", createBackground())
                 .put("visible", visible)
                 .put("drawBehind", TOP_BAR_DRAW_BEHIND.get())
@@ -120,6 +137,15 @@ public class OptionsTest extends BaseTest {
                 .put("alignment", TITLE_ALIGNMENT);
     }
 
+    private JSONObject createSubtitle() throws JSONException {
+        return new JSONObject()
+                .put("text", "the subtitle")
+                .put("color", SUBTITLE_TEXT_COLOR)
+                .put("fontSize", SUBTITLE_FONT_SIZE)
+                .put("fontFamily", SUBTITLE_FONT_FAMILY)
+                .put("alignment", SUBTITLE_ALIGNMENT);
+    }
+
     @NonNull
     private JSONObject createFab() throws JSONException {
         return new JSONObject()
@@ -150,6 +176,7 @@ public class OptionsTest extends BaseTest {
     private JSONObject createOtherTopBar() throws JSONException {
         return new JSONObject()
                 .put("title", createTitle())
+                .put("subtitle", createSubtitle())
                 .put("background", createBackground())
                 .put("visible", TOP_BAR_VISIBLE);
     }
@@ -211,20 +238,20 @@ public class OptionsTest extends BaseTest {
     }
 
     @Test
-    public void defaultEmptyOptions() throws Exception {
+    public void defaultEmptyOptions() {
         Options uut = new Options();
         assertThat(uut.topBarOptions.title.text.get("")).isEmpty();
     }
 
     @Test
-    public void topBar_defaultOptions() throws Exception {
+    public void topBar_defaultOptions() {
         Options uut = new Options();
         assertThat(uut.topBarOptions.visible.isFalseOrUndefined()).isTrue();
         assertThat(uut.topBarOptions.animate.isTrueOrUndefined()).isTrue();
     }
 
     @Test
-    public void clear_topBarOptions() throws Exception {
+    public void clear_topBarOptions() {
         Options uut = new Options();
         uut.topBarOptions.title.text = new Text("some title");
         uut.clearTopBarOptions();
@@ -232,7 +259,7 @@ public class OptionsTest extends BaseTest {
     }
 
     @Test
-    public void clear_bottomTabsOptions() throws Exception {
+    public void clear_bottomTabsOptions() {
         Options uut = new Options();
         uut.bottomTabsOptions.tabColor = new com.reactnativenavigation.parse.params.Color(android.graphics.Color.RED);
         uut.clearBottomTabsOptions();
@@ -240,7 +267,7 @@ public class OptionsTest extends BaseTest {
     }
 
     @Test
-    public void clear_topTabsOptions() throws Exception {
+    public void clear_topTabsOptions() {
         Options uut = new Options();
         uut.topTabsOptions.fontSize = new Number(666);
         uut.clearTopTabsOptions();
@@ -248,7 +275,7 @@ public class OptionsTest extends BaseTest {
     }
 
     @Test
-    public void clear_topTabOptions() throws Exception {
+    public void clear_topTabOptions() {
         Options uut = new Options();
         uut.topTabOptions.title = new Text("some title");
         uut.clearTopTabOptions();

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

@@ -25,6 +25,7 @@ import java.util.ArrayList;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyFloat;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -146,7 +147,7 @@ public class OptionsMergingTest extends BaseTest {
         verify(topBar, times(t)).setTitleComponent(any(), any());
         verify(topBar, times(t)).setBackgroundColor(any());
         verify(topBar, times(t)).setTitleTextColor(anyInt());
-        verify(topBar, times(t)).setTitleFontSize(any());
+        verify(topBar, times(t)).setTitleFontSize(anyFloat());
         verify(topBar, times(t)).setTitleTypeface(any());
         verify(topBar, times(t)).setSubtitleColor(anyInt());
         verify(topBar, times(t)).setTestId(any());