Clean up code, move values to Style.qml.

Signed-off-by: Camila <hello@camila.codes>

diff --git a/src/gui/tray/ActivityItem.qml b/src/gui/tray/ActivityItem.qml
index a5ff7e379f858a2766c39be8e5e51aee811302a2..b0ead37ed43272c5391646d291a593303167eca1 100644 (file)
--- a/src/gui/tray/ActivityItem.qml
+++ b/src/gui/tray/ActivityItem.qml
@@ -87,8 +87,9 @@ MouseArea {
             active: root.isChatActivity && root.isTalkReplyPossible && model.messageSent === ""
             visible: root.isTalkReplyOptionVisible
 
+            Layout.preferredWidth: Style.talkReplyTextFieldPreferredWidth
+            Layout.preferredHeight: Style.talkReplyTextFieldPreferredHeight
             Layout.leftMargin: Style.trayListItemIconSize + activityContent.spacing
-            Layout.preferredHeight: root.isTalkReplyOptionVisible ? implicitHeight : 0
 
             sourceComponent: TalkReplyTextField {
                 onSendReply: {

diff --git a/src/gui/tray/TalkReplyTextField.qml b/src/gui/tray/TalkReplyTextField.qml
index 3b61f1a939b13f95570ee85071d1f59994ecb522..996e6e2507088a67bf5a5d9384fa1565fc2da4a9 100644 (file)
--- a/src/gui/tray/TalkReplyTextField.qml
+++ b/src/gui/tray/TalkReplyTextField.qml
@@ -17,15 +17,13 @@ Item {
         root.sendReply(replyMessageTextField.text);
     }
 
-    height: 30
-    width: 250
-
     TextField {
         id: replyMessageTextField
 
+        height: Style.talkReplyTextFieldPreferredHeight
+
         anchors.fill: parent
-        topPadding: 4
-        rightPadding: sendReplyMessageButton.width
+
         visible: model.messageSent === ""
 
         color: Style.ncTextColor
@@ -42,9 +40,11 @@ Item {
         }
 
         Button {
-            id: sendReplyMessageButton  
-            width: 32
+            id: sendReplyMessageButton
+
+            width: Style.talkReplyTextFieldPreferredWidth * 0.12
             height: parent.height
+
             opacity: 0.8
             flat: true
             enabled: replyMessageTextField.text !== ""
@@ -53,8 +53,6 @@ Item {
 
             icon {
                 source: "image://svgimage-custom-color/send.svg" + "/" + Style.menuBorder
-                width: 38
-                height: 38
                 color: hovered || !sendReplyMessageButton.enabled? Style.menuBorder : UserModel.currentUser.accentColor
             }
 

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index b6a6f61863effc1bf91cb3e5c738086e4dab8d4b..42e32a036c595c24dea290e96e6355aec5357e16 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -73,6 +73,9 @@ QtObject {
 \r
     property int activityLabelBaseWidth: 240\r
 \r
+    property int talkReplyTextFieldPreferredHeight: 34\r
+    property int talkReplyTextFieldPreferredWidth: 250\r
+\r
     property int activityItemActionPrimaryButtonMinWidth: 100\r
     property int activityItemActionSecondaryButtonMinWidth: 80\r
 \r