Merge remote-tracking branch 'origin/master' into userPreferences

images/icon-s-eye.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xml:space="preserve"
+   style="enable-background:new 0 0 32 32;"
+   viewBox="0 0 32 32"
+   height="32"
+   width="32"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs17" />
+
+<circle
+   r="4"
+   cy="16"
+   cx="16"
+   id="path861-7"
+   style="opacity:0.6;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><path
+   id="path826-6"
+   d="m 16.013202,10.0161 c -5.135781,-0.0066 -9.7712792,2.35462 -11.74455,5.983307 1.9732708,3.628688 6.608769,5.991032 11.74455,5.984494 5.107193,-0.0065 9.706497,-2.355358 11.682549,-5.954838 h 0.03565 c -0.0054,-0.01005 -0.01159,-0.01962 -0.01705,-0.02966 0.0055,-0.01002 0.01164,-0.01961 0.01705,-0.02966 h -0.03565 c -1.976079,-3.599428 -6.575398,-5.947148 -11.682549,-5.95365 z"
+   style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><circle
+   r="2"
+   cy="16"
+   cx="16"
+   id="path861"
+   style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></svg>

images/icon-s-pin.svg

@@ -17,10 +17,11 @@
    id="metadata17"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs15" /><path
+   id="defs3" /> Updated upstream
-     id="path4567-6-9-2-9-0"
+     id=&quot;defs15&quot; /&gt;<path
-     d="M 14.774588,14.651001 2.1829034,28.267313 c -1.0611451,1.031581 0.5159425,2.608675 1.5475102,1.547514 L 17.354282,17.224652 a 8.3460333,8.3460333 0 0 1 -1.438704,-1.136457 8.3460333,8.3460333 0 0 1 -1.14099,-1.437194 z"
+   id="path4567-6-9-2-9-0-3"
+   d="m 18.070362,15.595073 11.557261,13.3774 c 1.011409,0.983239 0.324995,1.686796 -0.658223,0.67537 L 15.619387,18.059831 Z"
    style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /><path
-     id="path4569-2-1-7-6-6"
+   id="rect814-5-6"
-     d="m 27.72494,4.2773215 a 8.3460333,8.3460333 0 0 1 -2e-6,11.8030745 8.3460333,8.3460333 0 0 1 -11.803072,0 8.3460333,8.3460333 0 0 1 0,-11.8030745 8.3460333,8.3460333 0 0 1 11.803074,0 z"
+   d="M 10.644531,1.8125 C 10.384078,1.8161365 10.13532,1.9212454 9.9511719,2.1054688 L 2.1210938,9.9355469 c -0.3903681,0.3905301 -0.3903681,1.0235321 0,1.4140621 l 4.4667968,4.46875 0.78125,8.173829 c 0.079282,0.842901 1.1046782,1.212138 1.703125,0.613281 l 7.7734374,-7.775391 7.775391,-7.7734374 c 0.598857,-0.5984471 0.22962,-1.623844 -0.613282,-1.703125 L 15.832031,6.5722656 11.365234,2.1054688 C 11.174385,1.9145467 10.91446,1.8088858 10.644531,1.8125 Z"
-     style="opacity:0.6;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /></svg>
+   style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.6;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /></svg>

qml/components/MessageListViewItem.qml

@@ -475,6 +475,7 @@ ListItem {
                     color: messageListItem.isOwnMessage ? Theme.secondaryHighlightColor : Theme.secondaryColor
                     horizontalAlignment: messageListItem.textAlign
                     text: getMessageStatusText(myMessage, index, chatView.lastReadSentIndex, messageDateText.useElapsed)
+                    rightPadding: interactionLoader.active ? interactionLoader.width : 0
                     MouseArea {
                         anchors.fill: parent
                         enabled: !messageListItem.precalculatedValues.pageIsSelecting
@@ -483,6 +484,34 @@ ListItem {
                             messageDateText.text = getMessageStatusText(myMessage, index, chatView.lastReadSentIndex, messageDateText.useElapsed);
                         }
                     }
+
+                    Loader {
+                        id: interactionLoader
+                        height: parent.height
+                        anchors.right: parent.right
+                        asynchronous: true
+                        active: chatPage.isChannel && myMessage.interaction_info && myMessage.interaction_info.view_count
+                        sourceComponent: Component {
+                            Label {
+                                text: Functions.getShortenedCount(myMessage.interaction_info.view_count)
+                                leftPadding: Theme.iconSizeSmall
+                                font.pixelSize: Theme.fontSizeTiny
+                                color: Theme.secondaryColor
+                                Icon {
+                                    anchors.verticalCenter: parent.verticalCenter
+                                    width: Theme.iconSizeExtraSmall
+                                    height: Theme.iconSizeExtraSmall
+                                    opacity: 0.6
+                                    source: "../../images/icon-s-eye.svg"
+                                    sourceSize {
+                                        width: Theme.iconSizeExtraSmall
+                                        height: Theme.iconSizeExtraSmall
+                                    }
+                                }
+                            }
+                        }
+
+                    }
                 }
 
             }

