From 406e00df43e49c42335b250d50a8287ae4f4f0ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82?= <44851575+zneix@users.noreply.github.com>
Date: Wed, 21 Oct 2020 17:02:24 +0200
Subject: [PATCH] Fixed some stuff regarding usercard (#2100)

- split everything into 2 separate labels, so we won't have any issues with dank dpi (like pajlada had) and no resizing to minimum size is required (which was apparently broken on Windows xd)
- decided to remove line, which is rather not visible / very small and can't be seen anyway
- added nice unicode characters for follow and sub label
- removed unnecessary QLabel include (which I believe was also introduced by me by an accident)
---
 src/widgets/dialogs/UserInfoPopup.cpp | 32 ++++++++++++---------------
 src/widgets/dialogs/UserInfoPopup.hpp |  3 ++-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/widgets/dialogs/UserInfoPopup.cpp b/src/widgets/dialogs/UserInfoPopup.cpp
index 0fa98a5fc..d9dfbebc9 100644
--- a/src/widgets/dialogs/UserInfoPopup.cpp
+++ b/src/widgets/dialogs/UserInfoPopup.cpp
@@ -23,7 +23,6 @@
 
 #include <QCheckBox>
 #include <QDesktopServices>
-#include <QLabel>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 
@@ -164,10 +163,8 @@ UserInfoPopup::UserInfoPopup(bool closeAutomatically)
                 .assign(&this->ui_.followerCountLabel);
             vbox.emplace<Label>(TEXT_CREATED.arg(""))
                 .assign(&this->ui_.createdDateLabel);
-            vbox.emplace<Line>(true);
-            vbox.emplace<Label>("")
-                .assign(&this->ui_.followageSubageLabel)
-                ->setMinimumSize(this->minimumSizeHint());
+            vbox.emplace<Label>("").assign(&this->ui_.followageLabel);
+            vbox.emplace<Label>("").assign(&this->ui_.subageLabel);
         }
     }
 
@@ -667,34 +664,33 @@ void UserInfoPopup::updateUserData()
                     return;
                 }
 
-                QString labelText;
-
                 if (!subageInfo.followingSince.isEmpty())
                 {
                     QDateTime followedAt = QDateTime::fromString(
                         subageInfo.followingSince, Qt::ISODate);
                     QString followingSince = followedAt.toString("yyyy-MM-dd");
-                    labelText = "Following since " + followingSince;
+                    this->ui_.followageLabel->setText("❤ Following since " +
+                                                      followingSince);
                 }
 
                 if (subageInfo.isSubHidden)
                 {
-                    labelText += "\nSubscribtion status hidden";
+                    this->ui_.subageLabel->setText(
+                        "Subscription status hidden");
                 }
-                if (subageInfo.isSubbed)
+                else if (subageInfo.isSubbed)
                 {
-                    labelText += QString("\nTier %1 - Subscribed for %2 months")
-                                     .arg(subageInfo.subTier)
-                                     .arg(subageInfo.totalSubMonths);
+                    this->ui_.subageLabel->setText(
+                        QString("★ Tier %1 - Subscribed for %2 months")
+                            .arg(subageInfo.subTier)
+                            .arg(subageInfo.totalSubMonths));
                 }
                 else if (subageInfo.totalSubMonths)
                 {
-                    labelText +=
-                        QString("\nPreviously subscribed for %1 months")
-                            .arg(subageInfo.totalSubMonths);
+                    this->ui_.subageLabel->setText(
+                        QString("★ Previously subscribed for %1 months")
+                            .arg(subageInfo.totalSubMonths));
                 }
-
-                this->ui_.followageSubageLabel->setText(labelText);
             },
             [] {});
     };
diff --git a/src/widgets/dialogs/UserInfoPopup.hpp b/src/widgets/dialogs/UserInfoPopup.hpp
index f48411f5a..aa69b7829 100644
--- a/src/widgets/dialogs/UserInfoPopup.hpp
+++ b/src/widgets/dialogs/UserInfoPopup.hpp
@@ -55,7 +55,8 @@ private:
         Label *followerCountLabel = nullptr;
         Label *createdDateLabel = nullptr;
         Label *userIDLabel = nullptr;
-        Label *followageSubageLabel = nullptr;
+        Label *followageLabel = nullptr;
+        Label *subageLabel = nullptr;
 
         QCheckBox *follow = nullptr;
         QCheckBox *ignore = nullptr;