From 04957186be3e2fe921448dd9e802a6c8f1d6f542 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Wed, 6 Jul 2022 11:43:51 -0400 Subject: [PATCH] refactor(isContact): rename isContact to isMutualContact isContact is an old name, isMutualContact is more clear, since we consider only mutual contacts as contacts --- sandbox/controls/ListItems.qml | 4 ++-- sandbox/demoapp/StatusAppCommunityView.qml | 2 +- sandbox/demoapp/data/Models.qml | 8 ++++---- src/StatusQ/Components/StatusMemberListItem.qml | 6 +++--- src/StatusQ/Components/StatusTagSelector.qml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sandbox/controls/ListItems.qml b/sandbox/controls/ListItems.qml index 215ef0dd..bcf280d2 100644 --- a/sandbox/controls/ListItems.qml +++ b/sandbox/controls/ListItems.qml @@ -396,7 +396,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I userName: "annabelle" pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04" isVerified: true - isContact: true + isMutualContact: true image.source: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0BhCExPynn1gWf9bx498P7/ nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC" image.isIdenticon: true @@ -434,7 +434,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I nickName: "Mark Cuban" userName: "annabelle" pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04" - isContact: true + isMutualContact: true image.source: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0BhCExPynn1gWf9bx498P7/ nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC" image.isIdenticon: true diff --git a/sandbox/demoapp/StatusAppCommunityView.qml b/sandbox/demoapp/StatusAppCommunityView.qml index d39f1287..5bc53138 100644 --- a/sandbox/demoapp/StatusAppCommunityView.qml +++ b/sandbox/demoapp/StatusAppCommunityView.qml @@ -272,7 +272,7 @@ StatusAppThreePanelLayout { pubKey: model.pubKey isVerified: model.isVerified isUntrustworthy: model.isUntrustworthy - isContact: model.isContact + isMutualContact: model.isMutualContact image.source: model.icon image.isIdenticon: false status: model.onlineStatus diff --git a/sandbox/demoapp/data/Models.qml b/sandbox/demoapp/data/Models.qml index 56a826eb..e2d9ffa0 100644 --- a/sandbox/demoapp/data/Models.qml +++ b/sandbox/demoapp/data/Models.qml @@ -848,7 +848,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04" isVerified: true isUntrustworthy: false - isContact: true + isMutualContact: true onlineStatus: 1 icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAlklEQVR4nOzW0QmDQBAG4SSkl7SUQlJGCrElq9F3QdjjVhh/5nv3cFhY9vUIYQiNITSG0BhCExPynn1gWf9bx498P7/ nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2ImYgiNITTlTdG1nUZ5a92VITQxITFiJmIIjSE0htAYQrMHAAD//+wwFVpz+yqXAAAAAElFTkSuQmCC" @@ -860,7 +860,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I pubKey: "0x043a7ed78362567894688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04" isVerified: false isUntrustworthy: true - isContact: false + isMutualContact: false onlineStatus: 0 icon: "" isAdmin: false @@ -871,7 +871,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc74f72cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486dsfkjghyu2cf04" isVerified: false isUntrustworthy: false - isContact: false + isMutualContact: false onlineStatus: 1 isAdmin: false icon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAiElEQVR4nOzXUQpAQBRGYWQvLNAyLJDV8C5qpiGnv/M9al5Ot27X0IUwhMYQGkNoDKGJCRlLH67bftx9X+ap/+P9VcxEDK @@ -883,7 +883,7 @@ CExPynn1gWf9bx498P7/nzPcxEzGExhBdJGYihtAYQlO+tUZvqrPbqeudo5iJGEJjCE15a3VtodH3q2I pubKey: "0x043a7ed0e8752236a4688563652fd0296453cef00a5dcddbe252dc79872cc1caa97a2b65e4a1a52d9c30a84c9966beaaaf6b333d659cbdd2e486b443ed1012cf04" isVerified: false isUntrustworthy: true - isContact: true + isMutualContact: true onlineStatus: 0 icon: "" isAdmin: false diff --git a/src/StatusQ/Components/StatusMemberListItem.qml b/src/StatusQ/Components/StatusMemberListItem.qml index 9553816c..a9b174bf 100644 --- a/src/StatusQ/Components/StatusMemberListItem.qml +++ b/src/StatusQ/Components/StatusMemberListItem.qml @@ -53,10 +53,10 @@ StatusListItem { */ property string pubKey: "" /*! - \qmlproperty string StatusMemberListItem::isContact + \qmlproperty string StatusMemberListItem::isMutualContact This property holds if the member represented is contact. */ - property bool isContact: false + property bool isMutualContact: false /*! \qmlproperty string StatusMemberListItem::isVerified This property holds if the member represented is verified contact. @@ -111,7 +111,7 @@ StatusListItem { // root object settings: title: (root.nickName === "") ? root.userName : root.nickName statusListItemTitleIcons.sourceComponent: StatusContactVerificationIcons { - isMutualContact: root.isContact + isMutualContact: root.isMutualContact trustIndicator: { if (root.isVerified) return StatusContactVerificationIcons.TrustedType.Verified else if (root.isUntrustworthy) return StatusContactVerificationIcons.TrustedType.Untrustworthy diff --git a/src/StatusQ/Components/StatusTagSelector.qml b/src/StatusQ/Components/StatusTagSelector.qml index 8180b9e7..31a76b63 100644 --- a/src/StatusQ/Components/StatusTagSelector.qml +++ b/src/StatusQ/Components/StatusTagSelector.qml @@ -177,7 +177,7 @@ Item { "localNickname": entry.localNickname, "isVerified": entry.isVerified, "isUntrustworthy": entry.isUntrustworthy, - "isContact": entry.isMutualContact, + "isMutualContact": entry.isMutualContact, "ringSpecModel": entry.ringSpecModel, "icon": entry.icon, "onlineStatus": entry.onlineStatus, @@ -409,7 +409,7 @@ Item { pubKey: root.compressedKeyGetter(model.pubKey) isVerified: model.isVerified isUntrustworthy: model.isUntrustworthy - isContact: model.isContact + isMutualContact: model.isMutualContact image.source: model.icon image.isIdenticon: false icon.color: Theme.palette.userCustomizationColors[root.colorIdForPubkeyGetter(model.pubKey)]