Merge pull request #149 from ubports/xenial

Catching up in master & switching default branch again ;)
ubports · Mar 10, 2018 · fc22c25 · fc22c25
2 parents 8c88e64 + b5ec5f5
commit fc22c25
Show file tree

Hide file tree

Showing 12 changed files with 143 additions and 118 deletions.
diff --git a/telegram/app/main.cpp b/telegram/app/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
     AsemanApplication app(argc, argv);
     app.setApplicationName("Telegram");
     app.setApplicationDisplayName("Telegram");
-    app.setApplicationVersion("2.5.2.0");
+    app.setApplicationVersion("2.5.3.0");
     app.setOrganizationDomain("com.ubuntu.telegram");
     app.setOrganizationName("com.ubuntu.telegram");
     app.setWindowIcon(QIcon(":/qml/icons/telegram.png"));

diff --git a/telegram/app/qml/AccountMessageList.qml b/telegram/app/qml/AccountMessageList.qml
@@ -178,8 +178,15 @@ Rectangle {
         header: Item{ width: 4; height: units.dp(4) }
         footer: Item{ width: 4; height: units.dp(4) }
 
-        onAtYBeginningChanged: if( atYBeginning && contentHeight>height &&
-                                   currentDialog != telegramObject.nullDialog ) messages_model.loadMore()
+//        onAtYBeginningChanged: if( atYBeginning && contentHeight>height &&
+//                                   currentDialog != telegramObject.nullDialog )
+        onContentYChanged:
+            if (contentHeight>height && (contentY - originY) * (height / contentHeight) < 250)
+            {
+                 console.log("Reached loading window: ", (contentY - originY) * (height / contentHeight) )
+                 messages_model.loadMore()
+            }
+
 
         section.property: "unreaded"
         section.criteria: ViewSection.FullString

diff --git a/telegram/app/qml/AccountPage.qml b/telegram/app/qml/AccountPage.qml
@@ -275,7 +275,7 @@ Page {
         extension: profiles.count > 1 ? sections : null
         trailingActionBar.actions: Action {
             visible: !telegram.connected || !Connectivity.online
-            iconName: !Connectivity.online? "sync-paused" : !telegram.connected? "sync-updating" : "ok"
+            iconName: telegram.busy? "sync-updating" : !telegram.connected? "sync-error" : "sync-paused"
         }
     }
 

diff --git a/telegram/app/qml/AccountSendMessage.qml b/telegram/app/qml/AccountSendMessage.qml
@@ -28,7 +28,7 @@ Rectangle {
     property int dialogId: isChannel ? currentDialog.peer.channelId : isChat ? currentDialog.peer.chatId : currentDialog.peer.userId
     property bool isMuted: telegramObject.userData.isMuted(dialogId)
 
-    property bool channelToolbar: isChannel && !chat.megaGroup && false //need to replace 'false' with the property saying if you can write messages to the channel or not
+    property bool channelToolbar: isChannel && !chat.megaGroup && !(chat.isCreator || chat.isEditor || chat.isModerator)
 
     signal accepted( string text, int inReplyTo )
     signal copyRequest()

diff --git a/telegram/app/qml/MessageReplyItem.qml b/telegram/app/qml/MessageReplyItem.qml
@@ -18,7 +18,7 @@ Item {
 
     property Message realMessage: (message && message.replyToMsgId != 0) ? telegram.message(message.replyToMsgId, dialog.peer.channelId) : replyMessage
 
-    property real maximumWidth: 100
+    property real maximumWidth: 90
 
     signal messageFocusRequest(int msgId, int channelId)
 

diff --git a/telegram/app/qml/components/MessagesListItem.qml b/telegram/app/qml/components/MessagesListItem.qml
@@ -26,7 +26,7 @@ ListItem {
             ? action_item.height : column.height + frameMargins*2 + textMargins*2
     property real minimumHeight: contact_image.visible ? contact_image.height + units.gu(1) : 0
 
-    property real maximumWidth: width * 0.75 - (contact_image.visible ? contact_image.width : 0)
+    property real maximumWidth: width * 0.85 - (contact_image.visible ? contact_image.width : 0)
     property real minimumWidth: 0
 
     property real textMargins: units.dp(4)
@@ -128,8 +128,7 @@ ListItem {
                 topMargin: units.gu(.5)
             }
             height: units.gu(5)
-            visible: message_item.visibleNames && !message.out && !(dialogIsChannel && !message_item.chat.megagroup)
-
+            visible: message_item.visibleNames && !message.out && !(dialogIsChannel && !message_item.chat.megaGroup)
             telegram: telegramObject
             user: message_item.user
             isChat: false

diff --git a/telegram/app/qml/components/TelegramHeader.qml b/telegram/app/qml/components/TelegramHeader.qml
@@ -144,10 +144,10 @@ PageHeader {
         Rectangle {
             id: connectingIndicator
             anchors.fill: headerImage
-            visible: isConnecting || !Connectivity.online
+            visible: isConnecting || !Connectivity.online || telegram.busy
             color: "white"
             Icon {
-                name: isConnecting? "sync-updating" : "sync-paused"
+                name: telegram.busy? "sync-updating" : isConnecting? "sync-error" : "sync-paused"
                 anchors.fill: parent
             }
             SequentialAnimation {

diff --git a/telegram/app/qml/js/version.js b/telegram/app/qml/js/version.js
@@ -1 +1 @@
-var version = "2.5.2.0";
+var version = "2.5.3.0";
diff --git a/telegram/app/telegram.cpp b/telegram/app/telegram.cpp
@@ -201,7 +201,6 @@ QSize Cutegram::imageSize(const QString &pt)
         return QSize();
 
     QImage img(path);
-    qWarning() << "Image " << path << ", image size: " << img.size().width() << "x" << img.size().height();
     return img.size();
 }
 

diff --git a/telegram/manifest.json.in b/telegram/manifest.json.in
@@ -21,6 +21,6 @@
             "scope": "scope"
         }
     },
-    "version": "2.5.2.0",
+    "version": "2.5.3.0",
     "maintainer": "UBports Telegram Team <[email protected]>"
 }