Merge remote-tracking branch 'origin_sailfish/master' into origin_merged

Reviewed-on: medvedych/harbour-fernschreiber#7

harbour-fernschreiber.desktop

@@ -6,6 +6,6 @@ Exec=harbour-fernschreiber
 Name=Fernschreiber
 
 [X-Sailjail]
-Permissions=Audio;Contacts;Documents;Downloads;Internet;Location;MediaIndexing;Microphone;Music;Pictures;PublicDir;RemovableMedia;UserDirs;Videos
+Permissions=Audio;Documents;Downloads;Internet;Location;MediaIndexing;Microphone;Music;Pictures;PublicDir;RemovableMedia;UserDirs;Videos
 OrganizationName=de.ygriega
 ApplicationName=fernschreiber

harbour-fernschreiber.pro

@@ -140,7 +140,6 @@ DISTFILES += qml/harbour-fernschreiber.qml \
     qml/pages/VideoPage.qml \
     rpm/harbour-fernschreiber.changes \
     rpm/harbour-fernschreiber.spec \
-    rpm/harbour-fernschreiber.yaml \
     translations/*.ts \
     harbour-fernschreiber.desktop
 

qml/components/ContactSync.qml

@@ -17,28 +17,28 @@
     along with Fernschreiber. If not, see <http://www.gnu.org/licenses/>.
 */
 import QtQuick 2.0
-import org.nemomobile.contacts 1.0
+//import org.nemomobile.contacts 1.0
 
 Item {
 
-    signal syncError();
+//    signal syncError();
 
-    function synchronize() {
+//    function synchronize() {
-        if (peopleModel.count === 0) {
+//        if (peopleModel.count === 0) {
-            appNotification.show(qsTr("Could not synchronize your contacts with Telegram."));
+//            appNotification.show(qsTr("Could not synchronize your contacts with Telegram."));
-            syncError();
+//            syncError();
-        } else {
+//        } else {
-            contactsModel.startImportingContacts();
+//            contactsModel.startImportingContacts();
-            for (var i = 0; i < peopleModel.count; i++ ) {
+//            for (var i = 0; i < peopleModel.count; i++ ) {
-                contactsModel.importContact(peopleModel.get(i));
+//                contactsModel.importContact(peopleModel.get(i));
-            }
+//            }
-            contactsModel.stopImportingContacts();
+//            contactsModel.stopImportingContacts();
-        }
+//        }
-    }
+//    }
 
-    PeopleModel {
+//    PeopleModel {
-        id: peopleModel
+//        id: peopleModel
-        requiredProperty: PeopleModel.PhoneNumberRequired
+//        requiredProperty: PeopleModel.PhoneNumberRequired
-    }
+//    }
 
 }

qml/components/MessageListViewItem.qml

@@ -38,7 +38,7 @@ ListItem {
     readonly property var userInformation: tdLibWrapper.getUserInformation(myMessage.sender_id.user_id)
     property QtObject precalculatedValues: ListView.view.precalculatedValues
     readonly property color textColor: isOwnMessage ? Theme.highlightColor : Theme.primaryColor
-    readonly property int textAlign: isOwnMessage ? Text.AlignRight : Text.AlignLeft
+    readonly property int textAlign: Text.AlignLeft
     readonly property Page page: precalculatedValues.page
     readonly property bool isSelected: messageListItem.precalculatedValues.pageIsSelecting && page.selectedMessages.some(function(existingMessage) {
         return existingMessage.id === messageId
@@ -363,13 +363,13 @@ ListItem {
 
                 anchors {
                     left: parent.left
-                    leftMargin: messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0
+                    leftMargin: page.isPrivateChat ? (messageListItem.isOwnMessage ? precalculatedValues.pageMarginDouble : 0) : 0 //левый марджин для собственных сообщений в приватных чатах. В остальных на полную ширину
                     verticalCenter: parent.verticalCenter
                 }
                 height: messageTextColumn.height + precalculatedValues.paddingMediumDouble
                 width: precalculatedValues.backgroundWidth
                 property bool isUnread: index > chatModel.getLastReadMessageIndex() && myMessage['@type'] !== "sponsoredMessage"
-                color: Theme.colorScheme === Theme.LightOnDark ? (isUnread ? Theme.secondaryHighlightColor : Theme.secondaryColor) : (isUnread ? Theme.backgroundGlowColor : Theme.overlayBackgroundColor)
+                color: Theme.colorScheme === Theme.LightOnDark ? (isOwnMessage ? Theme.highlightBackgroundColor : (isUnread ? Theme.secondaryHighlightColor : Theme.secondaryColor)) : (isOwnMessage ? Theme.highlightBackgroundColor : (isUnread ? Theme.backgroundGlowColor : Theme.overlayBackgroundColor))
                 radius: parent.width / 50
                 opacity: isUnread ? 0.5 : 0.2
                 visible: appSettings.showStickersAsImages || (myMessage.content['@type'] !== "messageSticker" && myMessage.content['@type'] !== "messageAnimatedEmoji")
@@ -398,7 +398,7 @@ ListItem {
                     truncationMode: TruncationMode.Fade
                     textFormat: Text.StyledText
                     horizontalAlignment: messageListItem.textAlign
-                    visible: precalculatedValues.showUserInfo || myMessage['@type'] === "sponsoredMessage"
+                    visible: messageListItem.isOwnMessage ? false : (precalculatedValues.showUserInfo || myMessage['@type'] === "sponsoredMessage")
                     MouseArea {
                         anchors.fill: parent
                         enabled: !(messageListItem.precalculatedValues.pageIsSelecting || messageListItem.isAnonymous)

qml/components/PhotoTextsListItem.qml

@@ -87,7 +87,7 @@ ListItem {
             Rectangle {
                 id: chatUnreadMessagesCountBackground
                 color: isMuted ? ((Theme.colorScheme === Theme.DarkOnLight) ? "lightgray" : "dimgray") : Theme.highlightBackgroundColor
-                width: Theme.fontSizeLarge
+                width: chatUnreadMessagesCount.width + Theme.fontSizeLarge / 2
                 height: Theme.fontSizeLarge
                 anchors.right: parent.right
                 anchors.bottom: parent.bottom