Subtitle color

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

@@ -38,12 +38,15 @@ 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);
+        if (options.title.color.hasValue()) topBar.setTitleTextColor(options.title.color.get());
+        topBar.setTitleFontSize(options.title.fontSize);
+
+        if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
+        if (options.subtitle.color.hasValue()) topBar.setSubtitleColor(options.subtitle.color.get());
+
         topBar.setBackgroundColor(options.background.color);
         topBar.setBackgroundComponent(options.background.component);
-        topBar.setTitleTextColor(options.title.color);
-        topBar.setTitleFontSize(options.title.fontSize);
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
 
         topBar.setTitleTypeface(options.title.fontFamily);
@@ -123,10 +126,11 @@ 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.title.color.hasValue()) topBar.setTitleTextColor(options.title.color);
+        if (options.title.color.hasValue()) topBar.setTitleTextColor(options.title.color.get());
         if (options.title.fontSize.hasValue()) topBar.setTitleFontSize(options.title.fontSize);
 
         if (options.subtitle.text.hasValue()) topBar.setSubtitle(options.subtitle.text.get());
+        if (options.subtitle.color.hasValue()) topBar.setSubtitleColor(options.subtitle.color.get());
 
         if (options.background.color.hasValue()) topBar.setBackgroundColor(options.background.color);
 

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.views.topbar;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Typeface;
+import android.support.annotation.ColorInt;
 import android.support.annotation.RestrictTo;
 import android.support.annotation.VisibleForTesting;
 import android.support.design.widget.AppBarLayout;
@@ -83,11 +84,15 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setSubtitle(subtitle);
     }
 
+    public void setSubtitleColor(@ColorInt int color) {
+        titleBar.setSubtitleTextColor(color);
+    }
+
     public void setTestId(String testId) {
         setTag(testId);
     }
 
-    public void setTitleTextColor(Color color) {
+    public void setTitleTextColor(@ColorInt int color) {
         titleBar.setTitleTextColor(color);
     }
 

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

@@ -60,7 +60,7 @@ public class OptionsMergingTest extends BaseTest {
     }
 
     @Test
-    public void mergeButtons() throws Exception {
+    public void mergeButtons() {
         Options options = new Options();
         uut.mergeChildOptions(options, child);
         verify(topBar, times(0)).setRightButtons(any());
@@ -76,7 +76,7 @@ public class OptionsMergingTest extends BaseTest {
     }
 
     @Test
-    public void mergeTopBarOptions() throws Exception {
+    public void mergeTopBarOptions() {
         Options options = new Options();
         uut.mergeChildOptions(options, child);
         assertTopBarOptions(0);
@@ -90,6 +90,7 @@ public class OptionsMergingTest extends BaseTest {
         options.topBarOptions.title = titleOptions;
         SubtitleOptions subtitleOptions = new SubtitleOptions();
         subtitleOptions.text = new Text("Sub");
+        subtitleOptions.color = new Color(1);
         options.topBarOptions.subtitle = subtitleOptions;
         options.topBarOptions.background.color = new Color(0);
         options.topBarOptions.testId = new Text("test123");
@@ -107,7 +108,7 @@ public class OptionsMergingTest extends BaseTest {
     }
 
     @Test
-    public void mergeTopTabsOptions() throws Exception {
+    public void mergeTopTabsOptions() {
         Options options = new Options();
         uut.mergeChildOptions(options, child);
         verify(topBar, times(0)).applyTopTabsColors(any(), any());
@@ -125,7 +126,7 @@ public class OptionsMergingTest extends BaseTest {
     }
 
     @Test
-    public void mergeTopTabOptions() throws Exception {
+    public void mergeTopTabOptions() {
         Options options = new Options();
         uut.mergeChildOptions(options, child);
 
@@ -144,10 +145,11 @@ public class OptionsMergingTest extends BaseTest {
         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());
+        verify(topBar, times(t)).setTitleTextColor(anyInt());
         verify(topBar, times(t)).setTitleFontSize(any());
-        verify(topBar, times(t)).setTestId(any());
         verify(topBar, times(t)).setTitleTypeface(any());
+        verify(topBar, times(t)).setSubtitleColor(anyInt());
+        verify(topBar, times(t)).setTestId(any());
         verify(topBar, times(t)).hide();
         verify(child, times(t)).drawBelowTopBar(topBar);
         verify(child, times(0)).drawBehindTopBar();

playground/src/screens/OptionsScreen.js

@@ -25,7 +25,8 @@ class OptionsScreen extends Component {
           largeTitle: false
         },
         subtitle: {
-          text: 'Static'
+          text: 'Static Subtitle',
+          color: 'red'
         },
         background: {
           component: 'TopBarBackground'