Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 60010f9760 | |||
| 2ee08c9769 | |||
| 3020967ed2 | |||
| dc2f867c2c | |||
| 90ad1cb12f | |||
| 010cabcefb |
@@ -134,8 +134,8 @@ android {
|
|||||||
applicationId "com.drip"
|
applicationId "com.drip"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 25
|
versionCode 27
|
||||||
versionName "1.2311.14"
|
versionName "1.2402.15"
|
||||||
ndk {
|
ndk {
|
||||||
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
|
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {
|
import {
|
||||||
Dimensions,
|
Dimensions,
|
||||||
|
KeyboardAvoidingView,
|
||||||
Modal,
|
Modal,
|
||||||
StyleSheet,
|
StyleSheet,
|
||||||
TouchableOpacity,
|
TouchableOpacity,
|
||||||
@@ -19,13 +20,15 @@ const AppModal = ({ children, onClose }) => (
|
|||||||
transparent={true}
|
transparent={true}
|
||||||
visible={true}
|
visible={true}
|
||||||
>
|
>
|
||||||
<TouchableOpacity onPress={onClose} style={styles.blackBackground} />
|
<KeyboardAvoidingView behavior={'padding'} style={styles.safeAreaView}>
|
||||||
<View style={styles.modalWindow}>
|
<TouchableOpacity onPress={onClose} style={styles.blackBackground} />
|
||||||
<View style={styles.headerContainer}>
|
<View style={styles.modalWindow}>
|
||||||
<CloseIcon onClose={onClose} />
|
<View style={styles.headerContainer}>
|
||||||
|
<CloseIcon onClose={onClose} />
|
||||||
|
</View>
|
||||||
|
{children}
|
||||||
</View>
|
</View>
|
||||||
{children}
|
</KeyboardAvoidingView>
|
||||||
</View>
|
|
||||||
</Modal>
|
</Modal>
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -62,6 +65,11 @@ const styles = StyleSheet.create({
|
|||||||
elevation: 2, // works on android
|
elevation: 2, // works on android
|
||||||
minWidth: '80%',
|
minWidth: '80%',
|
||||||
},
|
},
|
||||||
|
safeAreaView: {
|
||||||
|
flex: 1,
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export default AppModal
|
export default AppModal
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ const SymptomBox = ({
|
|||||||
<View style={styles.textContainer}>
|
<View style={styles.textContainer}>
|
||||||
<AppText style={symptomNameStyle}>{t(symptom)}</AppText>
|
<AppText style={symptomNameStyle}>{t(symptom)}</AppText>
|
||||||
{symptomDataToDisplay && (
|
{symptomDataToDisplay && (
|
||||||
<AppText style={textStyle} numberOfLines={4}>
|
<AppText style={textStyle} numberOfLines={3}>
|
||||||
{symptomDataToDisplay}
|
{symptomDataToDisplay}
|
||||||
</AppText>
|
</AppText>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -109,8 +109,8 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
|
|||||||
const noteText = symptom === 'note' ? data.value : data.note
|
const noteText = symptom === 'note' ? data.value : data.note
|
||||||
const inputProps = {
|
const inputProps = {
|
||||||
multiline: true,
|
multiline: true,
|
||||||
numberOfLines: 3,
|
numberOfLines: 4,
|
||||||
scrollEnabled: false,
|
scrollEnabled: true,
|
||||||
style: styles.input,
|
style: styles.input,
|
||||||
textAlignVertical: 'top',
|
textAlignVertical: 'top',
|
||||||
}
|
}
|
||||||
@@ -180,7 +180,7 @@ const SymptomEditView = ({ date, onClose, symptom, symptomData }) => {
|
|||||||
<Segment style={styles.segmentBorder}>
|
<Segment style={styles.segmentBorder}>
|
||||||
<AppText>{symtomPage[symptom].note}</AppText>
|
<AppText>{symtomPage[symptom].note}</AppText>
|
||||||
<AppTextInput
|
<AppTextInput
|
||||||
{...inputProps}
|
multiline={true}
|
||||||
onChangeText={onEditNote}
|
onChangeText={onEditNote}
|
||||||
placeholder={sharedLabels.enter}
|
placeholder={sharedLabels.enter}
|
||||||
testID="noteInput"
|
testID="noteInput"
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.2401.17</string>
|
<string>1.2402.15</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "drip.",
|
"name": "drip.",
|
||||||
"version": "1.2401.17",
|
"version": "1.2402.15",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
"Julia Friesel <julia.friesel@gmail.com>",
|
"Julia Friesel <julia.friesel@gmail.com>",
|
||||||
"Marie Kochsiek",
|
"Marie Kochsiek",
|
||||||
|
|||||||
Reference in New Issue
Block a user