Merge lp:~libqtelegram-team/telegram-app/app-dev-fix-profilepage-buttons into lp:telegram-app/app-dev

[Giulio Collura]

I moved the small button near the user telephone number, down above the secret chat button.
I also improved a bit the listitemwithactions.

[Michał Karnicki (karni)]

All good! When you merge, please remove line 35 (the commented one). Thanks :)

review: Approve

[lp:~libqtelegram-team/telegram-app/app-dev-fix-profilepage-buttons]

263. By Giulio Collura on 2015-02-20

remove commented line

=== modified file 'components/listitems/ListItemWithActions.qml'
--- components/listitems/ListItemWithActions.qml	2015-01-26 17:41:54 +0000
+++ components/listitems/ListItemWithActions.qml	2015-02-20 15:14:29 +0000
@@ -61,7 +61,7 @@
             updatePosition(0)
             return
         } else if (!triggerActionOnMouseRelease) {
-            updatePosition(-rightActionsView.width)
+            updatePosition(-rightActionsView.width + units.gu(2))
             return
         }
 
@@ -84,7 +84,7 @@
             updatePosition(0)
             return
         } else if (!triggerActionOnMouseRelease) {
-            updatePosition(leftActionView.width)
+            updatePosition(leftActionView.width - units.gu(2))
             return
         }
 
@@ -219,14 +219,15 @@
             right: main.left
         }
         visible: _visibleLeftSideActions.length > 0
-        width: leftActionsRepeater.count > 0 ? leftActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(1) : 0
+        width: leftActionsRepeater.count > 0 ? leftActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(3) : 0
         color: "#eef32c36" // UbuntuColors.red with alpha
 
         Row {
             anchors{
                 top: parent.top
                 bottom: parent.bottom
-                horizontalCenter: parent.horizontalCenter
+                right: parent.right
+                rightMargin: units.gu(2)
             }
             spacing: units.gu(2)
             Repeater {
@@ -262,13 +263,14 @@
             bottom: main.bottom
         }
         visible: _visibleRightSideActions.length > 0
-        width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(1) : 0
+        width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(3) : 0
         color: "white"
         Row {
             anchors{
                 top: parent.top
                 bottom: parent.bottom
-                horizontalCenter: parent.horizontalCenter
+                left: parent.left
+                leftMargin: units.gu(2)
             }
             spacing: units.gu(2)
             Repeater {

=== modified file 'ui/ProfilePage.qml'
--- ui/ProfilePage.qml	2015-02-17 13:04:24 +0000
+++ ui/ProfilePage.qml	2015-02-20 15:14:29 +0000
@@ -170,6 +170,7 @@
                 rightMargin: units.gu(2)
                 top: phoneHeader.bottom
             }
+            height: units.gu(5)
 
             Label {
                 id: phone
@@ -192,21 +193,21 @@
                     Qt.openUrlExternally("tel:///" + phone.text)
                 }
             }
+        }
 
-            AbstractButton {
-                id: msgAction
-                width: units.gu(5)
-                height: width
-                visible: userExists
-                Icon {
-                    width: units.gu(4)
-                    height: width
-                    anchors.centerIn: parent
-                    source: Qt.resolvedUrl("../images/ic_profile_send_message.png")
-                }
-                onClicked: {
-                    openChatById(userId);
-                }
+        TelegramButton {
+            id: msgAction
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: startSecretChat.top
+                margins: units.gu(2)
+            }
+            visible: userExists
+            text: i18n.tr("Start chat")
+            color: TelegramColors.grey
+            onClicked: {
+                openChatById(userId);
             }
         }