Merge lp:~rpadovani/telegram-app/groupsDefaultAvatar into lp:telegram-app/app-dev

[Riccardo Padovani]

When in a group chat there isn't any image, show default group image instead of single user one

When in a group chat there isn't any image, show default group image instead of single user one

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

136. By Riccardo Padovani on 2014-10-21

Better implementation of avatar.js

[Michał Karnicki (karni)]

review: Approve

=== modified file 'js/avatar.js'
--- js/avatar.js	2014-08-14 12:37:52 +0000
+++ js/avatar.js	2014-10-21 15:16:17 +0000
@@ -1,21 +1,22 @@
 .pragma library
 
 var AVATARS = [
-    ["#8179d7", "user_violet.png"],
-    ["#f2749a", "user_pink.png"  ],
-    ["#7ec455", "user_green.png" ],
-    ["#f3c34a", "user_yellow.png"],
-    ["#5b9dd8", "user_blue.png"  ],
-    ["#62b8cd", "user_aqua.png"  ],
-    ["#ed8b4a", "user_orange.png"],
-    ["#d95848", "user_red.png"   ]
+    ["#8179d7", "_violet.png"],
+    ["#f2749a", "_pink.png"  ],
+    ["#7ec455", "_green.png" ],
+    ["#f3c34a", "_yellow.png"],
+    ["#5b9dd8", "_blue.png"  ],
+    ["#62b8cd", "_aqua.png"  ],
+    ["#ed8b4a", "_orange.png"],
+    ["#d95848", "_red.png"   ]
 ]
 
 function getColor(userId) {
     return AVATARS[userId % 8][0];
 }
 
-function getAvatar(userId) {
-    return AVATARS[userId % 8][1];
+function getAvatar(userId, isGroup) {
+    isGroup = isGroup || false;
+    return (isGroup ? "group" : "user") + AVATARS[userId % 8][1];
 }
 

=== modified file 'ui/DialogsPage.qml'
--- ui/DialogsPage.qml	2014-10-17 12:56:36 +0000
+++ ui/DialogsPage.qml	2014-10-21 15:16:17 +0000
@@ -84,7 +84,7 @@
                 property bool isChat: TLInputPeer.TypeInputPeerChat === model.peerType
 
                 image: model.thumbnail !== "" ? model.thumbnail
-                                              : Qt.resolvedUrl("../images/" + Avatar.getAvatar(model.id))
+                                              : Qt.resolvedUrl("../images/" + Avatar.getAvatar(model.id, isGroup))
                 isGroup: isChat
                 title: model.name
                 sender: isChat ? model.topMessageFromFirstName + ": " : ""