Reverts changes to app-modal and changes input window for notes on iOS

components/common/app-modal.js

@@ -1,9 +1,7 @@
 import React from 'react'
 import {
   Dimensions,
-  KeyboardAvoidingView,
   Modal,
-  Platform,
   StyleSheet,
   TouchableOpacity,
   View,
@@ -14,10 +12,6 @@ import CloseIcon from './close-icon'
 
 import { Sizes, Spacing } from '../../styles'
 
-const keyboardVerticalOffsetPlatformDependent = Platform.OS === 'ios' ? 40 : 0
-const keyboardBehaviorPlatformDependent =
-  Platform.OS === 'ios' ? 'position' : 'padding'
-
 const AppModal = ({ children, onClose }) => (
   <Modal
     animationType="fade"
@@ -25,19 +19,13 @@ const AppModal = ({ children, onClose }) => (
     transparent={true}
     visible={true}
   >
-    <KeyboardAvoidingView
+    <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
-      keyboardVerticalOffset={keyboardVerticalOffsetPlatformDependent}
+    <View style={styles.modalWindow}>
-      behavior={keyboardBehaviorPlatformDependent}
+      <View style={styles.headerContainer}>
-      style={styles.safeAreaView}
+        <CloseIcon onClose={onClose} />
-    >
-      <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
-      <View style={styles.modalWindow}>
-        <View style={styles.headerContainer}>
-          <CloseIcon onClose={onClose} />
-        </View>
-        {children}
       </View>
-    </KeyboardAvoidingView>
+      {children}
+    </View>
   </Modal>
 )
 
@@ -74,11 +62,6 @@ const styles = StyleSheet.create({
     elevation: 2, // works on android
     minWidth: '80%',
   },
-  safeAreaView: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
 })
 
 export default AppModal

components/cycle-day/symptom-edit-view.js

@@ -1,6 +1,12 @@
 import React, { useState } from 'react'
 import PropTypes from 'prop-types'
-import { ScrollView, StyleSheet, View } from 'react-native'
+import {
+  Dimensions,
+  Platform,
+  ScrollView,
+  StyleSheet,
+  View,
+} from 'react-native'
 
 import AppModal from '../common/app-modal'
 import AppSwitch from '../common/app-switch'
@@ -111,9 +117,12 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
   const noteText = symptom === 'note' ? data.value : data.note
   const inputProps = {
     multiline: true,
-    numberOfLines: 4,
+    numberOfLines: Platform.OS === 'ios' ? null : 4, // only Android
+    minHeight: Platform.OS === 'ios' ? styles.input.height : null,
+    maxHeight:
+      Platform.OS === 'ios' ? Dimensions.get('window').height * 0.4 : null,
+    style: symptom === 'note' ? null : styles.input, // overwrites previous 2 lines to fix note space in symptoms
     scrollEnabled: true,
-    style: styles.input,
     textAlignVertical: 'top',
   }
 
@@ -185,7 +194,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
           <Segment style={styles.segmentBorder}>
             <AppText>{symtomPage[symptom].note}</AppText>
             <AppTextInput
-              multiline={true}
+              {...inputProps}
               onChangeText={onEditNote}
               placeholder={sharedLabels.enter}
               testID="noteInput"