Skip to content

Move styles outside of constructor #38

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 1 commit into from
Feb 12, 2016
Merged

Move styles outside of constructor #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions components/NavBarContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,23 @@ const propTypes = {
toRoute: PropTypes.func.isRequired,
};

const styles = StyleSheet.create({
navbarContainer: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
height: Styles.NAV_BAR_HEIGHT,
},
navbarContainerHidden: {
position: 'absolute',
top: -Styles.NAV_BAR_HEIGHT,
left: 0,
right: 0,
height: Styles.NAV_BAR_HEIGHT,
},
});

class NavBarContainer extends React.Component {
constructor(props) {
super(props);
Expand All @@ -33,23 +50,6 @@ class NavBarContainer extends React.Component {
backButtonOpacity: 0,
previousRoute: {}, // Keep previousRoute for smooth transitions
};

this.styles = StyleSheet.create({
navbarContainer: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
height: Styles.NAV_BAR_HEIGHT,
},
navbarContainerHidden: {
position: 'absolute',
top: -Styles.NAV_BAR_HEIGHT,
left: 0,
right: 0,
height: Styles.NAV_BAR_HEIGHT,
},
});
}

componentDidMount() {
Expand Down Expand Up @@ -104,9 +104,9 @@ class NavBarContainer extends React.Component {
}

if (this.props.currentRoute.hideNavigationBar) {
navbarStyle = this.styles.navbarContainerHidden;
navbarStyle = styles.navbarContainerHidden;
} else {
navbarStyle = this.styles.navbarContainer;
navbarStyle = styles.navbarContainer;
}

if (this.props.currentRoute.trans) {
Expand Down
90 changes: 45 additions & 45 deletions components/NavBarContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,47 @@ const propTypes = {
willDisappear: PropTypes.bool,
};

const styles = StyleSheet.create({
navbar: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
height: Styles.NAV_BAR_HEIGHT,
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'row',
paddingTop: Styles.NAV_BAR_PADDING_TOP,
},
navbarText: {
color: 'white',
fontSize: 17,
margin: 10,
marginTop: Styles.NAV_BAR_TEXT_MARGIN_TOP,
marginBottom: Styles.NAV_BAR_TEXT_MARGIN_TOP,
fontWeight: '600',
textAlign: Styles.NAV_BAR_TEXT_ALIGN,
alignItems: 'center',
},
corner: {
flex: 1,
justifyContent: 'center',
},

alignLeft: {
alignItems: 'flex-start',
},
alignRight: {
alignItems: 'flex-end',
},
buttonTextLeft: {
marginLeft: 10,
},
buttonTextRight: {
marginRight: 10,
},
});

class NavBarContent extends React.Component {
constructor(props) {
super(props);
Expand All @@ -29,47 +70,6 @@ class NavBarContent extends React.Component {
this.state = {
opacity: this.props.willDisappear ? new Animated.Value(1) : new Animated.Value(0),
};

this.styles = StyleSheet.create({
navbar: {
position: 'absolute',
top: 0,
left: 0,
right: 0,
height: Styles.NAV_BAR_HEIGHT,
justifyContent: 'center',
alignItems: 'center',
flexDirection: 'row',
paddingTop: Styles.NAV_BAR_PADDING_TOP,
},
navbarText: {
color: 'white',
fontSize: 17,
margin: 10,
marginTop: Styles.NAV_BAR_TEXT_MARGIN_TOP,
marginBottom: Styles.NAV_BAR_TEXT_MARGIN_TOP,
fontWeight: '600',
textAlign: Styles.NAV_BAR_TEXT_ALIGN,
alignItems: 'center',
},
corner: {
flex: 1,
justifyContent: 'center',
},

alignLeft: {
alignItems: 'flex-start',
},
alignRight: {
alignItems: 'flex-end',
},
buttonTextLeft: {
marginLeft: 10,
},
buttonTextRight: {
marginRight: 10,
},
});
}

componentWillReceiveProps(newProps) {
Expand Down Expand Up @@ -145,7 +145,7 @@ class NavBarContent extends React.Component {

if (this.props.route.leftCorner || this.props.route.index > 0) {
leftCorner = (
<View style={[this.styles.corner, this.styles.alignLeft]}>
<View style={[styles.corner, styles.alignLeft]}>
{leftCornerContent}
</View>
);
Expand All @@ -167,7 +167,7 @@ class NavBarContent extends React.Component {
);

rightCorner = (
<View style={[this.styles.corner, this.styles.alignRight]}>
<View style={[styles.corner, styles.alignRight]}>
{rightCornerContent}
</View>
);
Expand All @@ -182,7 +182,7 @@ class NavBarContent extends React.Component {
titleContent = <TitleComponent {...this.props.titleProps} />;
} else {
titleContent = (
<Text style={[this.styles.navbarText, this.props.titleStyle]} numberOfLines={1}>
<Text style={[styles.navbarText, this.props.titleStyle]} numberOfLines={1}>
{this.props.route.name}
</Text>
);
Expand All @@ -207,7 +207,7 @@ class NavBarContent extends React.Component {
<Animated.View
style={
[
this.styles.navbar,
styles.navbar,
transitionStyle,
this.props.route.headerStyle,
{ borderBottomWidth: width, borderColor: color },
Expand Down
16 changes: 8 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ const propTypes = {
titleStyle: PropTypes.any.isRequired,
};

const styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#FFFFFF',
},
});

class Router extends React.Component {
constructor(props) {
super(props);
Expand All @@ -44,13 +51,6 @@ class Router extends React.Component {
},
};
this.emitter = new EventEmitter();

this.styles = StyleSheet.create({
container: {
flex: 1,
backgroundColor: '#FFFFFF',
},
});
}

onWillFocus(route) {
Expand Down Expand Up @@ -162,7 +162,7 @@ class Router extends React.Component {

return (
<View
style={[this.styles.container, this.props.bgStyle, extraStyling, { marginTop: margin }]}
style={[styles.container, this.props.bgStyle, extraStyling, { marginTop: margin }]}
>
<Content
name={route.name}
Expand Down