diff --git a/include/AvatarProvider.h b/include/AvatarProvider.h
new file mode 100644
index 00000000..29c8152b
--- /dev/null
+++ b/include/AvatarProvider.h
@@ -0,0 +1,47 @@
+/*
+ * nheko Copyright (C) 2017 Konstantinos Sideris <siderisk@auth.gr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QImage>
+#include <QObject>
+#include <QSharedPointer>
+#include <QUrl>
+
+#include "MatrixClient.h"
+#include "TimelineItem.h"
+
+class AvatarProvider : public QObject
+{
+ Q_OBJECT
+
+public:
+ static void init(QSharedPointer<MatrixClient> client);
+ static void resolve(const QString &userId, TimelineItem *item);
+ static void setAvatarUrl(const QString &userId, const QUrl &url);
+
+ static void clear();
+
+private:
+ static void updateAvatar(const QString &uid, const QImage &img);
+
+ static QSharedPointer<MatrixClient> client_;
+ static QMap<QString, QList<TimelineItem *>> toBeResolved_;
+
+ static QMap<QString, QImage> userAvatars_;
+ static QMap<QString, QUrl> avatarUrls_;
+};
diff --git a/include/MatrixClient.h b/include/MatrixClient.h
index 2fdb57f0..2fde1c1e 100644
--- a/include/MatrixClient.h
+++ b/include/MatrixClient.h
@@ -41,6 +41,7 @@ public:
void registerUser(const QString &username, const QString &password, const QString &server) noexcept;
void versions() noexcept;
void fetchRoomAvatar(const QString &roomid, const QUrl &avatar_url);
+ void fetchUserAvatar(const QString &userId, const QUrl &avatarUrl);
void fetchOwnAvatar(const QUrl &avatar_url);
void downloadImage(const QString &event_id, const QUrl &url);
void messages(const QString &room_id, const QString &from_token) noexcept;
@@ -69,6 +70,7 @@ signals:
void registerSuccess(const QString &userid, const QString &homeserver, const QString &token);
void roomAvatarRetrieved(const QString &roomid, const QPixmap &img);
+ void userAvatarRetrieved(const QString &userId, const QImage &img);
void ownAvatarRetrieved(const QPixmap &img);
void imageDownloaded(const QString &event_id, const QPixmap &img);
@@ -95,6 +97,7 @@ private:
Messages,
Register,
RoomAvatar,
+ UserAvatar,
SendTextMessage,
Sync,
Versions,
@@ -111,6 +114,7 @@ private:
void onInitialSyncResponse(QNetworkReply *reply);
void onSyncResponse(QNetworkReply *reply);
void onRoomAvatarResponse(QNetworkReply *reply);
+ void onUserAvatarResponse(QNetworkReply *reply);
void onImageResponse(QNetworkReply *reply);
void onMessagesResponse(QNetworkReply *reply);
diff --git a/include/TimelineItem.h b/include/TimelineItem.h
index 5db823b0..c0cf1c7b 100644
--- a/include/TimelineItem.h
+++ b/include/TimelineItem.h
@@ -24,6 +24,7 @@
#include "ImageItem.h"
#include "Sync.h"
+#include "Avatar.h"
#include "Image.h"
#include "MessageEvent.h"
#include "Notice.h"
@@ -46,19 +47,35 @@ public:
TimelineItem(ImageItem *img, const events::MessageEvent<msgs::Image> &e, const QString &color, QWidget *parent);
TimelineItem(ImageItem *img, const events::MessageEvent<msgs::Image> &e, QWidget *parent);
+ void setUserAvatar(const QImage &pixmap);
+
~TimelineItem();
private:
+ void init();
+
void generateBody(const QString &body);
void generateBody(const QString &userid, const QString &color, const QString &body);
void generateTimestamp(const QDateTime &time);
+ void setupAvatarLayout(const QString &userName);
+ void setupSimpleLayout();
+
QString replaceEmoji(const QString &body);
- void setupLayout();
+ QHBoxLayout *topLayout_;
+ QVBoxLayout *sideLayout_; // Avatar or Timestamp
+ QVBoxLayout *mainLayout_; // Header & Message body
+
+ QHBoxLayout *headerLayout_; // Username (&) Timestamp
+
+ Avatar *userAvatar_;
- QHBoxLayout *top_layout_;
+ QLabel *timestamp_;
+ QLabel *userName_;
+ QLabel *body_;
- QLabel *time_label_;
- QLabel *content_label_;
+ QFont bodyFont_;
+ QFont usernameFont_;
+ QFont timestampFont_;
};
|
