fix: adapt StatusMemeberListItem usages to renamed properties

2022-06-12 16:25:17 +02:00 · 2022-06-12 16:25:17 +02:00 · b816643e2d
parent 33a3ee3d6e
commit b816643e2d
5 changed files with 77 additions and 106 deletions
--- a/sandbox/controls/ListItems.qml
+++ b/sandbox/controls/ListItems.qml
@ -394,13 +394,13 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
    StatusMemberListItem {
        nickName: "This is an example"
        userName: "annabelle"
-        chatKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
-        trustIndicator: StatusContactVerificationIcons.TrustedType.Verified
-        isMutualContact: true
+        pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
+        isVerified: true
+        isContact: true
        image.source: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0BhCExPynn1gWf9bx498P7/
                      nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC"
        image.isIdenticon: true
-        isOnline: true
+        status: 1 // FIXME: use enum
        ringSettings.ringSpecModel:
            ListModel {
                ListElement {colorId: 13; segmentLength: 5}
@ -416,27 +416,25 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I

    StatusMemberListItem {
        nickName: "carmen.eth"
-        isOnline: false
-        trustIndicator: StatusContactVerificationIcons.TrustedType.Untrustworthy
+        isUntrustworthy: true
    }

    StatusMemberListItem {
        nickName: "very-long-annoying-nickname.eth"
-        isOnline: false
-        trustIndicator: StatusContactVerificationIcons.TrustedType.Untrustworthy
+        isUntrustworthy: true
    }

    StatusMemberListItem {
        nickName: "This girl I know from work"
        userName: "annabelle"
-        isOnline: true
+        status: 1 // FIXME: use enum
    }

    StatusMemberListItem {
        nickName: "Mark Cuban"
        userName: "annabelle"
-        chatKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
-        isMutualContact: true
+        pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
+        isContact: true
        image.source: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0BhCExPynn1gWf9bx498P7/
                       nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC"
        image.isIdenticon: true
@ -444,8 +442,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I

    StatusMemberListItem {
        nickName: "admin.guy"
-        isOnline: false
        isAdmin: true
-        trustIndicator: StatusContactVerificationIcons.TrustedType.Untrustworthy
+        isUntrustworthy: true
    }
 }
--- a/sandbox/demoapp/CreateChatView.qml
+++ b/sandbox/demoapp/CreateChatView.qml
@ -36,7 +36,7 @@ Page {
                var index = -1;
                if (!!contactsModel) {
                    for (var i = 0; i < contactsModel.count; i++) {
-                        if (contactsModel.get(i).publicId === pubKey) {
+                        if (contactsModel.get(i).pubKey === pubKey) {
                            index = i;
                        }
                    }
--- a/sandbox/demoapp/StatusAppCommunityView.qml
+++ b/sandbox/demoapp/StatusAppCommunityView.qml
@ -267,15 +267,15 @@ StatusAppThreePanelLayout {
            model: Models.membersListModel
            delegate: StatusMemberListItem {
                implicitWidth: parent.width
-                nickName: model.nickName
-                userName: model.name
-                chatKey: model.publicId
-                trustIndicator: model.trustIndicator
-                isMutualContact: model.isMutualContact
+                nickName: model.localNickname
+                userName: model.displayName
+                pubKey: model.pubKey
+                isVerified: model.isVerified
+                isUntrustworthy: model.isUntrustworthy
+                isContact: model.isContact
                image.source: model.icon
-                image.isIdenticon: model.isIdenticon
-                isOnline: model.onlineStatus
-                ringSettings.ringSpecModel: model.ringSpecModel
+                image.isIdenticon: false
+                status: model.onlineStatus
            }
        }
    }
--- a/sandbox/demoapp/data/Models.qml
+++ b/sandbox/demoapp/data/Models.qml
@ -843,73 +843,50 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
    property var membersListModel: ListModel {
        id: membersList
        ListElement {
-            nickName: "This is an example"
-            name: "Maria"
-            publicId: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
-            trustIndicator: StatusContactVerificationIcons.TrustedType.Verified
-            isMutualContact: true
-            onlineStatus: true
+            localNickname: "This is an example"
+            displayName: "Maria"
+            pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
+            isVerified: true
+            isUntrustworthy: false
+            isContact: true
+            onlineStatus: 1
            icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0BhCExPynn1gWf9bx498P7/
                            nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC"
-            isIdenticon: true
            isAdmin: false
-            ringSpecModel: [ ListElement {colorId: 13; segmentLength: 5},
-                             ListElement {colorId: 31; segmentLength: 5},
-                             ListElement {colorId: 10; segmentLength: 1},
-                             ListElement {colorId: 2; segmentLength: 5},
-                             ListElement {colorId: 26; segmentLength: 2},
-                             ListElement {colorId: 19; segmentLength: 4},
-                             ListElement {colorId: 28; segmentLength: 3} ]
        }
        ListElement {
-            nickName: ""
-            name: "carmen.eth"
-            publicId: "0x043a7ed78362567894688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
-            trustIndicator: StatusContactVerificationIcons.TrustedType.Untrustworthy
-            isMutualContact: false
-            onlineStatus: false
+            localNickname: ""
+            displayName: "carmen.eth"
+            pubKey: "0x043a7ed78362567894688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
+            isVerified: false
+            isUntrustworthy: true
+            isContact: false
+            onlineStatus: 0
            icon: ""
            isAdmin: false
-            isIdenticon: false            
        }
        ListElement {
-            nickName: "This girl I know from work"
-            name: "annabelle"
-            publicId: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486dsfkjghyu2cf04"
-            trustIndicator: StatusContactVerificationIcons.TrustedType.None
-            isMutualContact: false
-            onlineStatus: true
+            localNickname: "This girl I know from work"
+            displayName: "annabelle"
+            pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486dsfkjghyu2cf04"
+            isVerified: false
+            isUntrustworthy: false
+            isContact: false
+            onlineStatus: 1
            isAdmin: false
            icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAiElEQVR4nOzXUQpAQBRGYWQvLNAyLJDV8C5qpiGnv/M9al5Ot27X0IUwhMYQGkNoDKGJCRlLH67bftx9X+ap/+P9VcxEDK
                     ExhKZ4a9Uq3TZviZmIITSG0DRvlqcbqVbrlouZiCE0htD4h0hjCI0hNN5aNIbQGKKPxEzEEBpDaAyhMYTmDAAA//+gYCErzmCpCQAAAABJRU5ErkJggg=="
-            isIdenticon: true
-            ringSpecModel: [ ListElement {colorId: 11; segmentLength: 1},
-                             ListElement {colorId: 23; segmentLength: 5},
-                             ListElement {colorId: 23; segmentLength: 5},
-                             ListElement {colorId: 10; segmentLength: 4},
-                             ListElement {colorId: 15; segmentLength: 3},
-                             ListElement {colorId: 26; segmentLength: 2},
-                             ListElement {colorId: 29; segmentLength: 5} ]
        }
        ListElement {
-            nickName: "Mark Cuban"
-            name: "mark.eth"
-            publicId: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc79872cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
-            trustIndicator: StatusContactVerificationIcons.TrustedType.Untrustworthy
-            isMutualContact: true
-            onlineStatus: false
+            localNickname: "Mark Cuban"
+            displayName: "mark.eth"
+            pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc79872cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04"
+            isVerified: false
+            isUntrustworthy: true
+            isContact: true
+            onlineStatus: 0
            icon: ""
-            isIdenticon: false
            isAdmin: false
-            ringSpecModel: [ ListElement {colorId: 0; segmentLength: 1},
-                             ListElement {colorId: 28; segmentLength: 1},
-                             ListElement {colorId: 31; segmentLength: 1},
-                             ListElement {colorId: 22; segmentLength: 4},
-                             ListElement {colorId: 28; segmentLength: 3},
-                             ListElement {colorId: 27; segmentLength: 5},
-                             ListElement {colorId: 7; segmentLength: 5},
-                             ListElement {colorId: 13; segmentLength: 1},
-                             ListElement {colorId: 25; segmentLength: 4}]
        }
    }

@ -1003,7 +980,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
            color: ""
            hasNotification: false
            notificationsCount: 0
-        }        
+        }
        ListElement {
            sectionId: "profile"
            sectionType: 6
@ -1320,7 +1297,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I
            category: "Beta Languages"
            selected: false
        }
-    }    
+    }

    property ListModel featuredCommunitiesModel : ListModel {
        ListElement {
--- a/src/StatusQ/Components/StatusTagSelector.qml
+++ b/src/StatusQ/Components/StatusTagSelector.qml
@ -26,24 +26,21 @@ import StatusQ.Controls 0.1
        anchors.centerIn: parent
        namesModel: ListModel {
            ListElement {
-                publicId: "0x0"
+                pubKey: "0x0"
                name: "Maria"
                icon: ""
-                isIdenticon: false
                onlineStatus: 3
            }
            ListElement {
-                publicId: "0x1"
+                pubKey: "0x1"
                name: "James"
                icon: "https://pbs.twimg.com/profile_images/1369221718338895873/T_5fny6o_400x400.jpg"
-                isIdenticon: false
                onlineStatus: 1
            }
            ListElement {
-                publicId: "0x2"
+                pubKey: "0x2"
                name: "Paul"
                icon: ""
-                isIdenticon: false
                onlineStatus: 2
            }
        }
@ -154,11 +151,11 @@ Item {
        This function is used to insert a new tag.
    */
    function insertTag(name, id, isReadonly, tagIcon) {
-        if (!find(namesModel, function(item) { return item.publicId === id }) && namesModel.count < root.nameCountLimit) {
+        if (!find(namesModel, function(item) { return item.pubKey === id }) && namesModel.count < root.nameCountLimit) {
            if(orderByReadonly && isReadonly)
-                namesModel.insert(0, {"name": name, "publicId": id, "isReadonly": !!isReadonly, "tagIcon": tagIcon ? tagIcon : ""});
+                namesModel.insert(0, {"name": name, "pubKey": id, "isReadonly": !!isReadonly, "tagIcon": tagIcon ? tagIcon : ""});
            else
-                namesModel.insert(namesModel.count, {"name": name, "publicId": id, "isReadonly": !!isReadonly, "tagIcon": tagIcon ? tagIcon : ""});
+                namesModel.insert(namesModel.count, {"name": name, "pubKey": id, "isReadonly": !!isReadonly, "tagIcon": tagIcon ? tagIcon : ""});
            addMember(id);
            edit.clear();
        }
@ -173,16 +170,16 @@ Item {
        if (text !== "") {
            for (var i = 0; i < inputModel.count; i++ ) {
                var entry = inputModel.get(i);
-                if (entry.name.toLowerCase().includes(text.toLowerCase()) &&
-                    !find(namesModel, function(item) { return item.name === entry.name })) {
-                    sortedList.append({"publicId": entry.publicId,
-                                       "name": entry.name,
-                                       "nickName": entry.nickName,
-                                       "trustIndicator": entry.trustIndicator,
-                                       "isMutualContact": entry.isMutualContact,
+                if (entry.displayName.toLowerCase().includes(text.toLowerCase()) &&
+                    !find(namesModel, function(item) { return item.name === entry.displayName })) {
+                    sortedList.append({"pubKey": entry.pubKey,
+                                       "displayName": entry.displayName,
+                                       "localNickname": entry.localNickname,
+                                       "isVerified": entry.isVerified,
+                                       "isUntrustworthy": entry.isUntrustworthy,
+                                       "isContact": entry.isMutualContact,
                                       "ringSpecModel": entry.ringSpecModel,
                                       "icon": entry.icon,
-                                       "isIdenticon": entry.isIdenticon,
                                       "onlineStatus": entry.onlineStatus,
                                       "tagIcon": entry.tagIcon ? entry.tagIcon : "",
                                       "isReadonly": !!entry.isReadonly});
@ -284,7 +281,7 @@ Item {
                        icon: model.tagIcon

                        onClicked: {
-                            removeMember(model.publicId);
+                            removeMember(model.pubKey);
                            namesModel.remove(index, 1);
                        }
                    }
@ -307,12 +304,12 @@ Item {
                    if ((event.key === Qt.Key_Backspace || event.key === Qt.Key_Escape)
                            && getText(cursorPosition, (cursorPosition-1)) === ""
                            && (namesList.count-1) >= 0) {
-                        removeMember(namesModel.get(namesList.count-1).publicId);
+                        removeMember(namesModel.get(namesList.count-1).pubKey);
                        namesModel.remove((namesList.count-1), 1);
                    }
                    if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (sortedList.count > 0)) {
                        root.insertTag(sortedList.get(userListView.currentIndex).name,
-                                       sortedList.get(userListView.currentIndex).publicId,
+                                       sortedList.get(userListView.currentIndex).pubKey,
                                       sortedList.get(userListView.currentIndex).isReadonly,
                                       sortedList.get(userListView.currentIndex).tagIcon);
                    }                    
@ -401,27 +398,27 @@ Item {
                height: visible ? 64 : 0
                visible: {
                    for (let i = 0; i < namesModel.count; i++) {
-                        if (namesModel.get(i).publicId === model.publicId) {
+                        if (namesModel.get(i).pubKey === model.pubKey) {
                            return false
                        }
                    }
                    return true
                }
-                nickName: model.nickName
-                userName: model.name
-                pubKey: root.compressedKeyGetter(model.publicId)
-                isVerified: false // FIXME
-                isUntrustworthy: false // FIXME
-                isContact: model.isMutualContact
+                nickName: model.localNickname
+                userName: model.displayName
+                pubKey: root.compressedKeyGetter(model.pubKey)
+                isVerified: model.isVerified
+                isUntrustworthy: model.isUntrustworthy
+                isContact: model.isContact
                image.source: model.icon
-                image.isIdenticon: model.isIdenticon
-                icon.color: Theme.palette.userCustomizationColors[root.colorIdForPubkeyGetter(model.publicId)]
+                image.isIdenticon: false
+                icon.color: Theme.palette.userCustomizationColors[root.colorIdForPubkeyGetter(model.pubKey)]
                status: model.onlineStatus
                statusListItemIcon.badge.border.color: sensor.containsMouse ? Theme.palette.baseColor2 : Theme.palette.baseColor4
-                ringSettings.ringSpecModel: root.ringSpecModelGetter(publicId)
+                ringSettings.ringSpecModel: root.ringSpecModelGetter(model.pubKey)
                color: (sensor.containsMouse || highlighted) ? Theme.palette.baseColor2 : "transparent"
                onClicked: {
-                    root.insertTag(model.name, model.publicId, model.isAdmin, model.isAdmin ? "crown" : "");
+                    root.insertTag(model.displayName, model.pubKey, model.isAdmin, model.isAdmin ? "crown" : "");
                }
            }
        }