From e617c8981fb3e1fd7ff0febe8613382af2981229 Mon Sep 17 00:00:00 2001 From: Alexandra Betouni Date: Wed, 28 Sep 2022 17:24:12 +0300 Subject: [PATCH] fix(SendRequestModal): fixing spacing issues Closes #6941 --- ui/imports/shared/controls/chat/ProfileHeader.qml | 13 ++++--------- .../shared/popups/SendContactRequestModal.qml | 15 ++++++++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ui/imports/shared/controls/chat/ProfileHeader.qml b/ui/imports/shared/controls/chat/ProfileHeader.qml index b8efb79bac..92a612563c 100644 --- a/ui/imports/shared/controls/chat/ProfileHeader.qml +++ b/ui/imports/shared/controls/chat/ProfileHeader.qml @@ -79,7 +79,7 @@ Item { pubkey: root.pubkey image: root.icon interactive: false - imageWidth: d.getSize(36, 80, 160) + imageWidth: d.getSize(36, 64, 160) imageHeight: imageWidth showRing: !root.userIsEnsVerified } @@ -109,18 +109,15 @@ Item { StyledText { Layout.fillWidth: true - visible: root.displayNameVisible - text: root.displayName - horizontalAlignment: Text.AlignHCenter elide: Text.ElideRight maximumLineCount: 3 wrapMode: Text.Wrap font { - weight: Font.Medium - pixelSize: Style.current.primaryTextFontSize + bold: true + pixelSize: 17 } } @@ -171,11 +168,9 @@ Item { Layout.fillWidth: true Layout.alignment: Qt.AlignHCenter visible: root.pubkeyVisible - text: Utils.getElidedCompressedPk(pubkey) - horizontalAlignment: Text.AlignHCenter - font.pixelSize: Style.current.asideTextFontSize + font.pixelSize: 13 color: Style.current.secondaryText } diff --git a/ui/imports/shared/popups/SendContactRequestModal.qml b/ui/imports/shared/popups/SendContactRequestModal.qml index dd51215577..f87b41e67d 100644 --- a/ui/imports/shared/popups/SendContactRequestModal.qml +++ b/ui/imports/shared/popups/SendContactRequestModal.qml @@ -24,7 +24,9 @@ StatusModal { signal accepted(string message) - padding: Style.current.padding + width: 480 + height: 548 + header.title: qsTr("Send Contact Request to %1").arg(userDisplayName) QtObject { @@ -33,7 +35,7 @@ StatusModal { readonly property int maxMsgLength: 280 readonly property int minMsgLength: 1 readonly property int msgHeight: 152 - readonly property int contentSpacing: 5 + readonly property int contentSpacing: Style.current.halfPadding } onAboutToShow: { @@ -43,6 +45,9 @@ StatusModal { ColumnLayout { id: content anchors.fill: parent + anchors.topMargin: Style.current.bigPadding + anchors.leftMargin: Style.current.padding + anchors.rightMargin: Style.current.padding spacing: d.contentSpacing ProfileHeader { @@ -60,20 +65,20 @@ StatusModal { StatusInput { id: messageInput + Layout.fillWidth: true charLimit: d.maxMsgLength - placeholderText: root.challengeText input.multiline: true minimumHeight: d.msgHeight maximumHeight: d.msgHeight input.verticalAlignment: TextEdit.AlignTop - validators: StatusMinLengthValidator { minLength: d.minMsgLength errorMessage: Utils.getErrorMessage(messageInput.errors, qsTr("who are you")) } - Layout.fillWidth: true } + + Item { Layout.fillHeight: true } } rightButtons: StatusButton {