Skip to content

Fix warning about shadow calculation in issue #114 #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 19, 2016
Merged

Fix warning about shadow calculation in issue #114 #115

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33d9aa5
Fix shadow calculation warning. As a side-effect of this fix, the who…
danieldunderfelt Nov 27, 2016
a8bc6a8
... and use Animated.
danieldunderfelt Nov 27, 2016
e5d6752
Use animated
danieldunderfelt Nov 27, 2016
898852c
fix derp
danieldunderfelt Nov 27, 2016
7b8298c
honor hideShadow and really fix that warning
danieldunderfelt Nov 27, 2016
be60f87
Add static backgroundColor to wrapper.
danieldunderfelt Nov 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 20 additions & 19 deletions ActionButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export default class ActionButton extends Component {

getActionButtonStyles() {
const actionButtonStyles = [styles.actionBarItem, this.getButtonSize()];
if(!this.props.hideShadow) actionButtonStyles.push(styles.btnShadow);
return actionButtonStyles;
}

Expand Down Expand Up @@ -105,11 +104,6 @@ export default class ActionButton extends Component {
const animatedViewStyle = [
styles.btn,
{
width: this.props.size,
height: this.props.size,
borderRadius: this.props.size / 2,
marginHorizontal: 8,
marginBottom: shadowHeight,
backgroundColor: this.anim.interpolate({
inputRange: [0, 1],
outputRange: [this.props.buttonColor, buttonColorMax]
Expand All @@ -128,22 +122,29 @@ export default class ActionButton extends Component {
},
];

if(!this.props.hideShadow && Platform.OS === 'android') animatedViewStyle.push(styles.btnShadow);
const combinedStyle = {
width: this.props.size,
height: this.props.size,
borderRadius: this.props.size / 2,
marginBottom: shadowHeight,
backgroundColor: this.props.buttonColor
}

const actionButtonStyles = [ this.getActionButtonStyles(), combinedStyle, animatedViewStyle ]

return (
<View style={this.getActionButtonStyles()}>
<TouchableOpacity
activeOpacity={0.85}
onLongPress={this.props.onLongPress}
onPress={() => {
this.props.onPress()
if (this.props.children) this.animateButton()
}}>
<Animated.View
style={animatedViewStyle}>
<View style={ !this.props.hideShadow && [ styles.btnShadow, combinedStyle, { marginHorizontal: 8 }]}>
<Animated.View style={ actionButtonStyles }>
<TouchableOpacity
activeOpacity={0.85}
onLongPress={this.props.onLongPress}
onPress={() => {
this.props.onPress()
if (this.props.children) this.animateButton()
}}>
{this._renderButtonIcon()}
</Animated.View>
</TouchableOpacity>
</TouchableOpacity>
</Animated.View>
</View>
);
}
Expand Down