Merge branch '228-apply-design-to-settings' into 'master'
Resolve "apply design to settings" Closes #228 See merge request bloodyhealth/drip!95
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import React from 'react'
|
||||
import { TextInput } from 'react-native'
|
||||
import styles from '../../../styles'
|
||||
import styles, {secondaryColor} from '../../../styles'
|
||||
|
||||
export default function PasswordField(props) {
|
||||
return (
|
||||
@@ -11,6 +11,9 @@ export default function PasswordField(props) {
|
||||
onChangeText={props.onChangeText}
|
||||
value={props.value}
|
||||
placeholder={props.placeholder}
|
||||
borderWidth={1}
|
||||
borderColor={secondaryColor}
|
||||
borderStyle={'solid'}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -39,8 +39,8 @@ export default class TempSlider extends Component {
|
||||
render() {
|
||||
return (
|
||||
<View style={{ alignItems: 'center' }}>
|
||||
<AppText>{`${labels.tempScale.min} ${this.state.min}`}</AppText>
|
||||
<AppText>{`${labels.tempScale.max} ${this.state.max}`}</AppText>
|
||||
<AppText>{`${labels.tempScale.min} ${this.state.min.toFixed(1)}`}</AppText>
|
||||
<AppText>{`${labels.tempScale.max} ${this.state.max.toFixed(1)}`}</AppText>
|
||||
<Slider
|
||||
values={[this.state.min, this.state.max]}
|
||||
min={config.temperatureScale.min}
|
||||
|
||||
+7
-3
@@ -191,9 +191,13 @@ export default StyleSheet.create({
|
||||
width: 130
|
||||
},
|
||||
settingsSegment: {
|
||||
backgroundColor: 'lightgrey',
|
||||
padding: 10,
|
||||
marginBottom: 10,
|
||||
borderColor: secondaryColor,
|
||||
borderStyle: 'solid',
|
||||
borderWidth: 1,
|
||||
borderRadius: 10,
|
||||
marginTop: defaultTopMargin,
|
||||
marginHorizontal: defaultIndentation,
|
||||
padding: 7,
|
||||
},
|
||||
settingsSegmentTitle: {
|
||||
fontWeight: 'bold'
|
||||
|
||||
Reference in New Issue
Block a user