From 940ef644e3923ebc13e6787451bde46a26490e62 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 29 Jun 2022 17:31:48 +0200 Subject: [PATCH] Change dialpad button design. Lighter borders in conference creation. Timepicker : highlight button with circle and same color, add 5 minutes. Fix gray mask/mouse area on recent contacts in chat creation when already selected. --- linphone-app/assets/images/dialpad_custom.svg | 162 ++++++++---------- .../other/colors/ColorListModel.hpp | 1 + .../ui/modules/Common/Picker/TimePicker.qml | 14 +- .../Common/Styles/Picker/TimePickerStyle.qml | 2 +- .../ui/views/App/Main/Dialogs/NewChatRoom.qml | 9 +- .../App/Styles/Dialog/NewConferenceStyle.qml | 2 +- 6 files changed, 89 insertions(+), 101 deletions(-) diff --git a/linphone-app/assets/images/dialpad_custom.svg b/linphone-app/assets/images/dialpad_custom.svg index cc3128483..a1ab5a8ed 100644 --- a/linphone-app/assets/images/dialpad_custom.svg +++ b/linphone-app/assets/images/dialpad_custom.svg @@ -5,7 +5,7 @@ viewBox="0 0 80 80" fill="none" version="1.1" - id="svg14" + id="svg20" sodipodi:docname="dialpad_custom.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" @@ -13,9 +13,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + id="defs24" /> - - - - - - - - - + inkscape:current-layer="svg20" /> + + + + + + + + + + + diff --git a/linphone-app/src/components/other/colors/ColorListModel.hpp b/linphone-app/src/components/other/colors/ColorListModel.hpp index 1b8b2a3a5..b65ac26a0 100644 --- a/linphone-app/src/components/other/colors/ColorListModel.hpp +++ b/linphone-app/src/components/other/colors/ColorListModel.hpp @@ -307,6 +307,7 @@ class ColorListModel : public ProxyListModel { */ ADD_COLOR("border", "black", "Borders") + ADD_COLOR("border_light", "#A8A8A8", "Lighter borders") diff --git a/linphone-app/ui/modules/Common/Picker/TimePicker.qml b/linphone-app/ui/modules/Common/Picker/TimePicker.qml index 0d5936f9f..c9aba081e 100644 --- a/linphone-app/ui/modules/Common/Picker/TimePicker.qml +++ b/linphone-app/ui/modules/Common/Picker/TimePicker.qml @@ -39,8 +39,8 @@ Item{ width: 30 * 1.5 height: width radius: width / 2 - border.color: "darkgray" - color: TimePickerStyle.hoursColor + border.color: TimePickerStyle.hoursColor + border.width: 3 } delegate: Item { @@ -85,7 +85,7 @@ Item{ PathView { id: inner - model: 6 + model: 12 interactive: false highlightRangeMode: PathView.NoHighlightRange @@ -93,8 +93,8 @@ Item{ width: 30 * 1.5 height: width radius: width / 2 - border.color: "darkgray" - color: TimePickerStyle.minutesColor + border.color: TimePickerStyle.minutesColor + border.width: 3 } delegate: Item { @@ -107,7 +107,7 @@ Item{ anchors.centerIn: parent font.pointSize: Units.dp * 11 font.bold: currentItem - text: index * 10 + text: index * 5 color: currentItem ? TimePickerStyle.selectedItemColor : TimePickerStyle.unselectedItemColor } @@ -119,7 +119,7 @@ Item{ path: Path { id: innerPath - property int yStep: middleMinSize * Math.cos(2 * Math.PI / inner.count) + property int yStep: (middleMinSize - 30 ) * Math.cos(2 * Math.PI / inner.count) startX: mainItem.centerPosition; startY: mainItem.centerPosition - innerPath.yStep PathArc { x: mainItem.centerPosition; y: mainItem.centerPosition + innerPath.yStep diff --git a/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml b/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml index ff60acd81..7aad4aeb4 100644 --- a/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml +++ b/linphone-app/ui/modules/Common/Styles/Picker/TimePickerStyle.qml @@ -9,7 +9,7 @@ import ColorsList 1.0 QtObject { property string sectionName : 'TimePicker' property color hoursColor: ColorsList.add(sectionName+'_hours', 'i').color - property color minutesColor: ColorsList.add(sectionName+'_minutes', 's').color + property color minutesColor: ColorsList.add(sectionName+'_minutes', 'i').color property color selectedItemColor: ColorsList.add(sectionName+'_selected', 'l').color property color unselectedItemColor: ColorsList.add(sectionName+'_unselected', 'g').color diff --git a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml index 8cac47187..060f46241 100644 --- a/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml +++ b/linphone-app/ui/views/App/Main/Dialogs/NewChatRoom.qml @@ -198,7 +198,7 @@ DialogPlus { RowLayout{ Layout.fillWidth: true Layout.fillHeight : true - spacing:10 + spacing:0 Repeater{ id:lastContacts @@ -206,8 +206,9 @@ DialogPlus { model:TimelineListModel.getLastChatRooms(5) delegate : Item{ - Layout.fillHeight: true - Layout.preferredWidth: 60 + //Layout.fillHeight: true + Layout.preferredHeight: 60 + Layout.preferredWidth: 50 + avatar2.height/2 ColumnLayout{ anchors.fill:parent Avatar{ @@ -247,7 +248,7 @@ DialogPlus { Rectangle{ id:mask anchors.fill:parent - anchors.topMargin: -5 + //anchors.topMargin: -5 color:'white' opacity: 0.5 visible: smartSearchBar.isIgnored(modelData.sipAddress) diff --git a/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml b/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml index 0a42b3c2f..209fef443 100644 --- a/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml +++ b/linphone-app/ui/views/App/Styles/Dialog/NewConferenceStyle.qml @@ -13,7 +13,7 @@ QtObject { property color subjectTitleColor: ColorsList.add(sectionName+'_subject_title', 'g').color property color recentContactTitleColor: ColorsList.add(sectionName+'_recent_contact_title', 'g').color property color recentContactUsernameColor: ColorsList.add(sectionName+'_recent_contact_username', 'g').color - property color addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'l').color + property color addressesBorderColor: ColorsList.add(sectionName+'_addresses_border', 'border_light').color property color addressesAdminColor: ColorsList.add(sectionName+'_addresses_admin', 'g').color property color requiredColor: ColorsList.add(sectionName+'_required_text', 'g').color