Skip to content

L
linphone-desktop
Commit 28a116f9 authored by Ronan Abhamon's avatar Ronan Abhamon
Browse files
Options

feat(ui/views/App/Main/ContactEdit): fix edit icon

parent 3cd77788
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 50 deletions
linphone-desktop/assets/images/edit_hovered.svg
View file @ 28a116f9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch --> <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>options_over</title> <title>settings_edit_default</title>
<desc>Created with Sketch.</desc> <desc>Created with Sketch.</desc>
<defs></defs> <defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="options_over"> <g id="settings_edit_default" stroke="#4B5964">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#4B5964"></path> <path d="M3.23925194,12.4294194 L5.64097342,12.2360444 L14.5,2.7372 L13.3062823,1.63479722 L13.270401,1.60141111 L12.0770155,0.5 L3.21798895,9.99851389 L3.20303841,12.3953722 L3.23925194,12.4294194 L3.23925194,12.4294194 Z M10.2646776,2.442675 L12.6999548,4.69078333 L10.2646776,2.442675 Z M0.5,14.5 L4.84628861,14.5 L0.5,14.5 Z" id="Imported-Layers-Copy"></path>
<path d="M29.0873544,21.9006986 L29.0873544,18.0990443 L27.457167,18.0990443 C27.276035,17.3980628 26.9959394,16.7371962 26.6347091,16.1290447 L27.7891991,14.9803711 L25.0877236,12.2919042 L23.933492,13.441092 C23.3229145,13.0816012 22.6583335,12.8028543 21.9537018,12.6225946 L21.9537018,11 L18.133911,11 L18.133911,12.6225946 C17.4292793,12.8028543 16.765215,13.0816012 16.1538624,13.441092 L14.9993724,12.2919042 L12.298672,14.9803711 L13.453162,16.1290447 C13.0916733,16.7369391 12.8115777,17.3980628 12.6301874,18.0990443 L11,18.0990443 L11,21.9006986 L12.6301874,21.9006986 C12.8115777,22.6019372 13.0916733,23.2630609 13.4523869,23.8712124 L12.298672,25.0196289 L14.9998892,27.7078387 L16.1538624,26.5591651 C16.765215,26.9183988 17.4292793,27.1974028 18.133911,27.3774054 L18.133911,29 L21.9537018,29 L21.9537018,27.3774054 C22.6585919,27.1974028 23.3229145,26.9183988 23.9337503,26.5591651 L25.0877236,27.7078387 L27.7891991,25.0196289 L26.6347091,23.8712124 C26.9959394,23.2630609 27.2762934,22.6019372 27.457167,21.9006986 L29.0873544,21.9006986 L29.0873544,21.9006986 Z M15.9908179,20.0001286 C15.9908179,22.227789 17.8054963,24.0334719 20.0439356,24.0334719 C22.2818581,24.0334719 24.0965365,22.227789 24.0965365,20.0001286 C24.0965365,17.7729825 22.2818581,15.9667852 20.0439356,15.9667852 C17.8054963,15.9667852 15.9908179,17.7729825 15.9908179,20.0001286 L15.9908179,20.0001286 Z" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
</g> </g>
</g> </g>
</svg> </svg>
\ No newline at end of file
linphone-desktop/assets/images/edit_normal.svg
View file @ 28a116f9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch --> <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>options_default</title> <title>settings_edit_default</title>
<desc>Created with Sketch.</desc> <desc>Created with Sketch.</desc>
<defs></defs> <defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="options_default"> <g id="settings_edit_default" stroke="#96A5B1">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#96A6B1"></path> <path d="M3.23925194,12.4294194 L5.64097342,12.2360444 L14.5,2.7372 L13.3062823,1.63479722 L13.270401,1.60141111 L12.0770155,0.5 L3.21798895,9.99851389 L3.20303841,12.3953722 L3.23925194,12.4294194 L3.23925194,12.4294194 Z M10.2646776,2.442675 L12.6999548,4.69078333 L10.2646776,2.442675 Z M0.5,14.5 L4.84628861,14.5 L0.5,14.5 Z" id="Imported-Layers-Copy"></path>
<path d="M29.0873544,21.9006986 L29.0873544,18.0990443 L27.457167,18.0990443 C27.276035,17.3980628 26.9959394,16.7371962 26.6347091,16.1290447 L27.7891991,14.9803711 L25.0877236,12.2919042 L23.933492,13.441092 C23.3229145,13.0816012 22.6583335,12.8028543 21.9537018,12.6225946 L21.9537018,11 L18.133911,11 L18.133911,12.6225946 C17.4292793,12.8028543 16.765215,13.0816012 16.1538624,13.441092 L14.9993724,12.2919042 L12.298672,14.9803711 L13.453162,16.1290447 C13.0916733,16.7369391 12.8115777,17.3980628 12.6301874,18.0990443 L11,18.0990443 L11,21.9006986 L12.6301874,21.9006986 C12.8115777,22.6019372 13.0916733,23.2630609 13.4523869,23.8712124 L12.298672,25.0196289 L14.9998892,27.7078387 L16.1538624,26.5591651 C16.765215,26.9183988 17.4292793,27.1974028 18.133911,27.3774054 L18.133911,29 L21.9537018,29 L21.9537018,27.3774054 C22.6585919,27.1974028 23.3229145,26.9183988 23.9337503,26.5591651 L25.0877236,27.7078387 L27.7891991,25.0196289 L26.6347091,23.8712124 C26.9959394,23.2630609 27.2762934,22.6019372 27.457167,21.9006986 L29.0873544,21.9006986 L29.0873544,21.9006986 Z M15.9908179,20.0001286 C15.9908179,22.227789 17.8054963,24.0334719 20.0439356,24.0334719 C22.2818581,24.0334719 24.0965365,22.227789 24.0965365,20.0001286 C24.0965365,17.7729825 22.2818581,15.9667852 20.0439356,15.9667852 C17.8054963,15.9667852 15.9908179,17.7729825 15.9908179,20.0001286 L15.9908179,20.0001286 Z" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
</g> </g>
</g> </g>
</svg> </svg>
\ No newline at end of file
linphone-desktop/assets/images/edit_pressed.svg
View file @ 28a116f9
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41 (35326) - http://www.bohemiancoding.com/sketch --> <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>options_clic</title> <title>settings_edit_default</title>
<desc>Created with Sketch.</desc> <desc>Created with Sketch.</desc>
<defs></defs> <defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="options_clic"> <g id="settings_edit_default" stroke="#FF5E00">
<path d="M20,40 C31.045695,40 40,31.045695 40,20 C40,8.954305 31.045695,0 20,0 C8.954305,0 0,8.954305 0,20 C0,31.045695 8.954305,40 20,40 Z" fill="#FF5E00"></path> <path d="M3.23925194,12.4294194 L5.64097342,12.2360444 L14.5,2.7372 L13.3062823,1.63479722 L13.270401,1.60141111 L12.0770155,0.5 L3.21798895,9.99851389 L3.20303841,12.3953722 L3.23925194,12.4294194 L3.23925194,12.4294194 Z M10.2646776,2.442675 L12.6999548,4.69078333 L10.2646776,2.442675 Z M0.5,14.5 L4.84628861,14.5 L0.5,14.5 Z" id="Imported-Layers-Copy"></path>
<path d="M29.0873544,21.9006986 L29.0873544,18.0990443 L27.457167,18.0990443 C27.276035,17.3980628 26.9959394,16.7371962 26.6347091,16.1290447 L27.7891991,14.9803711 L25.0877236,12.2919042 L23.933492,13.441092 C23.3229145,13.0816012 22.6583335,12.8028543 21.9537018,12.6225946 L21.9537018,11 L18.133911,11 L18.133911,12.6225946 C17.4292793,12.8028543 16.765215,13.0816012 16.1538624,13.441092 L14.9993724,12.2919042 L12.298672,14.9803711 L13.453162,16.1290447 C13.0916733,16.7369391 12.8115777,17.3980628 12.6301874,18.0990443 L11,18.0990443 L11,21.9006986 L12.6301874,21.9006986 C12.8115777,22.6019372 13.0916733,23.2630609 13.4523869,23.8712124 L12.298672,25.0196289 L14.9998892,27.7078387 L16.1538624,26.5591651 C16.765215,26.9183988 17.4292793,27.1974028 18.133911,27.3774054 L18.133911,29 L21.9537018,29 L21.9537018,27.3774054 C22.6585919,27.1974028 23.3229145,26.9183988 23.9337503,26.5591651 L25.0877236,27.7078387 L27.7891991,25.0196289 L26.6347091,23.8712124 C26.9959394,23.2630609 27.2762934,22.6019372 27.457167,21.9006986 L29.0873544,21.9006986 L29.0873544,21.9006986 Z M15.9908179,20.0001286 C15.9908179,22.227789 17.8054963,24.0334719 20.0439356,24.0334719 C22.2818581,24.0334719 24.0965365,22.227789 24.0965365,20.0001286 C24.0965365,17.7729825 22.2818581,15.9667852 20.0439356,15.9667852 C17.8054963,15.9667852 15.9908179,17.7729825 15.9908179,20.0001286 L15.9908179,20.0001286 Z" stroke="#FFFFFF" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path>
</g> </g>
</g> </g>
</svg> </svg>
\ No newline at end of file
linphone-desktop/ui/views/App/Main/ContactEdit.qml
View file @ 28a116f9
...@@ -121,22 +121,22 @@ ColumnLayout { ...@@ -121,22 +121,22 @@ ColumnLayout {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: ContactEditStyle.infoBar.height Layout.preferredHeight: ContactEditStyle.bar.height
color: ContactEditStyle.infoBar.color color: ContactEditStyle.bar.color
RowLayout { RowLayout {
anchors { anchors {
fill: parent fill: parent
leftMargin: ContactEditStyle.infoBar.leftMargin leftMargin: ContactEditStyle.bar.leftMargin
rightMargin: ContactEditStyle.infoBar.rightMargin rightMargin: ContactEditStyle.bar.rightMargin
} }
spacing: ContactEditStyle.infoBar.spacing spacing: ContactEditStyle.bar.spacing
ActionButton { ActionButton {
enabled: _edition enabled: _edition
icon: 'contact_card_photo' icon: 'contact_card_photo'
iconSize: ContactEditStyle.infoBar.avatarSize iconSize: ContactEditStyle.bar.avatarSize
onClicked: avatarChooser.open() onClicked: avatarChooser.open()
...@@ -154,13 +154,13 @@ ColumnLayout { ...@@ -154,13 +154,13 @@ ColumnLayout {
id: usernameInput id: usernameInput
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: ContactEditStyle.infoBar.buttons.size Layout.preferredHeight: ContactEditStyle.bar.buttons.size
color: ContactEditStyle.infoBar.username.color color: ContactEditStyle.bar.username.color
font { font {
bold: true bold: true
pointSize: ContactEditStyle.infoBar.username.fontSize pointSize: ContactEditStyle.bar.username.fontSize
} }
forceFocus: true forceFocus: true
readOnly: !_edition readOnly: !_edition
...@@ -169,30 +169,43 @@ ColumnLayout { ...@@ -169,30 +169,43 @@ ColumnLayout {
onEditingFinished: _setUsername(text) onEditingFinished: _setUsername(text)
} }
ActionBar { Row {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
iconSize: ContactEditStyle.infoBar.buttons.size Layout.fillHeight: true
spacing: ContactEditStyle.infoBar.buttons.spacing
spacing: ContactEditStyle.bar.actions.spacing
visible: _contact != null visible: _contact != null
ActionButton { ActionBar {
icon: 'history' anchors.verticalCenter: parent.verticalCenter
iconSize: ContactEditStyle.bar.actions.history.iconSize
onClicked: window.setView('Conversation', { ActionButton {
sipAddress: contactEdit.sipAddress icon: 'history'
})
}
ActionButton { onClicked: window.setView('Conversation', {
icon: 'edit' sipAddress: contactEdit.sipAddress
visible: !_edition })
onClicked: _editContact() }
} }
ActionButton { ActionBar {
icon: 'delete' anchors.verticalCenter: parent.verticalCenter
ActionButton {
icon: 'edit'
iconSize: ContactEditStyle.bar.actions.edit.iconSize
onClicked: _removeContact() visible: !_edition
onClicked: _editContact()
}
ActionButton {
icon: 'delete'
iconSize: ContactEditStyle.bar.actions.del.iconSize
onClicked: _removeContact()
}
} }
} }
} }
......
linphone-desktop/ui/views/App/Main/Conversation.qml
View file @ 28a116f9
...@@ -93,7 +93,7 @@ ColumnLayout { ...@@ -93,7 +93,7 @@ ColumnLayout {
ActionButton { ActionButton {
icon: !_contact ? 'contact_add' : 'contact_edit' icon: !_contact ? 'contact_add' : 'contact_edit'
iconSize: ConversationStyle.bar.actions.edit.iconSize iconSize: ConversationStyle.bar.actions.del.iconSize
onClicked: window.setView('ContactEdit', { onClicked: window.setView('ContactEdit', {
sipAddress: conversation.sipAddress sipAddress: conversation.sipAddress
......
linphone-desktop/ui/views/App/Styles/Main/ContactEditStyle.qml
View file @ 28a116f9
...@@ -11,7 +11,7 @@ QtObject { ...@@ -11,7 +11,7 @@ QtObject {
property int topMargin: 20 property int topMargin: 20
} }
property QtObject infoBar: QtObject { property QtObject bar: QtObject {
property color color: Colors.e property color color: Colors.e
property int avatarSize: 60 property int avatarSize: 60
property int height: 80 property int height: 80
...@@ -19,6 +19,22 @@ QtObject { ...@@ -19,6 +19,22 @@ QtObject {
property int rightMargin: 20 property int rightMargin: 20
property int spacing: 20 property int spacing: 20
property QtObject actions: QtObject {
property int spacing: 40
property QtObject del: QtObject {
property int iconSize: 22
}
property QtObject edit: QtObject {
property int iconSize: 22
}
property QtObject history: QtObject {
property int iconSize: 40
}
}
property QtObject buttons: QtObject { property QtObject buttons: QtObject {
property int size: 40 property int size: 40
property int spacing: 20 property int spacing: 20
......
linphone-desktop/ui/views/App/Styles/Main/ConversationStyle.qml
View file @ 28a116f9
...@@ -21,6 +21,10 @@ QtObject { ...@@ -21,6 +21,10 @@ QtObject {
property int iconSize: 40 property int iconSize: 40
} }
property QtObject del: QtObject {
property int iconSize: 22
}
property QtObject edit: QtObject { property QtObject edit: QtObject {
property int iconSize: 22 property int iconSize: 22
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023