Polish voice call UI

1 files changed, 54 insertions, 14 deletions

diff --git a/src/dialogs/AcceptCall.cpp b/src/dialogs/AcceptCall.cpp

index f04a613a..6b5e2e60 100644
--- a/src/dialogs/AcceptCall.cpp
+++ b/src/dialogs/AcceptCall.cpp
@@ -1,43 +1,83 @@
 #include <QLabel>
 #include <QPushButton>
+#include <QString>
 #include <QVBoxLayout>
 
 #include "Config.h"
+#include "Utils.h"
 #include "dialogs/AcceptCall.h"
+#include "ui/Avatar.h"
 
 namespace dialogs {
 
-AcceptCall::AcceptCall(const QString &caller, const QString &displayName, QWidget *parent)
-  : QWidget(parent)
+AcceptCall::AcceptCall(
+    const QString &caller,
+    const QString &displayName,
+    const QString &roomName,
+    const QString &avatarUrl,
+    QWidget *parent) : QWidget(parent)
 {
         setAutoFillBackground(true);
         setWindowFlags(Qt::Tool | Qt::WindowStaysOnTopHint);
         setWindowModality(Qt::WindowModal);
         setAttribute(Qt::WA_DeleteOnClose, true);
 
+        setMinimumWidth(conf::modals::MIN_WIDGET_WIDTH);
+        setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+
         auto layout = new QVBoxLayout(this);
         layout->setSpacing(conf::modals::WIDGET_SPACING);
         layout->setMargin(conf::modals::WIDGET_MARGIN);
 
-        auto buttonLayout = new QHBoxLayout();
-        buttonLayout->setSpacing(15);
-        buttonLayout->setMargin(0);
+        QFont f;
+        f.setPointSizeF(f.pointSizeF());
+
+        QFont labelFont;
+        labelFont.setWeight(QFont::Medium);
+
+        QLabel *displayNameLabel = nullptr;
+        if (!displayName.isEmpty() && displayName != caller) {
+                displayNameLabel = new QLabel(displayName, this);
+                labelFont.setPointSizeF(f.pointSizeF() * 2);
+                displayNameLabel ->setFont(labelFont);
+                displayNameLabel ->setAlignment(Qt::AlignCenter);
+        }
 
+        QLabel *callerLabel = new QLabel(caller, this);
+        labelFont.setPointSizeF(f.pointSizeF() * 1.2);
+        callerLabel->setFont(labelFont);
+        callerLabel->setAlignment(Qt::AlignCenter);
+
+        QLabel *voiceCallLabel = new QLabel("Voice Call", this);
+        labelFont.setPointSizeF(f.pointSizeF() * 1.1);
+        voiceCallLabel->setFont(labelFont);
+        voiceCallLabel->setAlignment(Qt::AlignCenter);
+
+        auto avatar = new Avatar(this, QFontMetrics(f).height() * 6);
+        if (!avatarUrl.isEmpty())
+          avatar->setImage(avatarUrl);
+        else
+          avatar->setLetter(utils::firstChar(roomName));
+
+        const int iconSize = 24;
+        auto buttonLayout = new QHBoxLayout();
+        buttonLayout->setSpacing(20);
         acceptBtn_ = new QPushButton(tr("Accept"), this);
         acceptBtn_->setDefault(true);
-        rejectBtn_ = new QPushButton(tr("Reject"), this);
+        acceptBtn_->setIcon(QIcon(":/icons/icons/ui/place-call.png"));
+        acceptBtn_->setIconSize(QSize(iconSize, iconSize));
 
-        buttonLayout->addStretch(1);
+        rejectBtn_ = new QPushButton(tr("Reject"), this);
+        rejectBtn_->setIcon(QIcon(":/icons/icons/ui/end-call.png"));
+        rejectBtn_->setIconSize(QSize(iconSize, iconSize));
         buttonLayout->addWidget(acceptBtn_);
         buttonLayout->addWidget(rejectBtn_);
 
-        QLabel *label;
-        if (!displayName.isEmpty() && displayName != caller)
-                label = new QLabel("Accept call from " + displayName + " (" + caller + ")?", this);
-        else
-                label = new QLabel("Accept call from " + caller + "?", this);
-
-        layout->addWidget(label);
+        if (displayNameLabel)
+          layout->addWidget(displayNameLabel, 0, Qt::AlignCenter);
+        layout->addWidget(callerLabel, 0, Qt::AlignCenter);
+        layout->addWidget(voiceCallLabel, 0, Qt::AlignCenter);
+        layout->addWidget(avatar, 0, Qt::AlignCenter);
         layout->addLayout(buttonLayout);
 
         connect(acceptBtn_, &QPushButton::clicked, this, [this]() {