diff --git a/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml b/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml index c2ff70c54c..adf6877f8f 100644 --- a/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml +++ b/ui/app/AppLayouts/Chat/popups/community/CommunitiesPopup.qml @@ -121,7 +121,7 @@ StatusModal { anchors.horizontalCenter: parent.horizontalCenter title: model.name subTitle: model.description - tertiaryTitle: qsTr("%1 members").arg(model.members.count) + tertiaryTitle: qsTr("%n member(s)", "", model.members.count) statusListItemTitle.font.weight: Font.Bold statusListItemTitle.font.pixelSize: 17 asset.name: model.image diff --git a/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml b/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml index 3272d7fabb..6ed280f9a1 100644 --- a/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml +++ b/ui/app/AppLayouts/Profile/panels/CommunitiesListPanel.qml @@ -27,9 +27,10 @@ StatusListView { id: statusCommunityItem width: parent.width title: model.name + statusListItemTitle.font.pixelSize: 17 + statusListItemTitle.font.bold: true subTitle: model.description - tertiaryTitle: qsTr(model.members.count === 1 ?"%1 member" - :"%1 members").arg(model.members.count) + tertiaryTitle: qsTr("%n member(s)", "", model.members.count) asset.name: model.image asset.isImage: asset.name.includes("data") asset.isLetterIdenticon: !model.image @@ -37,11 +38,7 @@ StatusListView { visible: model.joined height: visible ? implicitHeight: 0 - sensor.hoverEnabled: false - - onClicked: { - setActiveCommunityClicked(model.id) - } + onClicked: setActiveCommunityClicked(model.id) components: [ StatusFlatButton { @@ -49,7 +46,7 @@ StatusListView { size: StatusBaseButton.Size.Small type: StatusBaseButton.Type.Danger borderColor: "transparent" - text: qsTr("Leave community") + text: qsTr("Leave Community") onClicked: { Global.openPopup(leaveCommunityPopup, { community: model.name, @@ -57,19 +54,17 @@ StatusListView { }) } }, - StatusFlatRoundButton { - type: StatusFlatRoundButton.Type.Secondary - width: 44 - height: 44 - icon.source: model.muted ? Style.svg("communities/notifications-muted") - : Style.svg("communities/notifications") + StatusFlatButton { + size: StatusBaseButton.Size.Tiny + leftPadding: 4 + rightPadding: 0 + icon.name: model.muted ? "notification-muted" : "notification" onClicked: root.setCommunityMutedClicked(model.id, !model.muted) }, - - StatusFlatRoundButton { - type: StatusFlatRoundButton.Type.Secondary - width: 44 - height: 44 + StatusFlatButton { + size: StatusBaseButton.Size.Tiny + leftPadding: 4 + rightPadding: 0 icon.name: "invite-users" onClicked: root.inviteFriends(model) } diff --git a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml index 8b42cdbd79..36ed220aa2 100644 --- a/ui/app/AppLayouts/Profile/views/CommunitiesView.qml +++ b/ui/app/AppLayouts/Profile/views/CommunitiesView.qml @@ -26,7 +26,6 @@ SettingsContentBase { clip: true titleRowComponentLoader.sourceComponent: StatusButton { - size: StatusBaseButton.Size.Small text: qsTr("Import community") onClicked: { Global.openPopup(importCommunitiesPopupComponent) @@ -43,13 +42,13 @@ SettingsContentBase { width: parent.width anchors.top: parent.top anchors.left: parent.left + spacing: Style.current.padding StatusBaseText { anchors.left: parent.left anchors.leftMargin: Style.current.padding color: Theme.palette.baseColor1 text: qsTr("Communities you've joined") - font.pixelSize: 15 } CommunitiesListPanel {