saint-lo/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/perf' into perf

Browse source
This commit is contained in:
keplyx 2020-03-08 11:27:45 +01:00
commit 0020c5f588
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navigation/MainTabNavigator.js
View file

@ -208,7 +208,8 @@ function TabNavigator(props) {
let icon = TAB_ICONS[route.name]; let icon = TAB_ICONS[route.name];
// tintColor is ignoring activeColor and inactiveColor for some reason // tintColor is ignoring activeColor and inactiveColor for some reason
icon = focused ? icon : icon + ('-outline'); icon = focused ? icon : icon + ('-outline');
return <MaterialCommunityIcons name={icon} color={colors.text} size={26}/>; let iconColor = focused ? colors.tabIconFocused : colors.tabIcon;
return <MaterialCommunityIcons name={icon} color={iconColor} size={26}/>;
}, },
})} })}
> >

5
utils/ThemeManager.js
View file

@ -22,6 +22,8 @@ export default class ThemeManager {
...DefaultTheme.colors, ...DefaultTheme.colors,
primary: '#be1522', primary: '#be1522',
accent: '#be1522', accent: '#be1522',
tabIcon: "#929292",
tabIconFocused: "#000000",
card: "rgb(255, 255, 255)", card: "rgb(255, 255, 255)",
dividerBackground: '#e2e2e2', dividerBackground: '#e2e2e2',
textDisabled: '#c1c1c1', textDisabled: '#c1c1c1',
@ -59,6 +61,9 @@ export default class ThemeManager {
...DarkTheme.colors, ...DarkTheme.colors,
primary: '#be1522', primary: '#be1522',
accent: '#be1522', accent: '#be1522',
tabBackground: "#181818",
tabIcon: "#6d6d6d",
tabIconFocused: "#ffffff",
card: "rgb(18, 18, 18)", card: "rgb(18, 18, 18)",
dividerBackground: '#222222', dividerBackground: '#222222',
textDisabled: '#5b5b5b', textDisabled: '#5b5b5b',