[V2] Android topbar font family (#1882)

* android oreo overdraw fix

* apply top bar title color

* update readme

* update formatting

* merge v2

* navigation oprtions formatting

* font size props

* update test

* ci fix

* rm global variable

* font size

* update readme

* playground

* after merge fix

* typeface in progress

* presenter skeleton

* test fix

* rm presentation

* options presenter

* typeface

* readme

* test refactoring

* typeface loader tests

README.md

@@ -72,7 +72,7 @@ Note:  v1 properties with names beginning with 'navBar' are replaced in v2 with
 |-----------------------|-----|--------|------------|------------|
 | topBarTextColor |   ✅    |    ✅     |     ✅        | Wix|
 | topBarTextFontSize    |   ✅    |    ✅      |     ✅        | Wix|
-| topBarTextFontFamily  |  ✅     |      ✅     |     [Contribute](/docs/docs/CONTRIBUTING.md)        | Wix |
+| topBarTextFontFamily  |  ✅     |      ✅     |     ✅        | Wix |
 | topBarBackgroundColor |  ✅     |  ✅       |     ✅         | Wix|
 | topBarButtonColor     |  ✅     |    ✅      |     [Contribute](/docs/docs/CONTRIBUTING.md)        | Wix|
 | topBarHidden          |   ✅    |   ✅      |     [Contribute](/docs/docs/CONTRIBUTING.md)        | Wix|

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

@@ -16,6 +16,7 @@ public class NavigationOptions {
 		result.topBarBackgroundColor = json.optInt("topBarBackgroundColor");
 		result.topBarTextColor = json.optInt("topBarTextColor");
 		result.topBarTextFontSize = (float) json.optDouble("topBarTextFontSize");
+		result.topBarTextFontFamily = json.optString("topBarTextFontFamily");
 
 		return result;
 	}
@@ -25,11 +26,13 @@ public class NavigationOptions {
 	@ColorInt
 	public int topBarTextColor;
 	public float topBarTextFontSize;
+	public String topBarTextFontFamily;
 
 	public void mergeWith(final NavigationOptions other) {
 		title = other.title;
 		topBarBackgroundColor = other.topBarBackgroundColor;
 		topBarTextColor = other.topBarTextColor;
 		topBarTextFontSize = other.topBarTextFontSize;
+		topBarTextFontFamily = other.topBarTextFontFamily;
 	}
 }

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.presentation;
 
 import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.viewcontrollers.StackController;
 
 /**
@@ -21,6 +22,8 @@ public class OptionsPresenter {
 			controller.getTopBar().setBackgroundColor(options.topBarBackgroundColor);
 			controller.getTopBar().setTitleTextColor(options.topBarTextColor);
 			controller.getTopBar().setTitleFontSize(options.topBarTextFontSize);
+			TypefaceLoader typefaceLoader = new TypefaceLoader();
+			controller.getTopBar().setTitleTypeface(typefaceLoader.getTypeFace(controller.getActivity(), options.topBarTextFontFamily));
 		}
 	}
 }

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

@@ -0,0 +1,67 @@
+package com.reactnativenavigation.utils;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Typeface;
+import android.support.annotation.Nullable;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TypefaceLoader {
+	private static final Map<String, Typeface> typefaceCache = new HashMap<>();
+
+	public Typeface getTypeFace(Context context, String fontFamilyName) {
+		if (fontFamilyName == null) {
+			return null;
+		}
+		if (typefaceCache.containsKey(fontFamilyName)) {
+			return typefaceCache.get(fontFamilyName);
+		}
+		Typeface result = load(context, fontFamilyName);
+		typefaceCache.put(fontFamilyName, result);
+		return result;
+	}
+
+	private Typeface load(Context context, String fontFamilyName) {
+		Typeface typeface = getTypefaceFromAssets(context, fontFamilyName);
+		if (typeface != null) return typeface;
+
+		int style = getStyle(fontFamilyName);
+		return Typeface.create(fontFamilyName, style);
+	}
+
+	private int getStyle(String fontFamilyName) {
+		int style = Typeface.NORMAL;
+		if (fontFamilyName.toLowerCase().contains("bold")) {
+			style = Typeface.BOLD;
+		} else if (fontFamilyName.toLowerCase().contains("italic")) {
+			style = Typeface.ITALIC;
+		}
+		return style;
+	}
+
+	@Nullable
+	Typeface getTypefaceFromAssets(Context context, String fontFamilyName) {
+		try {
+			if (context != null) {
+				AssetManager assets = context.getAssets();
+				List<String> fonts = Arrays.asList(assets.list("fonts"));
+				if (fonts.contains(fontFamilyName + ".ttf")) {
+					return Typeface.createFromAsset(assets, "fonts/" + fontFamilyName + ".ttf");
+				}
+
+				if (fonts.contains(fontFamilyName + ".otf")) {
+					return Typeface.createFromAsset(assets, "fonts/" + fontFamilyName + ".otf");
+				}
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
+

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

@@ -29,7 +29,6 @@ public class ContainerViewController extends ViewController {
 	}
 
 	private final String containerName;
-	private OptionsPresenter optionsPresenter;
 
 	private final ContainerViewCreator viewCreator;
 	private final NavigationOptions navigationOptions;

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.views;
 
 import android.app.Activity;
+import android.graphics.Typeface;
 import android.support.annotation.ColorInt;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
@@ -37,6 +38,13 @@ public class TopBar extends AppBarLayout {
 		}
 	}
 
+	public void setTitleTypeface(Typeface typeface) {
+		TextView titleTextView = getTitleTextView();
+		if (titleTextView != null) {
+			titleTextView.setTypeface(typeface);
+		}
+	}
+
 	public TextView getTitleTextView() {
 		return findTextView(titleBar);
 	}

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

@@ -21,12 +21,14 @@ public class NavigationOptionsTest extends BaseTest {
 		json.put("topBarBackgroundColor", 0xff123456);
 		json.put("topBarTextColor", 0xff123456);
 		json.put("topBarTextFontSize", 18);
+		json.put("topBarTextFontFamily", "HelveticaNeue-CondensedBold");
 
 		NavigationOptions result = NavigationOptions.parse(json);
 		assertThat(result.title).isEqualTo("the title");
 		assertThat(result.topBarBackgroundColor).isEqualTo(0xff123456);
 		assertThat(result.topBarTextColor).isEqualTo(0xff123456);
 		assertThat(result.topBarTextFontSize).isEqualTo(18);
+		assertThat(result.topBarTextFontFamily).isEqualTo("HelveticaNeue-CondensedBold");
 	}
 
 	@Test

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

@@ -0,0 +1,66 @@
+package com.reactnativenavigation.utils;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.test.mock.MockContext;
+
+import com.reactnativenavigation.BaseTest;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.io.IOException;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+/**
+ * Created by romanko on 9/19/17.
+ */
+
+public class TypefaceLoaderTest extends BaseTest {
+
+	@Test
+	public void loadTypefaceNoAssets() {
+		Context context = new MockContext();
+		TypefaceLoader mockedLoader = Mockito.spy(TypefaceLoader.class);
+		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(context, "Helvetica-Bold");
+
+		Typeface typeface = mockedLoader.getTypeFace(context, "Helvetica-Bold");
+		assertThat(typeface).isNotNull();
+		assertThat(typeface.getStyle()).isEqualTo(Typeface.BOLD);
+	}
+
+	@Test
+	public void loadTypefaceWithAssets() {
+		Context context = new MockContext();
+		TypefaceLoader mockedLoader = Mockito.spy(TypefaceLoader.class);
+		Mockito.doReturn(Typeface.create("Helvetica-Italic", Typeface.ITALIC)).when(mockedLoader).getTypefaceFromAssets(context, "Helvetica-Italic");
+
+		Typeface typeface = mockedLoader.getTypeFace(context, "Helvetica-Italic");
+		assertThat(typeface).isNotNull();
+		assertThat(typeface.getStyle()).isEqualTo(Typeface.ITALIC);
+	}
+
+	@Test
+	public void loadTypefaceWrongName() {
+		Context context = new MockContext();
+		TypefaceLoader mockedLoader = Mockito.spy(TypefaceLoader.class);
+		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(context, "Some-name");
+
+		Typeface typeface = mockedLoader.getTypeFace(context, "Some-name");
+		assertThat(typeface).isNotNull();
+		assertThat(typeface.getStyle()).isEqualTo(Typeface.NORMAL);
+	}
+
+	@Test
+	public void loadTypefaceNull() {
+		Context context = new MockContext();
+		TypefaceLoader mockedLoader = Mockito.spy(TypefaceLoader.class);
+		Mockito.doReturn(null).when(mockedLoader).getTypefaceFromAssets(context, null);
+
+		Typeface typeface = mockedLoader.getTypeFace(context, null);
+		assertThat(typeface).isNull();
+	}
+}
+
+