Merge branch 'development' into another_skip

Alastair2D · Oct 26, 2018 · dc3e343 · dc3e343
2 parents f62ab10 b1f88aa
commit dc3e343
Show file tree

Hide file tree

Showing 10 changed files with 2,897 additions and 2,781 deletions.
diff --git a/__test__/ConfirmModal.test.js b/__test__/ConfirmModal.test.js
@@ -82,4  82,22 @@ describe('ConfirmModal', () => {
       expect(Alert.alert).toHaveBeenCalledWith('Modal has been closed.')
     });
   });
-})
 
   describe('clicking to change style', () => {
     it('changes confirmPressStatus when clicked', () => {
       cM.find('#finalConfirm').simulate('press');
       expect(cM.state().confirmPressStatus).toEqual(true);
     });
   });
 
   describe('state', () => {
     it('is a method to return the state', () => {
       const returnedState = cM.state();
       expect(returnedState).toEqual({
         modalVisible: false,
         confirmPressStatus: true,
         cancelPressStatus: true,
       });
     });
   });
 });
diff --git a/__test__/PreviousSite.test.js b/__test__/PreviousSite.test.js
@@ -6,13  6,23 @@ import injectionsites from "../components/injectionsites";
 
 describe('PreviousSite', () => {
   it('renders text of previous site location and time', () => {
-    const time = moment()
-    const calTime = time.calendar()
-    const app = shallow(<PreviousSite site={ injectionsites[0] } time={time}/>);
     const time = moment();
     const app = shallow(<PreviousSite site={injectionsites[0]} time={time}/>);
     const text = app
       .find('#site')
       .dive()
       .text();
-    expect(text).toEqual("Previous: Left Thigh 1, "   calTime);
-  })
     expect(text).toEqual('Left Thigh 1\n');
   });
 
   it('renders the time of the last injection', () => {
     const time = moment();
     const calTime = time.calendar();
     const app = shallow(<PreviousSite site={injectionsites[0]} time={time}/>);
     const text = app
       .find('#time')
       .dive()
       .text();
     expect(text).toEqual(calTime);
   });
 });
