diff --git a/app/assets/styles/blink/_HistoryTileBox.scss b/app/assets/styles/blink/_HistoryTileBox.scss index ee7971b..d86fa4f 100644 --- a/app/assets/styles/blink/_HistoryTileBox.scss +++ b/app/assets/styles/blink/_HistoryTileBox.scss @@ -1,3 +1,4 @@ .container { - margin-top: 20px; + margin-top: 30px; + margin-bottom: 0px; } diff --git a/app/assets/styles/blink/_ReadyBox.scss b/app/assets/styles/blink/_ReadyBox.scss index 6930478..be3e59b 100644 --- a/app/assets/styles/blink/_ReadyBox.scss +++ b/app/assets/styles/blink/_ReadyBox.scss @@ -1,54 +1,54 @@ @import './variables'; .wholeContainer { flex: 1; flex-direction: column; justify-content: center; } .container { flex: 1; margin: 0 auto; width: 90%; padding-top: 10px; } .title { color: white; font-size: 20px; } .footer { flex: 1; justify-content: flex-end; padding-bottom: 15px; } .button { background-color: rgba(#6DAA63, .9); margin: 10px; padding-top: 2px; padding-left: 1px; } .conferenceButton { background-color: rgba(#4572a6, 1); margin: 10px; } .buttonGroup { flex-direction: row; margin: 0 auto; padding-top: 10px; } .uriInputBox { padding-top: 10px; } .history { - padding-top: 30px; - flex: 2.5; + padding-top: 140px; + flex: 9; width: 90%; margin: 0 auto; } diff --git a/app/components/HistoryCard.js b/app/components/HistoryCard.js index 52764a1..bd3654f 100644 --- a/app/components/HistoryCard.js +++ b/app/components/HistoryCard.js @@ -1,80 +1,84 @@ import React from 'react'; import { View } from 'react-native'; import PropTypes from 'prop-types'; import moment from 'moment'; import momentFormat from 'moment-duration-format'; import { Card, IconButton, Caption, Subheading } from 'react-native-paper'; import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; import styles from '../assets/styles/blink/_HistoryCard.scss'; import UserIcon from './UserIcon'; const HistoryCard = (props) => { const identity = { displayName: props.historyItem.displayName, uri: props.historyItem.remoteParty || props.historyItem } const startVideoCall = (e) => { e.stopPropagation(); props.setTargetUri(identity.uri); // We need to wait for targetURI setImmediate(() => { props.startVideoCall(e); }); } const startAudioCall = (e) => { e.stopPropagation(); props.setTargetUri(identity.uri); // We need to wait for targetURI setImmediate(() => { props.startAudioCall(e); }); } let duration = moment.duration(props.historyItem.duration, 'seconds').format('hh:mm:ss', {trim: false}); let color = {}; if (props.historyItem.direction === 'received' && props.historyItem.duration === 0) { color.color = '#a94442'; duration = 'missed'; } const name = identity.displayName || identity.uri; return ( {props.setTargetUri(identity.uri)}} - onPress={startVideoCall} + onPress={() => {props.setTargetUri(identity.uri)}} + onLongPress={startVideoCall} style={styles.container} > {name} ({duration}) {props.historyItem.startTime} + + ); + +/* +*/ + - - ); } HistoryCard.propTypes = { historyItem : PropTypes.object, startAudioCall : PropTypes.func.isRequired, startVideoCall : PropTypes.func.isRequired, setTargetUri : PropTypes.func.isRequired }; export default HistoryCard;