Merge pull request #38 from charpeni/move-styles

Move styles outside of constructor

Author: davidLeonardi

components/NavBarContainer.js

@@ -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);
@@ -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() {
@@ -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) {

components/NavBarContent.js

@@ -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);
@@ -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) {
@@ -147,7 +147,7 @@ class NavBarContent extends React.Component {
 
     if (Platform.OS === 'ios' || 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>
       );
@@ -171,7 +171,7 @@ class NavBarContent extends React.Component {
 
     if (Platform.OS === 'ios' || this.props.route.rightCorner || this.props.rightCorner) {
       rightCorner = (
-        <View style={[this.styles.corner, this.styles.alignRight]}>
+        <View style={[styles.corner, styles.alignRight]}>
           {rightCornerContent}
         </View>
       );
@@ -186,7 +186,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>
       );
@@ -211,7 +211,7 @@ class NavBarContent extends React.Component {
       <Animated.View
         style={
           [
-            this.styles.navbar,
+            styles.navbar,
             transitionStyle,
             this.props.route.headerStyle,
             { borderBottomWidth: width, borderColor: color },

index.js

@@ -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);
@@ -44,13 +51,6 @@ class Router extends React.Component {
       },
     };
     this.emitter = new EventEmitter();
-
-    this.styles = StyleSheet.create({
-      container: {
-        flex: 1,
-        backgroundColor: '#FFFFFF',
-      },
-    });
   }
 
   onWillFocus(route) {
@@ -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}