diff --git a/__test__/__snapshots__/BodyImages.test.js.snap b/__test__/__snapshots__/BodyImages.test.js.snap
@@ -6,9  6,9 @@ exports[`BodyImages renders correctly 1`] = `
     style={
       Object {
         "alignSelf": "center",
-        "height": 280,
-        "padding": 10,
-        "width": 180,
         "height": 290,
         "padding": 5,
         "width": 220,
       }
     }
   />

diff --git a/assets/images/bizz.png b/assets/images/bizz.png
diff --git a/components/BodyImages.js b/components/BodyImages.js
@@ -64,9  64,9 @@ export default class BodyImages extends Component {
 
 const styles = StyleSheet.create({
   image: {
-    width: 180,
-    height: 280,
-    padding: 10,
     width: 220,
     height: 290,
     padding: 5,
     alignSelf: 'center'
   }
 });
diff --git a/components/ConfirmModal.js b/components/ConfirmModal.js
@@ -8,7  8,13 @@ import { nextInjSite, rotateNSites } from '../redux/actions/sites';
 export default class ConfirmModal extends Component {
   state = {
     modalVisible: false,
-  };
     confirmPressStatus: true,
     cancelPressStatus: true,
     };
 
   state() {
     return this.state;
   }
 
   setModalVisible(visible) {
     this.setState({ modalVisible: visible });
@@ -29,25  35,59 @@ export default class ConfirmModal extends Component {
         >
           <View style={styles.container}>
             <View>
-              <Text>
-                Confirm injection site: {this.props.site.side} {this.props.site.part} {this.props.site.quadrant} {'\n'}
               <Text style={{fontSize: 20, fontStyle: 'italic'}}>
                 Confirm injection site:{'\n'}
               </Text>
               <Text style={{ fontWeight: 'bold', textAlign: 'center', fontSize: 20 }}>
                 {this.props.site.side} {this.props.site.part} {this.props.site.quadrant} {'\n'}
               </Text>
               <TouchableHighlight
                 underlayColor={'orange'}
                 activeOpacity={1}
                 id={"finalConfirm"}
                 style={
                   this.state.confirmPressStatus
                     ? styles.buttonPress
                     : styles.button
                 }
                 onPress={() => {
                   this.setModalVisible(!this.state.modalVisible);
                   this.props.onConfirmation();
                 }}
               >
-                <Text style={styles.text}>Confirm</Text>
                 <Text style={
                   this.state.confirmPressStatus
                     ? styles.welcomePress
                     : styles.welcome
                 }
                 >
                 Confirm
                 </Text>
               </TouchableHighlight>
               <Text>
                 {'\n'}
               </Text>
               <TouchableHighlight
                 underlayColor={'#000066'}
                 activeOpacity={1}
                 id={"cancel"}
                 style={
                   this.state.cancelPressStatus
                     ? styles.button
                     : styles.buttonPress
                 }
 
                 onPress={() => {
                   this.setModalVisible(!this.state.modalVisible);
                 }}
               >
-                <Text style={styles.text}>Cancel</Text>
                 <Text style={
                   this.state.cancelPressStatus
                     ? styles.welcome
                     : styles.welcomePress
                }>
                   Cancel
                 </Text>
               </TouchableHighlight>
             </View>
           </View>
@@ -80,5  120,28 @@ const styles = StyleSheet.create({
   text: {
     textAlign: 'center',
     fontSize: 20
   },
   welcome: {
     fontSize: 20,
     textAlign: "center",
     margin: 10,
     color: "#ffffff"
  },
   welcomePress: {
     fontSize: 20,
     textAlign: "center",
     margin: 10,
     color: "#ffffff"
   },
   button: {
     borderColor: "#000066",
     borderWidth: 1,
     borderRadius: 10,
   },
   buttonPress: {
     borderColor: "#000066",
     backgroundColor: "#000066",
     borderWidth: 1,
     borderRadius: 10,
   }
 });
diff --git a/components/PreviousSite.js b/components/PreviousSite.js
@@ -4,9  4,10 @@ import { StyleSheet, Text, View } from 'react-native';
 class PreviousSite extends Component {
   render() {
     return (
-      <View>
-        <Text id="site" style={styles.previous}>
-          Previous: { this.props.site.side } { this.props.site.part } { this.props.site.quadrant }, {this.props.time.calendar()}
       <View style={{ marginBottom: 10 }}>
         <Text>
           <Text style={styles.previous}>Previous: </Text> <Text id="site" style={styles.site}>{ this.props.site.side } { this.props.site.part } { this.props.site.quadrant }{'\n'}</Text>
           <Text style={styles.previous}>When:       </Text><Text id="time" style={styles.site}>{this.props.time.calendar()}</Text>
         </Text>
       </View>
     );
@@ -15,8  16,15 @@ class PreviousSite extends Component {
 
 const styles = StyleSheet.create({
   previous: {
-    fontSize: 25,
-    textAlign: 'center',
     fontStyle: 'italic',
   },
   site: {
     fontWeight: 'bold',
   },
   timeText: {
     fontStyle: 'italic',
     marginLeft: 30,
     fontWeight: 'bold',
   },
 });
 

diff --git a/navigation/MainTabNavigator.js b/navigation/MainTabNavigator.js
@@ -39,8  39,8 @@ HistoryStack.navigationOptions = {
       focused={focused}
       name={
         Platform.OS === 'ios'
-          ? `ios-link${focused ? '' : '-outline'}`
-          : 'md-link'
           ? `ios-book${focused ? '' : '-outline'}`
           : 'md-book'
       }
     />
   )
@@ -57,8  57,8 @@ SettingsStack.navigationOptions = {
       focused={focused}
       name={
         Platform.OS === 'ios'
-          ? `ios-options${focused ? '' : '-outline'}`
-          : 'md-options'
           ? `ios-settings${focused ? '' : '-outline'}`
           : 'md-settings'
       }
     />
   )