diff --git a/submodules/linphone b/submodules/linphone index 703dc8822..7b70508d9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 703dc88223b3bb31d0ba13e3c084a39b20317cfe +Subproject commit 7b70508d9591c794ec42a80438a11f067f665994 diff --git a/tests/assets/images/new_call_hovered.svg b/tests/assets/images/new_call_hovered.svg new file mode 100644 index 000000000..24dea57ff --- /dev/null +++ b/tests/assets/images/new_call_hovered.svg @@ -0,0 +1,15 @@ + + + + new_call_clic + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/tests/assets/images/new_call_normal.svg b/tests/assets/images/new_call_normal.svg new file mode 100644 index 000000000..0864cecea --- /dev/null +++ b/tests/assets/images/new_call_normal.svg @@ -0,0 +1,15 @@ + + + + new_call_default + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/tests/assets/images/new_call_pressed.svg b/tests/assets/images/new_call_pressed.svg new file mode 100644 index 000000000..0864cecea --- /dev/null +++ b/tests/assets/images/new_call_pressed.svg @@ -0,0 +1,15 @@ + + + + new_call_default + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/tests/assets/images/new_conference_hovered.svg b/tests/assets/images/new_conference_hovered.svg new file mode 100644 index 000000000..d2d458f78 --- /dev/null +++ b/tests/assets/images/new_conference_hovered.svg @@ -0,0 +1,13 @@ + + + + new_conference_clic + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/tests/assets/images/new_conference_normal.svg b/tests/assets/images/new_conference_normal.svg new file mode 100644 index 000000000..e1680ec5f --- /dev/null +++ b/tests/assets/images/new_conference_normal.svg @@ -0,0 +1,13 @@ + + + + new_conference_default + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/tests/assets/images/new_conference_pressed.svg b/tests/assets/images/new_conference_pressed.svg new file mode 100644 index 000000000..e1680ec5f --- /dev/null +++ b/tests/assets/images/new_conference_pressed.svg @@ -0,0 +1,13 @@ + + + + new_conference_default + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/tests/resources.qrc b/tests/resources.qrc index 906905702..f4feab72c 100644 --- a/tests/resources.qrc +++ b/tests/resources.qrc @@ -77,6 +77,12 @@ assets/images/micro_on_pressed.svg assets/images/missed_incoming_call.svg assets/images/missed_outgoing_call.svg + assets/images/new_call_hovered.svg + assets/images/new_call_normal.svg + assets/images/new_call_pressed.svg + assets/images/new_conference_hovered.svg + assets/images/new_conference_normal.svg + assets/images/new_conference_pressed.svg assets/images/options_hovered.svg assets/images/options_normal.svg assets/images/options_pressed.svg diff --git a/tests/ui/views/App/Calls/Calls.qml b/tests/ui/views/App/Calls/Calls.qml index 8be5b284f..db72c322a 100644 --- a/tests/ui/views/App/Calls/Calls.qml +++ b/tests/ui/views/App/Calls/Calls.qml @@ -1,3 +1,4 @@ +import QtGraphicalEffects 1.0 import QtQuick 2.7 import QtQuick.Controls 2.0 import QtQuick.Layouts 1.3 @@ -28,7 +29,52 @@ Window { childA: Rectangle { anchors.fill: parent - color: 'yellow' + color: '#FFFFFF' + + ColumnLayout { + anchors.fill: parent + + Item { + Layout.fillWidth: true + Layout.preferredHeight: 60 + + LinearGradient { + anchors.fill: parent + + start: Qt.point(0, 0) + end: Qt.point(0, height) + + gradient: Gradient { + GradientStop { position: 0.0; color: '#FFFFFF' } + GradientStop { position: 1.0; color: '#E3E3E3' } + } + } + + ActionBar { + anchors { + left: parent.left + leftMargin: 10 + verticalCenter: parent.verticalCenter + } + + iconSize: 40 + + ActionButton { + icon: 'new_call' + } + + ActionButton { + icon: 'new_conference' + } + } + } + + ListView { + Layout.fillWidth: true + Layout.fillHeight: true + spacing: 0 + } + } } /* childA: ColumnLayout { */ diff --git a/tests/ui/views/App/MainWindow/Contacts.qml b/tests/ui/views/App/MainWindow/Contacts.qml index bf8c61d67..d477e48bd 100644 --- a/tests/ui/views/App/MainWindow/Contacts.qml +++ b/tests/ui/views/App/MainWindow/Contacts.qml @@ -198,7 +198,12 @@ ColumnLayout { Layout.preferredWidth: ContactsStyle.contact.username.width color: ContactsStyle.contact.username.color elide: Text.ElideRight - font.bold: true + + font { + bold: true + pointSize: ContactsStyle.contact.username.fontSize + } + text: $contact.username MouseArea { diff --git a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml index 03ad4a1d3..9da48b4b4 100644 --- a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml @@ -43,6 +43,7 @@ QtObject { property QtObject username: QtObject { property color color: Colors.j + property int fontSize: 9 property int width: 220 } }