From 1ab101c8b99ead3b7b6d8937c72931a6873232cf Mon Sep 17 00:00:00 2001 From: PavelS Date: Mon, 8 Aug 2022 18:56:57 +0300 Subject: [PATCH] fix(@desktop/comminities) adjust Community members tab Fixes #6786 --- ui/StatusQ | 2 +- .../AppLayouts/Chat/layouts/SettingsPageLayout.qml | 2 +- .../communities/CommunityMembersSettingsPanel.qml | 3 ++- .../panels/communities/CommunityMembersTabPanel.qml | 13 ++++++++----- .../AppLayouts/Chat/views/CommunitySettingsView.qml | 2 ++ 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ui/StatusQ b/ui/StatusQ index e5ddf28f02..98aa6a4b27 160000 --- a/ui/StatusQ +++ b/ui/StatusQ @@ -1 +1 @@ -Subproject commit e5ddf28f02c9bc506c2f02b4528ddfee837c27fc +Subproject commit 98aa6a4b27eb44adc7a12114e5478a1fef718935 diff --git a/ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml b/ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml index db1f458f56..6434077400 100644 --- a/ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml +++ b/ui/app/AppLayouts/Chat/layouts/SettingsPageLayout.qml @@ -65,7 +65,7 @@ Item { } StatusBaseText { - Layout.leftMargin: 32 + Layout.leftMargin: 36 text: root.title color: Theme.palette.directColor1 diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml index 9330839863..3b2a179cc7 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersSettingsPanel.qml @@ -32,11 +32,12 @@ SettingsPageLayout { title: qsTr("Members") content: ColumnLayout { - spacing: 8 + spacing: 19 StatusTabBar { id: membersTabBar Layout.fillWidth: true + Layout.topMargin: 5 StatusTabButton { id: allMembersBtn diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml index 22b2f64709..640cc7d877 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml @@ -33,11 +33,12 @@ Item { ColumnLayout { anchors.fill: parent - spacing: 25 + spacing: 30 StatusInput { id: memberSearch Layout.preferredWidth: 350 + Layout.leftMargin: 12 maximumHeight: 36 topPadding: 0 bottomPadding: 0 @@ -55,6 +56,7 @@ Item { model: root.model clip: true + spacing: 15 delegate: StatusMemberListItem { id: memberItem @@ -65,6 +67,7 @@ Item { statusListItemComponentsSlot.spacing: 16 rightPadding: 80 + leftPadding: 12 components: [ StatusButton { @@ -105,10 +108,10 @@ Item { icon.color: Theme.palette.userCustomizationColors[Utils.colorIdForPubkey(model.pubKey)] // FIXME: use model.colorId image.source: model.icon image.isIdenticon: false - image.width: 36 - image.height: 36 - icon.height: 36 - icon.width: 36 + image.width: 40 + image.height: 40 + icon.height: 40 + icon.width: 40 ringSettings.ringSpecModel: Utils.getColorHashAsJson(model.pubKey) statusListItemIcon.badge.visible: (root.panelType === CommunityMembersTabPanel.TabType.AllMembers) diff --git a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml b/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml index e325e26bd4..34c00c428f 100644 --- a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml +++ b/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml @@ -121,6 +121,8 @@ StatusAppTwoPanelLayout { rightPanel: Loader { anchors.fill: parent + anchors.leftMargin: 28 + anchors.topMargin: 23 anchors.margins: 16 active: root.community