Merge pull request #6 from scottdj92/fixing-android

Fixing android

ios/t7ChickenNative/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,38 +1 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "40x40",
-      "scale" : "3x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "60x60",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"idiom":"iphone","size":"29x29","scale":"2x","filename":"58pt-tc-logo.png"},{"idiom":"iphone","size":"29x29","scale":"3x","filename":"87pt-tc-logo.png"},{"idiom":"iphone","size":"40x40","scale":"2x","filename":"80pt-tc-logo.png"},{"idiom":"iphone","size":"40x40","scale":"3x","filename":"120pt-tc-logo.png"},{"idiom":"iphone","size":"60x60","scale":"2x","filename":"120pt-tc-logo.png"},{"idiom":"iphone","size":"60x60","scale":"3x","filename":"180pt-tc-logo.png"}],"info":{"version":1,"author":"xcode"}}

package.json

@@ -7,10 +7,12 @@
     "test": "jest"
   },
   "rnpm": {
-    "assets": ["./src/fonts/Exo_2"]
+    "assets": [
+      "./src/fonts/Exo_2"
+    ]
   },
   "dependencies": {
-    "@exponent/ex-navigation": "^2.1.5",
+    "@exponent/ex-navigation": "2.1.5",
     "babel": "^6.5.2",
     "babel-core": "^6.18.2",
     "babel-preset-react-native": "^1.9.0",
@@ -19,8 +21,10 @@
     "fetch": "^1.1.0",
     "react": "15.4.1",
     "react-dom": "^15.4.1",
-    "react-native": "^0.40.0",
-    "react-native-accordion": "^1.0.1",
+    "react-native": "0.40.0",
+    "react-native-accordion": "git+https://github.com/ndejesus1227/react-native-accordion.git",
+    "react-native-checkbox": "^1.1.0",
+    "react-native-drawer": "^2.3.0",
     "react-native-dropdown": "git+https://github.com/g6ling/react-native-dropdown.git",
     "react-native-side-menu": "^0.20.1",
     "react-redux": "^4.4.6",

src/components/CharacterProfile/ProfileBanner.js

@@ -4,15 +4,13 @@ import {
   Text,
   Image
 } from 'react-native';
-import Toolbar from '../Toolbar/Toolbar';
 
 import Styles from './styles';
 
 class ProfileBanner extends Component {
   render() {
     return (
       <View style={Styles.viewContainer}>
-        <Toolbar name={this.props.name} />
       </View>
     );
   }

src/components/CharacterProfile/styles.js

@@ -4,8 +4,7 @@ import {
 
 export default Styles = StyleSheet.create({
   viewContainer: {
-		height: 70,
-		backgroundColor: 'rgb(65, 18, 18)',
+
   },
 	commandListContainer: {
 		backgroundColor: 'rgb(65, 18, 18)',

src/components/DataList/DataList.js

@@ -100,5 +100,23 @@ const styles = StyleSheet.create({
   }
 });
 
+DataList.propTypes = {
+  listData: PropTypes.array,
+  cellComponent: PropTypes.func, // component
+  cellsPerRow: PropTypes.number,
+  onCellPress: PropTypes.func,
+  /*
+    Stylesheet Properties
+    (comes as number or array when passed, so it can't be specified)
+
+    Props:              Description:
+    -----               ------------
+    mainStyle           List base style
+    containerStyle      List Row Container style
+    rowStyle            List Row styling
+    cellStyle           List Cell style
+  */
+};
+
 
 export default DataList;

src/components/FilterMenu/FilterAccordion.js

@@ -0,0 +1,73 @@
+import React, { Component, PropTypes } from 'react';
+import {
+  Text,
+  View,
+  StyleSheet,
+  Button
+} from 'react-native';
+
+// Components
+import Accordion from 'react-native-accordion';
+import FilterButtonGroup from './FilterButtonGroup';
+
+class FilterAccordion extends Component {
+
+  renderHeader(label) {
+    return (
+      <View>
+        <Text style={Styles.filterTitle}>{label}</Text>
+      </View>
+    );
+  }
+  renderFilterOptions(filterKey, options, callback) {
+    return (
+      <View>
+        <FilterButtonGroup
+          filterKey={filterKey}
+          options={options}
+          onOptionSelectHandler={(key, value, addFlag) => callback(key, value, addFlag)}
+        />
+      </View>
+    );
+  }
+
+  render() {
+    const { filterKey, options, onFilterPressHandler, headerLabel } = this.props;
+    const header = this.renderHeader(headerLabel);
+    const content = this.renderFilterOptions(filterKey, options, onFilterPressHandler);
+    return (
+      <Accordion
+        header={header}
+        content={content}
+        easing="easeOutCubic"
+        underlayColor="white"
+      />
+    );
+  }
+}
+
+const Styles = StyleSheet.create({
+  accordionContainer: {
+    height: 40,
+    width: 240,
+		backgroundColor: 'rgb(132, 18, 18)'
+  },
+  filterTitle: {
+    color: '#f0aa23',
+    height: 50,
+    borderStyle: 'solid',
+    borderWidth: 1,
+    borderColor: 'rgb(132, 18, 18)',
+    paddingLeft: 10,
+    paddingTop: 10
+  },
+  filterButton: {
+  }
+});
+
+FilterAccordion.propTypes = {
+  filter: PropTypes.object,
+  onFilterPressHandler: PropTypes.func,
+};
+
+export default FilterAccordion;

src/components/FilterMenu/FilterButtonGroup.js

@@ -0,0 +1,68 @@
+import React, { Component, PropTypes } from 'react';
+import {
+  View,
+  StyleSheet,
+  Button
+} from 'react-native';
+import CheckBox from 'react-native-checkbox';
+
+// Filter Option Button
+class FilterButtonGroup extends Component {
+  constructor(props) {
+    super(props);
+    this.state = { active: [] };
+  }
+
+  resetButtonState() {
+    this.setState({ active: [] });
+  }
+
+  updateButtonState(index, checked) {
+    if (checked) {
+      this.state.active.push(index);
+    } else {
+      this.state.active.splice( this.state.active.indexOf(index), 1);
+    }
+  }
+
+  toggleCheck(filterKey, filterValue, checked, index) {
+    this.props.onOptionSelectHandler(filterKey, filterValue, checked);
+    this.updateButtonState(index, checked);
+  }
+
+  renderButtons(options, filterKey) {
+    return (
+      options.map((option, i) =>
+        <View style={(this.state.active === i) ? Styles.activeOption : ''} key={i}>
+          <CheckBox
+            color="white"
+            label={option.label}
+            onChange={(checked) => this.toggleCheck(filterKey, option.value, !checked, i)}
+          />
+        </View>
+      )
+    );
+  }
+
+  render() {
+    const { options, filterKey } = this.props;
+    return (
+      <View>
+        {this.renderButtons(options, filterKey)}
+      </View>
+    );
+  }
+}
+
+const Styles = StyleSheet.create({
+  activeOption: {
+    backgroundColor: "black"
+  }
+});
+
+FilterButtonGroup.propTypes = {
+  options: PropTypes.array,
+  onOptionSelectHandler: PropTypes.func,
+};
+
+export default FilterButtonGroup;