qml/components/PhotoTextsListItem.qml

@@ -18,28 +18,20 @@ ListItem {
     property bool isMuted: false
     property alias pictureThumbnail: pictureThumbnail
 
-    contentHeight: mainRow.height + separator.height + 2 * Theme.paddingMedium
+    contentHeight: Theme.itemSizeExtraLarge
     contentWidth: parent.width
 
-    Column {
-        id: mainColumn
-        width: parent.width - ( 2 * Theme.horizontalPageMargin )
-        spacing: Theme.paddingSmall
-        anchors {
-            horizontalCenter: parent.horizontalCenter
-            verticalCenter: parent.verticalCenter
-        }
-
-        Row {
-            id: mainRow
-            height: contentColumn.height
-            spacing: Theme.paddingMedium
 
     ShaderEffectSource {
         id: pictureItem
-                width: contentColumn.height - Theme.paddingSmall
+        height: Theme.itemSizeLarge
-                height: contentColumn.height - Theme.paddingSmall
+        width: height
-                anchors.verticalCenter: parent.verticalCenter
+        anchors {
+            left: parent.left
+            leftMargin: Theme.horizontalPageMargin
+            verticalCenter: parent.verticalCenter
+        }
+
         sourceItem: Item {
             width: pictureItem.width
             height: pictureItem.width
@@ -53,7 +45,7 @@ ListItem {
 
             Rectangle {
                 id: chatPinnedBackground
-                        color: Theme.highlightBackgroundColor
+                color: Theme.rgba(Theme.overlayBackgroundColor, Theme.opacityFaint)
                 width: Theme.fontSizeLarge
                 height: Theme.fontSizeLarge
                 anchors.top: parent.top
@@ -61,18 +53,19 @@ ListItem {
                 visible: chatListViewItem.isPinned
             }
 
-                    Image {
+            Icon {
                 source: "../../images/icon-s-pin.svg"
-                        height: Theme.fontSizeSmall
+                height: Theme.iconSizeExtraSmall
-                        width: Theme.fontSizeSmall
+                width: Theme.iconSizeExtraSmall
-                        sourceSize: Qt.size(Theme.iconSizeSmall, Theme.iconSizeSmall)
+                highlighted: chatListViewItem.highlighted
+                sourceSize: Qt.size(Theme.iconSizeExtraSmall, Theme.iconSizeExtraSmall)
                 anchors.centerIn: chatPinnedBackground
                 visible: chatListViewItem.isPinned
             }
 
             Rectangle {
                 id: chatSecretBackground
-                        color: Theme.highlightBackgroundColor
+                color: Theme.rgba(Theme.overlayBackgroundColor, Theme.opacityFaint)
                 width: Theme.fontSizeLarge
                 height: Theme.fontSizeLarge
                 anchors.bottom: parent.bottom
@@ -80,10 +73,11 @@ ListItem {
                 visible: chatListViewItem.isSecret
             }
 
-                    Image {
+            Icon {
                 source: "image://theme/icon-s-secure"
-                        height: Theme.fontSizeSmall
+                height: Theme.iconSizeExtraSmall
-                        width: Theme.fontSizeSmall
+                width: Theme.iconSizeExtraSmall
+                highlighted: chatListViewItem.highlighted
                 anchors.centerIn: chatSecretBackground
                 visible: chatListViewItem.isSecret
             }
@@ -110,11 +104,16 @@ ListItem {
             }
         }
     }
-
     Column {
         id: contentColumn
-                width: mainColumn.width - pictureItem.width - mainRow.spacing
+        anchors {
-                spacing: Theme.paddingSmall
+            verticalCenter: parent.verticalCenter
+            left: pictureItem.right
+            leftMargin: Theme.paddingSmall
+            right: parent.right
+            rightMargin: Theme.horizontalPageMargin
+        }
+        spacing: Theme.paddingSmall / 2
 
         Row {
             id: primaryTextRow
@@ -179,14 +178,12 @@ ListItem {
             truncationMode: TruncationMode.Fade
         }
     }
-        }
-    }
 
     Separator {
         id: separator
         anchors {
-            top: mainColumn.bottom
+            bottom: parent.bottom
-            topMargin: Theme.paddingMedium
+            bottomMargin: -1
         }
 
         width: parent.width

qml/components/ProfileThumbnail.qml

@@ -69,7 +69,6 @@ Item {
                 id: singleImage
                 width: parent.width - Theme.paddingSmall
                 height: width
-                anchors.centerIn: parent
                 source: file.path
                 sourceSize.width: optimizeImageSize ? width : undefined
                 sourceSize.height: optimizeImageSize ? height : undefined

qml/pages/ChatPage.qml

@@ -963,7 +963,7 @@ Page {
                         readonly property int paddingMediumDouble: 2 * Theme.paddingMedium
                         readonly property int entryWidth: chatView.width - pageMarginDouble
                         readonly property int textItemWidth: entryWidth - profileThumbnailDimensions - Theme.paddingSmall
-                        readonly property int backgroundWidth: textItemWidth - pageMarginDouble
+                        readonly property int backgroundWidth: page.isChannel ? textItemWidth : textItemWidth - pageMarginDouble
                         readonly property int backgroundRadius: textItemWidth/50
                         readonly property int textColumnWidth: backgroundWidth - Theme.horizontalPageMargin
                         readonly property int messageInReplyToHeight: Theme.fontSizeExtraSmall * 2.571428571 + Theme.paddingSmall;

src/notificationmanager.cpp

@@ -61,6 +61,7 @@ namespace {
     const QString HINT_TOTAL_COUNT("x-fernschreiber.total_count");  // int
 
     const QString HINT_VIBRA("x-nemo-vibrate");                     // bool
+    const QString HINT_SUPPRESS_SOUND("suppress-sound");            // bool
     const QString HINT_DISPLAY_ON("x-nemo-display-on");             // bool
     const QString HINT_VISIBILITY("x-nemo-visibility");             // QString
     const QString VISIBILITY_PUBLIC("public");
@@ -207,8 +208,10 @@ void NotificationManager::updateNotificationGroup(int groupId, qlonglong chatId,
         } else {
             // New notification
             Notification *notification = new Notification(this);
+            notification->setCategory("x-nemo.messaging.im");
             notification->setAppName(APP_NAME);
             notification->setAppIcon(appIconFile);
+            notification->setIcon(appIconFile);
             notification->setHintValue(HINT_GROUP_ID, groupId);
             notification->setHintValue(HINT_CHAT_ID, chatId);
             notification->setHintValue(HINT_TOTAL_COUNT, totalCount);
@@ -358,17 +361,19 @@ void NotificationManager::publishNotification(const NotificationGroup *notificat
     const QString summary(chatInformation ? chatInformation->title : QString());
     nemoNotification->setBody(notificationBody);
     nemoNotification->setSummary(summary);
-    nemoNotification->setPreviewBody(notificationBody);
-    nemoNotification->setPreviewSummary(summary);
     nemoNotification->setHintValue(HINT_VIBRA, needFeedback);
 
     // Don't show popup for the currently open chat
     if (!needFeedback || (chatModel->getChatId() == notificationGroup->chatId &&
             qGuiApp->applicationState() == Qt::ApplicationActive)) {
+        nemoNotification->setHintValue(HINT_SUPPRESS_SOUND, true);
         nemoNotification->setHintValue(HINT_DISPLAY_ON, false);
         nemoNotification->setHintValue(HINT_VISIBILITY, QString());
         nemoNotification->setUrgency(Notification::Low);
     } else {
+        nemoNotification->setPreviewBody(notificationBody);
+        nemoNotification->setPreviewSummary(summary);
+        nemoNotification->setHintValue(HINT_SUPPRESS_SOUND, false);
         nemoNotification->setHintValue(HINT_DISPLAY_ON, appSettings->notificationTurnsDisplayOn());
         nemoNotification->setHintValue(HINT_VISIBILITY, VISIBILITY_PUBLIC);
         nemoNotification->setUrgency(Notification::Normal);