Load typface when parsing options (#2416)

* Load typface when parsing options

* fix test

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

@@ -33,7 +33,7 @@ public class NavigationOptions implements DEFAULT_VALUES {
 		NavigationOptions result = new NavigationOptions();
 		if (json == null) return result;
 
-		result.topBarOptions = TopBarOptions.parse(json.optJSONObject("topBar"));
+		result.topBarOptions = TopBarOptions.parse(typefaceManager, json.optJSONObject("topBar"));
 		result.topTabsOptions = TopTabsOptions.parse(json.optJSONObject("topTabs"));
         result.topTabOptions = TopTabOptions.parse(typefaceManager, json.optJSONObject("topTab"));
 		result.bottomTabsOptions = BottomTabsOptions.parse(json.optJSONObject("bottomTabs"));

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

@@ -1,13 +1,17 @@
 package com.reactnativenavigation.parse;
 
 
+import android.graphics.Typeface;
 import android.support.annotation.ColorInt;
+import android.support.annotation.Nullable;
+
+import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
 
 public class TopBarOptions implements DEFAULT_VALUES {
 
-	public static TopBarOptions parse(JSONObject json) {
+	public static TopBarOptions parse(TypefaceLoader typefaceManager, JSONObject json) {
 		TopBarOptions options = new TopBarOptions();
 		if (json == null) return options;
 
@@ -15,7 +19,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
 		options.backgroundColor = json.optInt("backgroundColor", NO_COLOR_VALUE);
 		options.textColor = json.optInt("textColor", NO_COLOR_VALUE);
 		options.textFontSize = (float) json.optDouble("textFontSize", NO_FLOAT_VALUE);
-		options.textFontFamily = json.optString("textFontFamily", NO_VALUE);
+		options.textFontFamily = typefaceManager.getTypeFace(json.optString("textFontFamily", NO_VALUE));
 		options.hidden = NavigationOptions.BooleanOptions.parse(json.optString("hidden"));
 		options.animateHide = NavigationOptions.BooleanOptions.parse(json.optString("animateHide"));
 
@@ -23,12 +27,10 @@ public class TopBarOptions implements DEFAULT_VALUES {
 	}
 
 	public String title = NO_VALUE;
-	@ColorInt
-	public int backgroundColor = NO_COLOR_VALUE;
-	@ColorInt
-	public int textColor = NO_COLOR_VALUE;
+	@ColorInt public int backgroundColor = NO_COLOR_VALUE;
+	@ColorInt public int textColor = NO_COLOR_VALUE;
 	public float textFontSize = NO_FLOAT_VALUE;
-	public String textFontFamily = NO_VALUE;
+	@Nullable public Typeface textFontFamily;
 	public NavigationOptions.BooleanOptions hidden = NavigationOptions.BooleanOptions.False;
 	public NavigationOptions.BooleanOptions animateHide = NavigationOptions.BooleanOptions.False;
 
@@ -40,7 +42,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
 			textColor = other.textColor;
 		if (other.textFontSize != NO_FLOAT_VALUE)
 			textFontSize = other.textFontSize;
-		if (!NO_VALUE.equals(other.textFontFamily))
+		if (other.textFontFamily != null)
 			textFontFamily = other.textFontFamily;
 		if (other.hidden != NavigationOptions.BooleanOptions.NoValue) {
 			hidden = other.hidden;
@@ -59,7 +61,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
             textColor = defaultOptions.textColor;
         if (textFontSize == NO_FLOAT_VALUE)
             textFontSize = defaultOptions.textFontSize;
-        if (NO_VALUE.equals(textFontFamily))
+        if (textFontFamily == null)
             textFontFamily = defaultOptions.textFontFamily;
         if (hidden == NavigationOptions.BooleanOptions.NoValue)
             hidden = defaultOptions.hidden;

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

@@ -7,7 +7,6 @@ import com.reactnativenavigation.parse.Button;
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.parse.TopBarOptions;
 import com.reactnativenavigation.parse.TopTabOptions;
-import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.views.TopBar;
 
 import java.util.ArrayList;
@@ -36,8 +35,7 @@ public class OptionsPresenter {
         topBar.setTitleTextColor(options.textColor);
         topBar.setTitleFontSize(options.textFontSize);
 
-        TypefaceLoader typefaceLoader = new TypefaceLoader(topBar.getContext());
-        topBar.setTitleTypeface(typefaceLoader.getTypeFace(options.textFontFamily));
+        topBar.setTitleTypeface(options.textFontFamily);
         if (options.hidden == NavigationOptions.BooleanOptions.True) {
             hideTopBar(options.animateHide);
         }

lib/android/app/src/main/java/com/reactnativenavigation/utils/TypefaceLoader.java

@@ -25,13 +25,13 @@ public class TypefaceLoader {
 		if (TextUtils.isEmpty(fontFamilyName)) return null;
 		if (typefaceCache.containsKey(fontFamilyName)) return typefaceCache.get(fontFamilyName);
 
-		Typeface result = load(context, fontFamilyName);
+		Typeface result = load(fontFamilyName);
 		typefaceCache.put(fontFamilyName, result);
 		return result;
 	}
 
-	private Typeface load(Context context, String fontFamilyName) {
-		Typeface typeface = getTypefaceFromAssets(context, fontFamilyName);
+	private Typeface load(String fontFamilyName) {
+		Typeface typeface = getTypefaceFromAssets(fontFamilyName);
 		if (typeface != null) return typeface;
 
 		int style = getStyle(fontFamilyName);
@@ -49,7 +49,7 @@ public class TypefaceLoader {
 	}
 
 	@Nullable
-	Typeface getTypefaceFromAssets(Context context, String fontFamilyName) {
+    public Typeface getTypefaceFromAssets(String fontFamilyName) {
 		try {
 			if (context != null) {
 				AssetManager assets = context.getAssets();

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TypefaceLoaderMock.java

@@ -0,0 +1,10 @@
+package com.reactnativenavigation.mocks;
+
+import com.reactnativenavigation.utils.TypefaceLoader;
+
+public class TypefaceLoaderMock extends TypefaceLoader {
+
+    public TypefaceLoaderMock() {
+        super(null);
+    }
+}

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

@@ -1,14 +1,16 @@
 package com.reactnativenavigation.parse;
 
+import android.graphics.Typeface;
 import android.support.annotation.NonNull;
-import android.test.mock.MockContext;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.TypefaceLoaderMock;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 import static com.reactnativenavigation.parse.NavigationOptions.BooleanOptions.True;
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -20,13 +22,20 @@ public class NavigationOptionsTest 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 Typeface TOP_BAR_TYPEFACE = Typeface.create("HelveticaNeue-CondensedBold", Typeface.BOLD);
     private static final NavigationOptions.BooleanOptions TOP_BAR_HIDDEN = True;
     private static final NavigationOptions.BooleanOptions BOTTOM_TABS_ANIMATE_HIDE = True;
     private static final NavigationOptions.BooleanOptions BOTTOM_TABS_HIDDEN = True;
     private static final int BOTTOM_TABS_BADGE = 3;
     private static final String BOTTOM_TABS_CURRENT_TAB_ID = "ContainerId";
     private static final int BOTTOM_TABS_CURRENT_TAB_INDEX = 1;
-    private TypefaceLoader mockLoader = new TypefaceLoader(new MockContext());
+    private TypefaceLoader mockLoader;
+
+    @Override
+    public void beforeEach() {
+        mockLoader = Mockito.mock(TypefaceLoaderMock.class);
+        Mockito.doReturn(TOP_BAR_TYPEFACE).when(mockLoader).getTypeFace(TOP_BAR_FONT_FAMILY);
+    }
 
     @Test
 	public void parsesNullAsDefaultEmptyOptions() throws Exception {
@@ -47,7 +56,7 @@ public class NavigationOptionsTest extends BaseTest {
         assertThat(result.topBarOptions.backgroundColor).isEqualTo(TOP_BAR_BACKGROUND_COLOR);
         assertThat(result.topBarOptions.textColor).isEqualTo(TOP_BAR_TEXT_COLOR);
         assertThat(result.topBarOptions.textFontSize).isEqualTo(TOP_BAR_FONT_SIZE);
-        assertThat(result.topBarOptions.textFontFamily).isEqualTo(TOP_BAR_FONT_FAMILY);
+        assertThat(result.topBarOptions.textFontFamily).isEqualTo(TOP_BAR_TYPEFACE);
         assertThat(result.topBarOptions.hidden).isEqualTo(TOP_BAR_HIDDEN);
         assertThat(result.bottomTabsOptions.animateHide).isEqualTo(BOTTOM_TABS_ANIMATE_HIDE);
         assertThat(result.bottomTabsOptions.hidden).isEqualTo(BOTTOM_TABS_HIDDEN);

lib/android/app/src/test/java/com/reactnativenavigation/utils/TypefaceLoaderTest.java

@@ -17,7 +17,7 @@ public class TypefaceLoaderTest extends BaseTest {
 	public void loadTypefaceNoAssets() {
 		Context context = new MockContext();
 		TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(context, "Helvetica-Bold");
+		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets("Helvetica-Bold");
 
 		Typeface typeface = mockedLoader.getTypeFace("Helvetica-Bold");
 		assertThat(typeface).isNotNull();
@@ -28,7 +28,7 @@ public class TypefaceLoaderTest extends BaseTest {
 	public void loadTypefaceWithAssets() {
         Context context = new MockContext();
         TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-		Mockito.doReturn(Typeface.create("Helvetica-Italic", Typeface.ITALIC)).when(mockedLoader).getTypefaceFromAssets(context, "Helvetica-Italic");
+		Mockito.doReturn(Typeface.create("Helvetica-Italic", Typeface.ITALIC)).when(mockedLoader).getTypefaceFromAssets("Helvetica-Italic");
 
 		Typeface typeface = mockedLoader.getTypeFace("Helvetica-Italic");
 		assertThat(typeface).isNotNull();
@@ -39,7 +39,7 @@ public class TypefaceLoaderTest extends BaseTest {
 	public void loadTypefaceWrongName() {
         Context context = new MockContext();
         TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(context, "Some-name");
+		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets("Some-name");
 
 		Typeface typeface = mockedLoader.getTypeFace("Some-name");
 		assertThat(typeface).isNotNull();
@@ -50,7 +50,7 @@ public class TypefaceLoaderTest extends BaseTest {
 	public void loadTypefaceNull() {
         Context context = new MockContext();
         TypefaceLoader mockedLoader = Mockito.spy(new TypefaceLoader(context));
-		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(context, null);
+		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(null);
 
 		Typeface typeface = mockedLoader.getTypeFace(null);
 		assertThat(typeface).isNull();