diff --git a/native-base-theme/variables/commonColor.js b/native-base-theme/variables/commonColor.js index 84cc473..c6ee8ff 100644 --- a/native-base-theme/variables/commonColor.js +++ b/native-base-theme/variables/commonColor.js @@ -108,7 +108,7 @@ export default { cardDefaultBg: "#fff", // Color - brandPrimary: "#f58220", + brandPrimary: "#0277bd", brandInfo: "#62B1F6", brandSuccess: "#5cb85c", brandDanger: "#d9534f", diff --git a/native-base-theme/variables/platform.js b/native-base-theme/variables/platform.js index e41d5c1..72c1c67 100644 --- a/native-base-theme/variables/platform.js +++ b/native-base-theme/variables/platform.js @@ -109,7 +109,7 @@ export default { // Color // brandPrimary: platform === "ios" ? "#007aff" : "#3F51B5", - brandPrimary: "#f58220", + brandPrimary: "#0277bd", brandInfo: "#62B1F6", brandSuccess: "#5cb85c", brandDanger: "#d9534f", diff --git a/src/Dusken.js b/src/Dusken.js index 0a785a4..15cd23a 100644 --- a/src/Dusken.js +++ b/src/Dusken.js @@ -1,5 +1,6 @@ import React from 'react'; import {connect} from "react-redux"; +import {Platform} from 'react-native'; import {TabNavigator, StackNavigator} from "react-navigation"; import AboutScreen from "./screens/AboutScreen"; @@ -25,19 +26,22 @@ const tabBarOptions = { indicatorStyle: { backgroundColor: "#f58220" }, - // labelStyle: { - // color: '#f58220' - // }, activeTintColor: '#f58220', - inactiveTintColor: '#f58220', + inactiveTintColor: '#333333', showIcon: true, iconStyle: { - color: '#f58220' + width: 20, + height: 20, }, labelStyle: { fontSize: 10, marginBottom: 0, - } + ...Platform.select({ + android: { + fontWeight: 'bold', + } + }), + }, } }; diff --git a/src/screens/AboutScreen.js b/src/screens/AboutScreen.js index fb3d604..4f5d877 100644 --- a/src/screens/AboutScreen.js +++ b/src/screens/AboutScreen.js @@ -10,8 +10,12 @@ export default class AboutScreen extends Component { headerStyle: { backgroundColor: '#f58220', }, + headerTitleStyle: { + color: 'white', + }, + headerTintColor: 'white', tabBarIcon: ({ tintColor }) => ( - + ), }; diff --git a/src/screens/EventDetailsScreen.js b/src/screens/EventDetailsScreen.js index cac29ea..8f5361b 100644 --- a/src/screens/EventDetailsScreen.js +++ b/src/screens/EventDetailsScreen.js @@ -8,7 +8,11 @@ export default class EventDetailsScreen extends Component { title: navigation.state.params.item.title.decoded, headerStyle: { backgroundColor: '#f58220', - } + }, + headerTitleStyle: { + color: 'white', + }, + headerTintColor: 'white', }); render() { diff --git a/src/screens/EventListScreen.js b/src/screens/EventListScreen.js index 3c53321..9643240 100644 --- a/src/screens/EventListScreen.js +++ b/src/screens/EventListScreen.js @@ -10,8 +10,12 @@ export default class EventsScreen extends Component { headerStyle: { backgroundColor: '#f58220', }, + headerTitleStyle: { + color: 'white', + }, + headerTintColor: 'white', tabBarIcon: ({ tintColor }) => ( - + ), }; diff --git a/src/screens/LoginScreen.js b/src/screens/LoginScreen.js index c0ae5cc..37fbf56 100644 --- a/src/screens/LoginScreen.js +++ b/src/screens/LoginScreen.js @@ -9,6 +9,10 @@ export default class LoginScreen extends Component { headerStyle: { backgroundColor: '#f58220', }, + headerTitleStyle: { + color: 'white', + }, + headerTintColor: 'white', }; onLogin = () => { diff --git a/src/screens/MembershipScreen.js b/src/screens/MembershipScreen.js index 007d2d5..3c7a6d1 100644 --- a/src/screens/MembershipScreen.js +++ b/src/screens/MembershipScreen.js @@ -10,8 +10,12 @@ export default class MembershipScreen extends Component { headerStyle: { backgroundColor: '#f58220', }, + headerTitleStyle: { + color: 'white', + }, + headerTintColor: 'white', tabBarIcon: ({ tintColor }) => ( - + ), };