Merge branch 'master' of https://github.com/Computershik73/harbour-kat

Computershik73 · Feb 10, 2024 · f105274 · f105274
2 parents 2666517 + 3171f8b
commit f105274
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 36 deletions.
diff --git a/qml/pages/WallPostPage.qml b/qml/pages/WallPostPage.qml
@@ -90,17 +90,18 @@ Page {
 
                 Repeater {
                     model: vksdk.commentsModel
-                    delegate: Item {
+                    delegate: ListItem {
                         width: parent.width
-                        height: childrenRect.height
-
+                        //height: childrenRect.height
+                        contentHeight: commentContent.height
+                        property real avatarSize : Theme.iconSizeMedium
                         Image {
                             id: commentAvatar
                             anchors.top: parent.top
                             anchors.left: parent.left
 
-                            width: 50  //Theme.iconSizeSmall
-                            height: 50 //Theme.iconSizeSmall
+                            width: avatarSize
+                            height: avatarSize
                             source: avatarSource
 
                             layer.enabled: true
@@ -110,38 +111,61 @@ Page {
                         }
                         Rectangle {
                                 id: commentAvatarMask
-                                width: 50
-                                height: 50
-                                radius: 50
+                                width: avatarSize
+                                height: avatarSize
+                                radius: avatarSize
                                 visible: false
                         }
                         Column {
+                            id: commentContent
                             anchors {
                                 left: commentAvatar.right
                                 right: parent.right
                                 leftMargin: Theme.paddingMedium
                             }
-                            Label {
-                                id: commentUserName
-                                //anchors.top: parent.top
-                                //anchors.left: commentAvatar.right
-                                color: Theme.highlightColor
+                            Row {
                                 width: parent.width
-                                //anchors.leftMargin: Theme.paddingMedium
-                                font.pixelSize: Theme.fontSizeSmall
-                                wrapMode: Text.WordWrap
-                                text: title
+                                spacing: Theme.paddingSmall
+                                Label {
+                                    id: commentUserName
+                                    color: Theme.highlightColor
+                                    font.pixelSize: Theme.fontSizeSmall
+                                    wrapMode: Text.WordWrap
+                                    text: title
+                                }
+                                Image {
+                                    id: commnetLikeIcon
+                                    width: Theme.fontSizeTiny
+                                    height: Theme.fontSizeTiny
+                                    source: "image://theme/icon-s-like?" +
+                                            (userLiked ? Theme.secondaryHighlightColor : Theme.secondaryColor)
+                                }
+
+                                Label {
+                                    id: commentLikeCounter
+                                    color: Theme.secondaryColor
+                                    font.pixelSize: Theme.fontSizeTiny
+                                    text: likeCount
+                                }
                             }
-
                             Label {
-                                //anchors.top: parent.top
-                                //anchors.left: commentAvatar.right
                                 width: parent.width
-                                //anchors.leftMargin: Theme.paddingMedium
                                 font.pixelSize: Theme.fontSizeSmall
                                 wrapMode: Text.WordWrap
                                 text: commentText
                             }
+
+                        }
+                        menu: ContextMenu {
+
+                            MenuItem {
+                                text: qsTr("Like")
+                                onClicked: {
+                                    vksdk.likes.addComment(wallpost.toId, commentId)
+                                    commentLikeCounter.text = parseInt(commentLikeCounter.text) +1
+                                    commnetLikeIcon.source = "image://theme/icon-s-like?" + Theme.secondaryHighlightColor
+                                }
+                            }
                         }
                         Component.onCompleted: console.log(avatarSource, commentText)
                     }

diff --git a/translations/harbour-kat-az.ts b/translations/harbour-kat-az.ts
@@ -596,12 +596,13 @@
     </message>
     <message>
         <location filename="../qml/pages/WallPostPage.qml" line="50"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="162"/>
         <source>Like</source>
         <translation>Bəyəndim</translation>
     </message>
     <message>
-        <location filename="../qml/pages/WallPostPage.qml" line="153"/>
-        <location filename="../qml/pages/WallPostPage.qml" line="154"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="179"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="180"/>
         <source>Your comment</source>
         <translation>Sizin şərhiviz</translation>
     </message>

diff --git a/translations/harbour-kat-it.ts b/translations/harbour-kat-it.ts
@@ -596,12 +596,13 @@
     </message>
     <message>
         <location filename="../qml/pages/WallPostPage.qml" line="50"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="162"/>
         <source>Like</source>
         <translation>Mi piace</translation>
     </message>
     <message>
-        <location filename="../qml/pages/WallPostPage.qml" line="153"/>
-        <location filename="../qml/pages/WallPostPage.qml" line="154"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="179"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="180"/>
         <source>Your comment</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/translations/harbour-kat-nl.ts b/translations/harbour-kat-nl.ts
@@ -596,12 +596,13 @@
     </message>
     <message>
         <location filename="../qml/pages/WallPostPage.qml" line="50"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="162"/>
         <source>Like</source>
         <translation>Like</translation>
     </message>
     <message>
-        <location filename="../qml/pages/WallPostPage.qml" line="153"/>
-        <location filename="../qml/pages/WallPostPage.qml" line="154"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="179"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="180"/>
         <source>Your comment</source>
         <translation>Jouw commentaar</translation>
     </message>

diff --git a/translations/harbour-kat-ru.ts b/translations/harbour-kat-ru.ts
@@ -596,12 +596,13 @@
     </message>
     <message>
         <location filename="../qml/pages/WallPostPage.qml" line="50"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="162"/>
         <source>Like</source>
         <translation>Мне нравится</translation>
     </message>
     <message>
-        <location filename="../qml/pages/WallPostPage.qml" line="153"/>
-        <location filename="../qml/pages/WallPostPage.qml" line="154"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="179"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="180"/>
         <source>Your comment</source>
         <translation>Ваш комментарий</translation>
     </message>

diff --git a/translations/harbour-kat.ts b/translations/harbour-kat.ts
@@ -596,12 +596,13 @@
     </message>
     <message>
         <location filename="../qml/pages/WallPostPage.qml" line="50"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="162"/>
         <source>Like</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/WallPostPage.qml" line="153"/>
-        <location filename="../qml/pages/WallPostPage.qml" line="154"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="179"/>
+        <location filename="../qml/pages/WallPostPage.qml" line="180"/>
         <source>Your comment</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/vksdk/src/models/commentsmodel.cpp b/vksdk/src/models/commentsmodel.cpp
@@ -11,16 +11,22 @@ int CommentsModel::rowCount(const QModelIndex &parent) const {
 
 QVariant CommentsModel::data(const QModelIndex &index, int role) const {
     if (!index.isValid()) return QVariant();
-
+    Comment * comment = _comments.at(index.row());
     switch (role) {
+    case IdRole:
+        return QVariant(comment->id());
     case AvatarRole:
-        return QVariant(_getAvatarSource(_comments.at(index.row())->fromId()));
+        return QVariant(_getAvatarSource(comment->fromId()));
     case TitleRole:
-        return QVariant(_getTitle(_comments.at(index.row())->fromId()));
+        return QVariant(_getTitle(comment->fromId()));
     case TextRole:
-        return QVariant(_comments.at(index.row())->text());
+        return QVariant(comment->text());
     case DateRole:
-        return QVariant(_comments.at(index.row())->date());
+        return QVariant(comment->date());
+    case LikeCountRole:
+        return QVariant(comment->likesCount());
+    case UserLikedRole:
+        return QVariant(comment->userLiked());
     case AttachmentsRole:
         return QVariant();
     default:
@@ -30,10 +36,13 @@ QVariant CommentsModel::data(const QModelIndex &index, int role) const {
 
 QHash<int, QByteArray> CommentsModel::roleNames() const {
     QHash<int, QByteArray> roles = QAbstractListModel::roleNames();
+    roles[IdRole] = "commentId";
     roles[AvatarRole] = "avatarSource";
     roles[TitleRole] = "title";
     roles[TextRole] = "commentText";
     roles[DateRole] = "datetime";
+    roles[LikeCountRole] = "likeCount";
+    roles[UserLikedRole] = "userLiked";
     roles[AttachmentsRole] = "attachments";
     return roles;
 }

diff --git a/vksdk/src/models/commentsmodel.h b/vksdk/src/models/commentsmodel.h
@@ -18,9 +18,12 @@ class CommentsModel : public QAbstractListModel
 public:
     enum Roles {
         AvatarRole = Qt::UserRole + 1,
+        IdRole,
         TitleRole,
         TextRole,
         DateRole,
+        LikeCountRole,
+        UserLikedRole,
         AttachmentsRole,
     };
 

diff --git a/vksdk/src/objects/comment.cpp b/vksdk/src/objects/comment.cpp
@@ -24,6 +24,11 @@ Comment *Comment::fromJsonObject(QJsonObject object) {
     if (object.contains("text")) comment->setText(object.value("text").toString());
     if (object.contains("reply_to_user")) comment->setReplyToUser(object.value("reply_to_user").toInt());
     if (object.contains("reply_to_comment")) comment->setReplyToComment(object.value("reply_to_comment").toInt());
+    if (object.contains("likes")) {
+        QJsonObject likes = object.value("likes").toObject();
+        if (likes.contains("count")) comment->setLikesCount(likes.value("count").toInt());
+        if (likes.contains("user_likes")) comment->setUserLiked(likes.value("user_likes").toInt() == 1);
+    }
     if (object.contains("attachments")) {
         QJsonArray attachments = object.value("attachments").toArray();
         for (int index = 0; index < attachments.size(); ++index) {
@@ -124,6 +129,25 @@ void Comment::setReplyToComment(int replyToComment)
     _replyToComment = replyToComment;
 }
 
+int Comment::likesCount() const
+{
+    return _likeCount;
+}
+
+void Comment::setLikesCount(int count) {
+    _likeCount=count;
+}
+
+bool Comment::userLiked() const
+{
+    return _userLiked;
+}
+
+void Comment::setUserLiked(bool liked)
+{
+    _userLiked = liked;
+}
+
 QVariant Comment::audios() const
 {
     return QVariant::fromValue(_audios);

diff --git a/vksdk/src/objects/comment.h b/vksdk/src/objects/comment.h
@@ -38,6 +38,13 @@ class Comment : public QObject
     int replyToComment() const;
     void setReplyToComment(int replyToComment);
 
+    int likesCount() const;
+    void setLikesCount(int count);
+
+    bool userLiked() const ;
+    void setUserLiked(bool liked);
+
+
     QVariant audios() const;
     QList<QObject *> audiosList() const;
     void addAudio(Audio *audio);
@@ -65,6 +72,8 @@ class Comment : public QObject
     QString _text = 0;
     int _replyToUser = 0;
     int _replyToComment = 0;
+    int _likeCount = 0;
+    bool _userLiked = false;
     QList<QObject*> _audios;
     QList<QObject*> _documents;
     QList<QObject*> _links;

diff --git a/vksdk/src/requests/likes.cpp b/vksdk/src/requests/likes.cpp
@@ -32,6 +32,14 @@ void Likes::addPost(int ownerId, int itemId) {
     _api->makeApiGetRequest("likes.add", query, ApiRequest::LIKES_ADD);
 }
 
+void Likes::addComment(int ownerId, int itemId) {
+    QUrlQuery query;
+    query.addQueryItem("type", "comment");
+    query.addQueryItem("owner_id", QString::number(ownerId));
+    query.addQueryItem("item_id", QString::number(itemId));
+    _api->makeApiGetRequest("likes.add", query, ApiRequest::LIKES_ADD);
+}
+
 void Likes::addPhoto(int ownerId, int itemId) {
     QUrlQuery query;
     query.addQueryItem("type", "photo");

diff --git a/vksdk/src/requests/likes.h b/vksdk/src/requests/likes.h
@@ -31,6 +31,7 @@ class Likes : public RequestBase
     explicit Likes(QObject *parent = 0);
 
     Q_INVOKABLE void addPost(int ownerId, int itemId);
+    Q_INVOKABLE void addComment(int ownerId, int itemId);
     Q_INVOKABLE void addPhoto(int ownerId, int itemId);
 
 };

diff --git a/vksdk/src/requests/wall.cpp b/vksdk/src/requests/wall.cpp
@@ -45,6 +45,7 @@ void Wall::getComments(int ownerId, int postId, int offset) {
     query.addQueryItem("owner_id", QString::number(ownerId));
     query.addQueryItem("post_id", QString::number(postId));
     query.addQueryItem("count", "100");
+    query.addQueryItem("need_likes", "1");
     query.addQueryItem("sort", "asc");
     query.addQueryItem("extended", "1");
     query.addQueryItem("fields", "photo_50");