Adapt note field for temperature and note

android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "com.drip"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 25
-        versionName "1.2311.14"
+        versionCode 27
+        versionName "1.2402.15"
         ndk {
             abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }

components/common/app-modal.js

@@ -1,6 +1,7 @@
 import React from 'react'
 import {
   Dimensions,
+  KeyboardAvoidingView,
   Modal,
   StyleSheet,
   TouchableOpacity,
@@ -19,6 +20,7 @@ const AppModal = ({ children, onClose }) => (
     transparent={true}
     visible={true}
   >
+    <KeyboardAvoidingView behavior={'padding'} style={styles.safeAreaView}>
       <TouchableOpacity onPress={onClose} style={styles.blackBackground} />
       <View style={styles.modalWindow}>
         <View style={styles.headerContainer}>
@@ -26,6 +28,7 @@ const AppModal = ({ children, onClose }) => (
         </View>
         {children}
       </View>
+    </KeyboardAvoidingView>
   </Modal>
 )
 
@@ -62,6 +65,11 @@ 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

@@ -110,7 +110,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
   const inputProps = {
     multiline: true,
     numberOfLines: 3,
-    scrollEnabled: false,
+    scrollEnabled: true,
     style: styles.input,
     textAlignVertical: 'top',
   }
@@ -176,11 +176,13 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
             />
           </Segment>
         )}
+        {/* this code below applies to the note field in temperature and the note tracking category */}
         {shouldShow(symptomConfig.note) && (
           <Segment style={styles.segmentBorder}>
             <AppText>{symtomPage[symptom].note}</AppText>
             <AppTextInput
-              {...inputProps}
+              {...(symptom === 'temperature' ? { inputProps } : {})}
+              multiline={true}
               onChangeText={onEditNote}
               placeholder={sharedLabels.enter}
               testID="noteInput"

ios/drip/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2401.17</string>
+	<string>1.2402.15</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "drip.",
-  "version": "1.2401.17",
+  "version": "1.2402.15",
   "contributors": [
     "Julia Friesel <julia.friesel@gmail.com>",
     "Marie Kochsiek",