Merge lp:~rpadovani/telegram-app/showLastMessageAuthor into lp:telegram-app

[Riccardo Padovani]

Show the name of the author of last message in conversations list if the
conversation is a chat or if the author is the user herself

[lp:~rpadovani/telegram-app/showLastMessageAuthor]

171. By Riccardo Padovani on 2016-04-07

Show group icon on the left of the title in the dialogs list and mute icon
on the right

172. By Riccardo Padovani on 2016-04-07

Fix text elide, grey notifications for muted chats

173. By Riccardo Padovani on 2016-04-07

Don't show the author if someone is typing

[Jin (jindallo)]

The code looks good to me,
I will approve this if verified pass from my local,
thanks.

Unmerged revisions

173. By Riccardo Padovani on 2016-04-07

Don't show the author if someone is typing

172. By Riccardo Padovani on 2016-04-07

Fix text elide, grey notifications for muted chats

171. By Riccardo Padovani on 2016-04-07

Show group icon on the left of the title in the dialogs list and mute icon
on the right

170. By Riccardo Padovani on 2016-04-07

Show the name of the author of last message in conversations list if the
conversation is a chat or if the author is the user herself

=== modified file 'telegram/app/qml/AccountDialogList.qml'
--- telegram/app/qml/AccountDialogList.qml	2016-03-07 11:25:51 +0000
+++ telegram/app/qml/AccountDialogList.qml	2016-04-07 21:52:16 +0000
@@ -64,6 +64,8 @@
         delegate: DialogsListItem {
             id: list_item
             anchors {
+                left: parent.left
+                right: parent.right
                 topMargin: units.dp(3)
                 leftMargin: units.dp(5)
                 bottomMargin: units.dp(3)
 
=== modified file 'telegram/app/qml/components/DialogsListItem.qml'
--- telegram/app/qml/components/DialogsListItem.qml	2016-03-11 07:53:28 +0000
+++ telegram/app/qml/components/DialogsListItem.qml	2016-04-07 21:52:16 +0000
@@ -142,8 +142,7 @@
         visible: dialog.encrypted
     }
 
-    Text {
-        id: title_text
+    Row {
         anchors {
             top: parent.top
             left: image.right
@@ -152,19 +151,49 @@
             right: time_text.left
             margins: units.dp(4)
         }
-        horizontalAlignment: Text.AlignLeft
-        verticalAlignment: Text.AlignVCenter
-        clip: true
-        elide: Text.ElideRight
-        wrapMode: Text.WrapAnywhere
-        maximumLineCount: 1
-        font.weight: Font.DemiBold
-        font.pixelSize: units.dp(17)//FontUtils.sizeToPixels("large")
-        text: list_item.title
+        spacing: units.dp(4)
+
+        Icon {
+            id: contact_group_icon
+            visible: isChat
+            name: "contact-group"
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                topMargin: units.dp(4)
+                bottomMargin: units.dp(4)
+            }
+            width: height
+        }
+
+        Text {
+            id: title_text
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignVCenter
+            clip: true
+            elide: Text.ElideRight
+            wrapMode: Text.WrapAnywhere
+            maximumLineCount: 1
+            font.weight: Font.DemiBold
+            font.pixelSize: units.dp(17)//FontUtils.sizeToPixels("large")
+            text: list_item.title
+        }
+
+        Icon {
+            id: audio_volume_muted_icon
+            visible: telegram.userData.isMuted(dialogId);
+            name: "audio-volume-muted"
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                topMargin: units.dp(4)
+                bottomMargin: units.dp(4)
+            }
+            width: height
+        }
     }
 
-    Text {
-        id: message_text
+    Row {
         anchors {
             top: parent.verticalCenter
             bottom: parent.bottom
@@ -174,24 +203,43 @@
             margins: units.dp(4)
             topMargin: 0
         }
-        visible: showMessage
-        clip: true
-        elide: Text.ElideRight
-        wrapMode: Text.WrapAnywhere
-        maximumLineCount: 1
-        font.pixelSize: units.dp(15)//FontUtils.sizeToPixels("smaller")
-        color: Colors.grey
-        text: {
-            if (!visible) return "";
-
-            var list = dialog.typingUsers;
-            if (list.length > 0) {
+
+        Text {
+            id: message_author
+            visible: showMessage && (message.out || isChat) && dialog.typingUsers.length === 0
+            maximumLineCount: 1
+            font.pixelSize: units.dp(15)//FontUtils.sizeToPixels("smaller")
+            color: Colors.telegram_blue
+            text: {
+                if (dialog.typingUsers.length > 0) return '';
+                if (message.out) return i18n.tr("You: ");
+                if (isChat) return telegramObject.user(message.fromId).firstName + ': ';
+                return '';
+            }
+        }
+
+        Text {
+            id: message_text
+            visible: showMessage
+            clip: true
+            elide: Text.ElideRight
+            wrapMode: Text.WrapAnywhere
+            maximumLineCount: 1
+            font.pixelSize: units.dp(15)//FontUtils.sizeToPixels("smaller")
+            color: Colors.grey
+            width: parent.width - message_author.width - (unread_rect.visible ? unread_rect.width : 0)
+            text: {
+                if (!visible) return "";
                 // TRANSLATORS: Indicates in a subtitle of a dialog list item that someone is typing.
-                return i18n.tr("typing...")
-            } else {
-                // We use emojis in our font currently, so no need to replace them here for now
-                //return emojis.bodyTextToEmojiText(message.message, 16, true);
-                return message.message
+
+                var list = dialog.typingUsers;
+                if (list.length > 0) {
+                    return i18n.tr("typing...")
+                } else {
+                    // We use emojis in our font currently, so no need to replace them here for now
+                    //return emojis.bodyTextToEmojiText(message.message, 16, true);
+                    return message.message
+                }
             }
         }
     }
@@ -221,7 +269,7 @@
         width: Math.min(height, units.gu(4))
         height: units.gu(2.8)
         radius: width*0.5
-        color: "#5ec245"
+        color: telegram.userData.isMuted(dialogId) ? Colors.grey : "#5ec245"
         visible: dialog.unreadCount !== 0
 
         Text {