Skip to content

GitLab

Commit 746809df authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'fix/registration-screen-layout' into 'master' 

Add separate description to event registration fields

Closes #91

See merge request !226
parents 404be9cc 00ced1e1
Hide whitespace changes
Inline Side-by-side
app/ui/screens/events/RegistrationScreen.js
View file @ 746809df
......@@ -2,6 +2,7 @@ import React, { Component } from 'react';
import {
ActivityIndicator,
KeyboardAvoidingView,
Linking,
Modal,
ScrollView,
Switch,
......@@ -11,6 +12,7 @@ import {
} from 'react-native';
import { translate } from 'react-i18next';
import PropTypes from 'prop-types';
import HTML from 'react-native-render-html';
import styles from './style/RegistrationScreen';
import Colors from '../../style/Colors';
......@@ -94,6 +96,10 @@ class RegistrationScreen extends Component {
const keys = Object.keys(this.props.fields);
const linkStyles = {
color: Colors.magenta,
};
return (
<KeyboardAvoidingView
style={styles.rootWrapper}
......@@ -134,6 +140,14 @@ class RegistrationScreen extends Component {
onTintColor={Colors.magenta}
/>
</View>
<HTML
html={field.description}
onLinkPress={(event, href) => Linking.openURL(href)}
baseFontStyle={styles.description}
tagsStyles={{
a: linkStyles,
}}
/>
{validity.isValid || (
<Text style={styles.invalid}>
{validity.reason}
......@@ -147,6 +161,14 @@ class RegistrationScreen extends Component {
<Text style={styles.field}>
{field.label}
</Text>
<HTML
html={field.description}
onLinkPress={(event, href) => Linking.openURL(href)}
baseFontStyle={styles.description}
tagsStyles={{
a: linkStyles,
}}
/>
<TextInput
value={this.state[key]}
onChangeText={value => this.updateField(key, value)}
......@@ -154,7 +176,6 @@ class RegistrationScreen extends Component {
style={styles.field}
underlineColorAndroid={validity.isValid ? Colors.lightGray
: Colors.lightRed}
placeholder={field.description}
/>
{validity.isValid || (
<Text style={styles.invalid}>
......
app/ui/screens/events/style/RegistrationScreen.js
View file @ 746809df
......@@ -39,6 +39,18 @@ const styles = StyleSheet.create({
},
fontSize: 14,
color: Colors.textColour,
marginBottom: 8,
},
description: {
android: {
fontFamily: 'sans-serif-medium',
},
ios: {
fontFamily: 'System',
fontWeight: '600',
},
fontSize: 12,
color: Colors.gray,
},
invalid: {
android: {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment