badge & header fixed

Sankhadeep · Sankhadeep · commit c87a7726ebe1 · 2016-07-27T23:18:34.000+05:30
diff --git a/Components/Widgets/Badge.js b/Components/Widgets/Badge.js
@@ -17,10 +17,10 @@ export default class BadgeNB extends NativeBaseComponent {
             backgroundColor: this.props.primary ? this.getTheme().brandPrimary : this.props.success ? this.getTheme().brandSuccess :
             this.props.info ? this.getTheme().brandInfo : this.props.warning ? this.getTheme().brandWarning :
             this.props.danger ? this.getTheme().brandDanger : this.getTheme().badgeBg,
-            padding: 4,
+            padding: 3,
+            paddingHorizontal: 10,
             alignSelf: 'flex-start',
-            borderRadius: 13,
-            width: 27,
+            borderRadius: 13.5,
             height: 27
 
 
@@ -38,7 +38,7 @@ export default class BadgeNB extends NativeBaseComponent {
             <View {...this.prepareRootProps()}>
                 <Text style={{  color: (this.props.textStyle && this.props.textStyle.color) ? this.props.textStyle.color : this.getTheme().badgeColor,
                                 fontSize: this.getTheme().fontSizeBase,
-                                lineHeight: this.getTheme().lineHeight-2,
+                                lineHeight: this.getTheme().lineHeight-1,
                                 textAlign: 'center'}}>{this.props.children}
                 </Text>
             </View>
diff --git a/Components/Widgets/Header.js b/Components/Widgets/Header.js
@@ -119,12 +119,17 @@ export default class Header extends NativeBaseComponent {
                     newChildren.push(<View key='title' style={{flex: 3, alignSelf: 'center', justifyContent: 'space-between'}}>
                                         {[title[0],subtitle[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: -14}}>
-                                            {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
-                                        </View>)
+                    if (buttons.length>1) {
+                        for (let i = 1; i < buttons.length; i++) {
+                            newChildren.push(<View key={'btn' + (i+1)} style={{alignItems: 'center', justifyContent: 'flex-start', flexDirection: 'row', marginRight: -14}}>
+                            {React.cloneElement(buttons[i], {color: this.getTheme().iosToolbarBtnColor, style: this.getInitialStyle().toolbarButton})}
+                        </View>)
+                        }
+                    } else {
+                        newChildren.push(<Button key='fakeBtn' transparent textStyle={{color:'transparent'}}>aa</Button>)
                     }
-                } else {
+                }
+                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, header : true, textStyle: {color: this.getTheme().toolbarTextColor}})}
                                     </View>)
