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

Fixed side menu staying open when changing tab + fixed ios tab icon color

Browse source
This commit is contained in:
keplyx 2019-09-16 19:13:01 +02:00
parent cecf4154f6
commit dd4ba0a9fc
5 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
components/BaseContainer.js
View file

@ -24,6 +24,8 @@ type State = {
export default class BaseContainer extends React.Component<Props, State> {
willBlurSubscription: function;
static defaultProps = {
headerRightButton: <View/>
};
@ -43,6 +45,26 @@ export default class BaseContainer extends React.Component<Props, State> {
this.setState({isOpen});
}
/**
* Register for blur event to close side menu on screen change
*/
componentDidMount() {
this.willBlurSubscription = this.props.navigation.addListener(
'willBlur',
payload => {
this.setState({isOpen: false});
}
);
}
/**
* Unregister from event when un-mounting components
*/
componentWillUnmount() {
if (this.willBlurSubscription !== undefined)
this.willBlurSubscription.remove();
}
render() {
return (
<View style={{

5
components/FetchedDataSectionList.js
View file

@ -314,8 +314,9 @@ export default class FetchedDataSectionList extends React.Component<Props, State
tabbedView.push(
<Tab heading={
<TabHeading>
<CustomMaterialIcon icon={dataset[i].icon}
color={'#fff'}
<CustomMaterialIcon
icon={dataset[i].icon}
color={ThemeManager.getCurrentThemeVariables().tabIconColor}
fontSize={20}
/>
<Text>{dataset[i].title}</Text>

1
native-base-theme/variables/platform.js
View file

@ -238,6 +238,7 @@ export default {
// Tabs
tabBgColor: "#F8F8F8",
tabIconColor: platform === "ios" ? "#5d5d5d" : "#fff",
tabFontSize: 15,
// Text

1
native-base-theme/variables/platformDark.js
View file

@ -239,6 +239,7 @@ export default {
// Tabs
tabBgColor: "#2b2b2b",
tabIconColor: "#fff",
tabFontSize: 15,
// Text

4
screens/ProxiwashAboutScreen.js
View file

@ -36,7 +36,7 @@ export default class ProxiwashAboutScreen extends React.Component<Props> {
<TabHeading>
<CustomMaterialIcon
icon={'information'}
color={'#fff'}
color={ThemeManager.getCurrentThemeVariables().tabIconColor}
fontSize={20}
/>
<Text>{i18n.t('proxiwashScreen.informationTab')}</Text>
@ -106,7 +106,7 @@ export default class ProxiwashAboutScreen extends React.Component<Props> {
<TabHeading>
<CustomMaterialIcon
icon={'cash'}
color={'#fff'}
color={ThemeManager.getCurrentThemeVariables().tabIconColor}
fontSize={20}
/>
<Text>{i18n.t('proxiwashScreen.paymentTab')}</Text>