From a35cd5eb512c35a62ecf10866db0b38ba76911af Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Thu, 3 Aug 2017 01:20:53 +0200 Subject: [PATCH] EventDetail: Minor style fixes --- src/modules/events/EventDetails.js | 65 +++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 15 deletions(-) diff --git a/src/modules/events/EventDetails.js b/src/modules/events/EventDetails.js index c5bc6da..b9fe3d8 100644 --- a/src/modules/events/EventDetails.js +++ b/src/modules/events/EventDetails.js @@ -19,11 +19,18 @@ export default class EventDetails extends Component { _formatDay(time) { return moment(time).format('DD.'); } + _formatLocalDay(time) { + return moment(time).format('ddd') + } _formatYear(time) { return moment(time).format('YYYY'); } + _formatRelative(time) { + return moment(time).fromNow(); + } + _onUrlPress(link) { Linking.openURL(link); } @@ -32,11 +39,11 @@ export default class EventDetails extends Component { const item = this.props.item; let image = null; if (item.thumbnail.medium_large) { - image = ; + image = ; } let price = null; if (item.price_regular && item.price_regular) { - price = Pris: {item.price_regular} - Medlemmer: {item.price_member}; + price = Pris: {item.price_regular} - Medlemmer: {item.price_member}; } let faceButton = null; if (item.facebook_url) { @@ -66,13 +73,22 @@ export default class EventDetails extends Component { {item.title.decoded} - {this._formatDay(item.start_time)} - {this._formatMonth(item.start_time)} - {year} + + {this._formatDay(item.start_time)} + {this._formatMonth(item.start_time)} + {year} + - - {item.venue} - kl. {this._formatTime(item.start_time)} + + + + {item.venue} + + + + {this._formatLocalDay(item.start_time)} kl. {this._formatTime(item.start_time)} - {this._formatTime(item.end_time)}, + {this._formatRelative(item.start_time)} + {price} @@ -113,18 +129,40 @@ const styles = StyleSheet.create({ }, image: { height: 260, + width: null }, time: { fontSize: 14, color: '#666' }, - info: { + metaIcon: { + width: 16, + paddingTop: 3, + }, + metaContainer: { + flex: 3, + paddingLeft: 10, + }, + metaInner: { + flexDirection: 'row' + }, + metaText: { color: '#000', }, + timeRelative: { + color: '#666', + }, content: { - paddingTop: 20, + borderTopWidth: 0.5, + borderColor: '#999', + marginTop: 16, + paddingTop: 10, }, dateContainer: { + width: 62, + justifyContent: 'center', + }, + dateCard: { borderColor: '#e1e8ee', borderWidth: 1, ...Platform.select({ @@ -135,10 +173,11 @@ const styles = StyleSheet.create({ shadowRadius: 2, }, android: { - elevation: 2, + elevation: 1, }, }), backgroundColor: '#fff', + paddingBottom: 6, }, day: { paddingTop: 5, @@ -160,10 +199,6 @@ const styles = StyleSheet.create({ paddingLeft: 20, paddingTop: 3, }, - infoContainer: { - flex: 3, - paddingLeft: 16, - }, buttonContainer: { flex: 1, justifyContent: 'center',