Options for creating new chats...

qml/pages/NewChatPage.qml

@@ -32,6 +32,7 @@ Page {
     onStatusChanged: {
         if (status === PageStatus.Active) {
             newChatPage.contacts = tdLibWrapper.getContactsFullInfo();
+            newChatPage.isLoading = false;
         }
     }
 
@@ -50,49 +51,280 @@ Page {
                 title: qsTr("Your Contacts")
             }
 
-            SilicaListView {
+            Item {
-                id: contactsListView
+                id: contactsItem
-                model: newChatPage.contacts
+
-                clip: true
-                height: newChatPageColumn.height - newChatPageHeader.height
                 width: newChatPageColumn.width
-                //opacity: newChatPage.isLoading ? 0 : 1
+                height: newChatPageColumn.height - newChatPageHeader.height
-                Behavior on opacity { FadeAnimation {} }
 
-                ViewPlaceholder {
+                SilicaListView {
-                    y: Theme.paddingLarge
+                    id: contactsListView
-                    enabled: contactsListView.count === 0
+                    model: newChatPage.contacts
-                    text: qsTr("You don't have any contacts.")
+                    clip: true
-                }
-
-                delegate: PhotoTextsListItem {
-                    pictureThumbnail {
-                        photoData: (typeof modelData.profile_photo !== "undefined") ? modelData.profile_photo.small : ""
-                    }
                     width: parent.width
+                    height: parent.height
+                    visible: !newChatPage.isLoading
+                    opacity: visible ? 1 : 0
+                    Behavior on opacity { FadeAnimation {} }                    
 
-                    primaryText.text: Emoji.emojify(Functions.getUserName(modelData), primaryText.font.pixelSize, "../js/emoji/")
+                    signal newChatInitiated ( int currentIndex )
-                    prologSecondaryText.text: "@" + ( modelData.username !== "" ? modelData.username : modelData.id )
+
-//                    secondaryText {
+                    ViewPlaceholder {
-//                        horizontalAlignment: Text.AlignRight
+                        y: Theme.paddingLarge
-//                        property string statusText: Functions.getChatMemberStatusText(model.status["@type"])
+                        enabled: contactsListView.count === 0
-//                        property string customText: model.status.custom_title ? Emoji.emojify(model.status.custom_title, secondaryText.font.pixelSize, "../js/emoji/") : ""
+                        text: qsTr("You don't have any contacts.")
-//                        text: (statusText !== "" && customText !== "") ? statusText + ", " + customText : statusText + customText
-//                    }
-                    tertiaryText {
-                        maximumLineCount: 1
-                        text: Functions.getChatPartnerStatusText(modelData.status["@type"], modelData.status.was_online);
-                        elide: Text.ElideRight
                     }
 
-                    onClicked: {
+                    delegate: Item {
-                        tdLibWrapper.createPrivateChat(modelData.id);
+                        id: newChatListItem
+                        width: parent.width
+                        height: contactListItem.height
+
+                        PhotoTextsListItem {
+                            id: contactListItem
+
+                            opacity: visible ? 1 : 0
+                            Behavior on opacity { FadeAnimation {} }
+
+                            pictureThumbnail {
+                                photoData: (typeof modelData.profile_photo !== "undefined") ? modelData.profile_photo.small : {}
+                            }
+                            width: parent.width
+
+                            primaryText.text: Emoji.emojify(Functions.getUserName(modelData), primaryText.font.pixelSize, "../js/emoji/")
+                            prologSecondaryText.text: "@" + ( modelData.username !== "" ? modelData.username : modelData.id )
+                            tertiaryText {
+                                maximumLineCount: 1
+                                text: Functions.getChatPartnerStatusText(modelData.status["@type"], modelData.status.was_online);
+                                elide: Text.ElideRight
+                            }
+
+                            onClicked: {
+                                contactsListView.newChatInitiated(index);
+                            }
+
+                            Connections {
+                                target: contactsListView
+                                onNewChatInitiated: {
+                                    if (index === currentIndex) {
+                                        contactListItem.visible = false;
+                                    } else {
+                                        contactListItem.visible = true;
+                                    }
+                                }
+                            }
+                        }
+
+                        Column {
+                            id: selectChatTypeColumn
+                            visible: !contactListItem.visible
+                            opacity: visible ? 1 : 0
+                            Behavior on opacity { FadeAnimation {} }
+                            width: parent.width
+                            height: contactListItem.height
+
+                            Item {
+                                width: parent.width
+                                height: parent.height - chatTypeSeparator.height
+
+                                Rectangle {
+                                    anchors.fill: parent
+                                    opacity: 0.3
+                                    color: Theme.overlayBackgroundColor
+                                }
+
+                                Item {
+                                    id: privateChatItem
+                                    height: parent.height
+                                    width: parent.width / 2 + ( Theme.horizontalPageMargin / 2 )
+                                    anchors.left: parent.left
+                                    anchors.top: parent.top
+
+                                    Rectangle {
+                                        id: privateChatHighlightBackground
+                                        anchors.fill: parent
+                                        color: Theme.highlightBackgroundColor
+                                        opacity: 0.5
+                                        visible: false
+                                    }
+
+                                    Row {
+                                        width: parent.width
+                                        height: parent.height - ( 2 * Theme.paddingSmall )
+                                        anchors.verticalCenter: parent.verticalCenter
+
+                                        IconButton {
+                                            id: privateChatButton
+                                            width: Theme.itemSizeLarge
+                                            height: Theme.itemSizeLarge
+                                            icon.source: "image://theme/icon-m-chat"
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            onClicked: {
+                                                tdLibWrapper.createPrivateChat(modelData.id);
+                                            }
+                                        }
+
+                                        Column {
+                                            height: parent.height
+                                            width: parent.width - privateChatButton.width - Theme.horizontalPageMargin
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            spacing: Theme.paddingSmall
+                                            Text {
+                                                id: privateChatHeader
+                                                width: parent.width
+                                                font.pixelSize: Theme.fontSizeMedium
+                                                font.weight: Font.ExtraBold
+                                                color: Theme.primaryColor
+                                                maximumLineCount: 1
+                                                elide: Text.ElideRight
+                                                textFormat: Text.StyledText
+                                                text: qsTr("Private Chat")
+                                            }
+                                            Text {
+                                                width: parent.width
+                                                height: parent.height - privateChatHeader.height - Theme.paddingSmall
+                                                font.pixelSize: Theme.fontSizeTiny
+                                                color: Theme.secondaryColor
+                                                wrapMode: Text.Wrap
+                                                elide: Text.ElideRight
+                                                textFormat: Text.StyledText
+                                                text: qsTr("Transport-encrypted, stored in Telegram Cloud, sharable across devices")
+                                            }
+                                        }
+
+                                    }
+
+                                    MouseArea {
+                                        anchors.fill: parent
+                                        onClicked: {
+                                            tdLibWrapper.createPrivateChat(modelData.id);
+                                        }
+                                        onPressed: {
+                                            privateChatHighlightBackground.visible = true;
+                                        }
+                                        onReleased: {
+                                            privateChatHighlightBackground.visible = false;
+                                        }
+                                    }
+                                }
+
+                                Item {
+                                    id: secretChatItem
+                                    height: parent.height
+                                    width: parent.width / 2 + ( Theme.horizontalPageMargin / 2 )
+                                    anchors.left: privateChatItem.right
+                                    anchors.top: parent.top
+
+                                    Rectangle {
+                                        id: secretChatHighlightBackground
+                                        anchors.fill: parent
+                                        color: Theme.highlightBackgroundColor
+                                        opacity: 0.5
+                                        visible: false
+                                    }
+
+                                    Row {
+                                        width: parent.width
+                                        height: parent.height - ( 2 * Theme.paddingSmall )
+                                        anchors.verticalCenter: parent.verticalCenter
+
+                                        IconButton {
+                                            id: secretChatButton
+                                            width: Theme.itemSizeLarge
+                                            height: Theme.itemSizeLarge
+                                            icon.source: "image://theme/icon-m-device-lock"
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            onClicked: {
+                                                console.log("SECRET CHAT!");
+                                            }
+                                        }
+
+                                        Column {
+                                            height: parent.height
+                                            width: parent.width - secretChatButton.width - Theme.horizontalPageMargin
+                                            anchors.verticalCenter: parent.verticalCenter
+                                            spacing: Theme.paddingSmall
+                                            Text {
+                                                width: parent.width
+                                                font.pixelSize: Theme.fontSizeMedium
+                                                font.weight: Font.ExtraBold
+                                                color: Theme.primaryColor
+                                                maximumLineCount: 1
+                                                elide: Text.ElideRight
+                                                textFormat: Text.StyledText
+                                                text: qsTr("Secret Chat")
+                                            }
+                                            Text {
+                                                width: parent.width
+                                                height: parent.height - privateChatHeader.height - Theme.paddingSmall
+                                                font.pixelSize: Theme.fontSizeTiny
+                                                color: Theme.secondaryColor
+                                                wrapMode: Text.Wrap
+                                                elide: Text.ElideRight
+                                                textFormat: Text.StyledText
+                                                text: qsTr("End-to-end-encrypted, accessible on this device only")
+                                            }
+                                        }
+
+                                    }
+
+                                    MouseArea {
+                                        anchors.fill: parent
+                                        onClicked: {
+                                            console.log("SECRET CHAT!");
+                                        }
+                                        onPressed: {
+                                            secretChatHighlightBackground.visible = true;
+                                        }
+                                        onReleased: {
+                                            secretChatHighlightBackground.visible = false;
+                                        }
+                                    }
+                                }
+
+                            }
+
+                            Separator {
+                                id: chatTypeSeparator
+                                width: parent.width
+                                color: Theme.primaryColor
+                                horizontalAlignment: Qt.AlignHCenter
+                            }
+
+                        }
+
+                    }
+
+                    VerticalScrollDecorator {}
+                }
+
+                Column {
+
+                    opacity: visible ? 1 : 0
+                    Behavior on opacity { FadeAnimation {} }
+                    visible: newChatPage.isLoading
+                    width: parent.width
+                    height: loadingLabel.height + loadingBusyIndicator.height + Theme.paddingMedium
+
+                    spacing: Theme.paddingMedium
+
+                    anchors.verticalCenter: parent.verticalCenter
+
+                    InfoLabel {
+                        id: loadingLabel
+                        text: qsTr("Loading contacs...")
+                    }
+
+                    BusyIndicator {
+                        id: loadingBusyIndicator
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        running: newChatPage.isLoading
+                        size: BusyIndicatorSize.Large
                     }
                 }
 
-                VerticalScrollDecorator {}
             }
-        }
 
+        }
     }
 }

src/tdlibwrapper.cpp

@@ -945,11 +945,14 @@ static bool compareUsers(const QVariant &user1, const QVariant &user2)
 
     const QString lastName1 = userMap1.value(LAST_NAME).toString();
     const QString lastName2 = userMap2.value(LAST_NAME).toString();
-    if (lastName1 < lastName2) {
+    if (!lastName1.isEmpty()) {
-        return true;
+        if (lastName1 < lastName2) {
-    } else if (lastName1 > lastName2) {
+            return true;
-        return false;
+        } else if (lastName1 > lastName2) {
+            return false;
+        }
     }
+
     const QString firstName1 = userMap1.value(FIRST_NAME).toString();
     const QString firstName2 = userMap2.value(FIRST_NAME).toString();
     if (firstName1 < firstName2) {

translations/harbour-fernschreiber-de.ts

@@ -900,6 +900,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-en.ts

@@ -900,6 +900,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-es.ts

@@ -890,6 +890,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-fi.ts

@@ -901,6 +901,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-hu.ts

@@ -890,6 +890,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-it.ts

@@ -900,6 +900,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-pl.ts

@@ -910,6 +910,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-ru.ts

@@ -910,6 +910,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-sv.ts

@@ -900,6 +900,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber-zh_CN.ts

@@ -890,6 +890,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>

translations/harbour-fernschreiber.ts

@@ -900,6 +900,14 @@
         <source>You don&apos;t have any contacts.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading contacs...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private Chat</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NotificationManager</name>