status-im/react-navigation
2
0
Fork 0
mirror of https://github.com/status-im/react-navigation.git synced 2025-02-24 17:18:09 +00:00
Code Issues Projects Releases Wiki Activity

Fix tabbar bottom issue on Android. (#2774)

Browse Source
This commit is contained in:
Spencer Carli 2017-10-18 03:16:22 -05:00 committed by Lorenzo Sciandra
parent 3e37ee6d0c
commit 642af12ecb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/TabView/TabBarBottom.js
View File

@ -56,7 +56,9 @@ type Props = {
isLandscape?: boolean,
};
const majorVersionIOS = parseInt(Platform.Version, 10);
const majorVersion = parseInt(Platform.Version, 10);
const isIos = Platform.OS === 'ios';
const useHorizontalTabs = majorVersion >= 11 && isIos;
class TabBarBottom extends PureComponent<DefaultProps, Props, void> {
// See https://developer.apple.com/library/content/documentation/UserExperience/Conceptual/UIKitUICatalog/UITabBar.html
@ -103,11 +105,11 @@ class TabBarBottom extends PureComponent<DefaultProps, Props, void> {
const tintColor = scene.focused ? activeTintColor : inactiveTintColor;
const label = this.props.getLabel({ ...scene, tintColor });
let marginLeft = 0;
if (isLandscape && showIcon && majorVersionIOS >= 11) {
if (isLandscape && showIcon && useHorizontalTabs) {
marginLeft = LABEL_LEFT_MARGIN;
}
let marginTop = 0;
if (!isLandscape && showIcon && majorVersionIOS >= 11) {
if (!isLandscape && showIcon && useHorizontalTabs) {
marginTop = LABEL_TOP_MARGIN;
}
@ -150,7 +152,7 @@ class TabBarBottom extends PureComponent<DefaultProps, Props, void> {
inactiveTintColor={inactiveTintColor}
renderIcon={renderIcon}
scene={scene}
style={showLabel && majorVersionIOS >= 11 ? {} : styles.icon}
style={showLabel && useHorizontalTabs ? {} : styles.icon}
/>
);
};
@ -209,8 +211,8 @@ class TabBarBottom extends PureComponent<DefaultProps, Props, void> {
<Animated.View
style={[
styles.tab,
isLandscape && majorVersionIOS >= 11 && styles.tabLandscape,
!isLandscape && majorVersionIOS >= 11 && styles.tabPortrait,
isLandscape && useHorizontalTabs && styles.tabLandscape,
!isLandscape && useHorizontalTabs && styles.tabPortrait,
{ backgroundColor },
tabStyle,
]}
@ -238,7 +240,7 @@ const styles = StyleSheet.create({
},
tab: {
flex: 1,
alignItems: 'center',
alignItems: isIos ? 'center' : 'stretch',
justifyContent: 'flex-end',
},
tabPortrait: {