diff --git a/android/app/src/main/ic_launcher-web.png b/android/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..57e1905 Binary files /dev/null and b/android/app/src/main/ic_launcher-web.png differ diff --git a/android/app/src/main/res/drawable-hdpi/phone_account_icon.png b/android/app/src/main/res/drawable-hdpi/phone_account_icon.png new file mode 100644 index 0000000..1e40ce4 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/phone_account_icon.png differ diff --git a/android/app/src/main/res/drawable-mdpi/phone_account_icon.png b/android/app/src/main/res/drawable-mdpi/phone_account_icon.png new file mode 100644 index 0000000..4039ac1 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/phone_account_icon.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/phone_account_icon.png b/android/app/src/main/res/drawable-xhdpi/phone_account_icon.png new file mode 100644 index 0000000..d8cd874 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/phone_account_icon.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/phone_account_icon.png b/android/app/src/main/res/drawable-xxhdpi/phone_account_icon.png new file mode 100644 index 0000000..33806c4 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/phone_account_icon.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/phone_account_icon.png b/android/app/src/main/res/drawable-xxxhdpi/phone_account_icon.png new file mode 100644 index 0000000..2f642d7 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/phone_account_icon.png differ diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1dbce94 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..1477aa9 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..72379bb Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..985701b Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..11fe2d2 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..beab31f --- /dev/null +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #000000 + \ No newline at end of file diff --git a/app/assets/styles/blink/_HistoryCard.scss b/app/assets/styles/blink/_HistoryCard.scss index adad9f2..84317d0 100644 --- a/app/assets/styles/blink/_HistoryCard.scss +++ b/app/assets/styles/blink/_HistoryCard.scss @@ -1,12 +1,17 @@ .content { flex: 1; flex-direction: row; } .mainContent { width: 80%; } .userAvatarContent { width: 20%; +} + +.container { + margin-top: 10px; + border-radius: 5px; } \ No newline at end of file diff --git a/app/assets/styles/blink/_ReadyBox.scss b/app/assets/styles/blink/_ReadyBox.scss index b976903..6930478 100644 --- a/app/assets/styles/blink/_ReadyBox.scss +++ b/app/assets/styles/blink/_ReadyBox.scss @@ -1,51 +1,54 @@ @import './variables'; .wholeContainer { flex: 1; flex-direction: column; justify-content: center; } .container { + flex: 1; margin: 0 auto; width: 90%; - padding-top: 5%; + 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; width: 90%; margin: 0 auto; } diff --git a/app/components/HistoryCard.js b/app/components/HistoryCard.js index 091804a..f72e150 100644 --- a/app/components/HistoryCard.js +++ b/app/components/HistoryCard.js @@ -1,80 +1,81 @@ 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} + style={styles.container} > {name} ({duration}) {props.historyItem.startTime} ); } HistoryCard.propTypes = { classes : PropTypes.object.isRequired, historyItem : PropTypes.object, startAudioCall : PropTypes.func.isRequired, startVideoCall : PropTypes.func.isRequired, setTargetUri : PropTypes.func.isRequired }; export default HistoryCard;