Skip to content
Snippets Groups Projects
Commit 33fa429f authored by tina's avatar tina
Browse files

Merge branch '228-apply-design-to-settings' into 'master'

Resolve "apply design to settings"

Closes #228

See merge request bloodyhealth/drip!95
parents bd37c118 8574fd1f
No related branches found
No related tags found
No related merge requests found
import React from 'react' import React from 'react'
import { TextInput } from 'react-native' import { TextInput } from 'react-native'
import styles from '../../../styles' import styles, {secondaryColor} from '../../../styles'
export default function PasswordField(props) { export default function PasswordField(props) {
return ( return (
...@@ -11,6 +11,9 @@ export default function PasswordField(props) { ...@@ -11,6 +11,9 @@ export default function PasswordField(props) {
onChangeText={props.onChangeText} onChangeText={props.onChangeText}
value={props.value} value={props.value}
placeholder={props.placeholder} placeholder={props.placeholder}
borderWidth={1}
borderColor={secondaryColor}
borderStyle={'solid'}
/> />
) )
} }
...@@ -39,8 +39,8 @@ export default class TempSlider extends Component { ...@@ -39,8 +39,8 @@ export default class TempSlider extends Component {
render() { render() {
return ( return (
<View style={{ alignItems: 'center' }}> <View style={{ alignItems: 'center' }}>
<AppText>{`${labels.tempScale.min} ${this.state.min}`}</AppText> <AppText>{`${labels.tempScale.min} ${this.state.min.toFixed(1)}`}</AppText>
<AppText>{`${labels.tempScale.max} ${this.state.max}`}</AppText> <AppText>{`${labels.tempScale.max} ${this.state.max.toFixed(1)}`}</AppText>
<Slider <Slider
values={[this.state.min, this.state.max]} values={[this.state.min, this.state.max]}
min={config.temperatureScale.min} min={config.temperatureScale.min}
......
...@@ -191,9 +191,13 @@ export default StyleSheet.create({ ...@@ -191,9 +191,13 @@ export default StyleSheet.create({
width: 130 width: 130
}, },
settingsSegment: { settingsSegment: {
backgroundColor: 'lightgrey', borderColor: secondaryColor,
padding: 10, borderStyle: 'solid',
marginBottom: 10, borderWidth: 1,
borderRadius: 10,
marginTop: defaultTopMargin,
marginHorizontal: defaultIndentation,
padding: 7,
}, },
settingsSegmentTitle: { settingsSegmentTitle: {
fontWeight: 'bold' fontWeight: 'bold'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment