From 8574fd1f6738554c39f773829f83a332792960ce Mon Sep 17 00:00:00 2001
From: tina <lt-bloody@riox.eu>
Date: Mon, 1 Oct 2018 17:54:33 +0200
Subject: [PATCH] changes design of settings page
---
components/settings/password/password-field.js | 5 ++++-
components/settings/temp-slider.js | 4 ++--
styles/index.js | 10 +++++++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/components/settings/password/password-field.js b/components/settings/password/password-field.js
index 71935668..1757331e 100644
--- a/components/settings/password/password-field.js
+++ b/components/settings/password/password-field.js
@@ -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'}
/>
)
}
diff --git a/components/settings/temp-slider.js b/components/settings/temp-slider.js
index f21fd740..cc4b0e4c 100644
--- a/components/settings/temp-slider.js
+++ b/components/settings/temp-slider.js
@@ -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}
diff --git a/styles/index.js b/styles/index.js
index 3d19cf39..c3bbc4d9 100644
--- a/styles/index.js
+++ b/styles/index.js
@@ -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'
--
GitLab