fonts added

GeekyAnts · Jul 26, 2016 · 38b7b26 · 38b7b26
1 parent 3b87193
commit 38b7b26
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/Components/Themes/light.js b/Components/Themes/light.js
@@ -66,6 +66,8 @@ export default {
 
 	iosToolbarBtnColor: "#007aff",
 
+	toolbarTextColor: (Platform.OS==='ios') ? '#000' : '#fff',
+
 	checkboxBgColor: "#039BE5",
 	checkboxTickColor: "#fff",
 

diff --git a/Components/Widgets/Button.js b/Components/Widgets/Button.js
@@ -103,6 +103,7 @@ export default class Button extends NativeBaseComponent {
                 ((this.props.bordered) && (this.props.info)) ? this.getTheme().btnInfoBg :
                 (this.props.bordered)  ? this.getTheme().btnPrimaryBg :
                 (this.props.color)  ? this.props.color :
+                (this.props.header) ? this.getTheme().toolbarTextColor :
                 (this.props.transparent) ? this.getContextForegroundColor() :
                 this.getTheme().inverseTextColor,
 

diff --git a/Components/Widgets/Header.js b/Components/Widgets/Header.js
@@ -2,10 +2,11 @@
 'use strict';
 
 import React from 'react';
-import {View, Platform} from 'react-native';
+import { Platform} from 'react-native';
 import NativeBaseComponent from '../Base/NativeBaseComponent';
 import computeProps from '../../Utils/computeProps';
 import Button from "./Button";
+import View from "./View";
 import Title from "./Title";
 import InputGroup from "./InputGroup";
 import Subtitle from "./Subtitle";
@@ -125,14 +126,14 @@ export default class Header extends NativeBaseComponent {
                     }
                 } else {
                     newChildren.push(<View key='btn1' style={{alignItems: 'center', justifyContent: 'flex-start', flexDirection: 'row', marginLeft: -10, marginRight: 12}}>
-                                        {React.cloneElement(buttons[0], {style: this.getInitialStyle().toolbarButton})}
+                                        {React.cloneElement(buttons[0], {style: this.getInitialStyle().toolbarButton, header : true, textStyle: {color: this.getTheme().toolbarTextColor}})}
                                     </View>)
                     newChildren.push(<View key='title' style={{flex: 3, alignSelf: 'stretch', justifyContent: 'center'}}>
                                         {[title[0]]}
                                     </View>)
                     for (let i = 1; i < buttons.length; i++) {
                         newChildren.push(<View key={'btn' + (i+1)} style={{alignItems: 'center', justifyContent: 'flex-start', flexDirection: 'row', marginRight: -7}}>
-                                            {React.cloneElement(buttons[i], {style: this.getInitialStyle().toolbarButton})}
+                                            {React.cloneElement(buttons[i], {style: this.getInitialStyle().toolbarButton, header : true, textStyle: {color: this.getTheme().toolbarTextColor}})}
                                         </View>)
 
                     }

diff --git a/Fonts/Roboto-Regular.ttf → Fonts/Roboto.ttf b/Fonts/Roboto-Regular.ttf → Fonts/Roboto.ttf
diff --git a/Fonts/Roboto-Medium.ttf → Fonts/Roboto_medium.ttf b/Fonts/Roboto-Medium.ttf → Fonts/Roboto_medium.ttf