osanwe · savegame · Sep 2, 2016 · Dec 21, 2016 · Jan 31, 2017 · Feb 10, 2017
diff --git a/README.md b/README.md
@@ -1,7 +1,13 @@
 # Kat
-The unofficial client for the most popular russian social network shared under the terms of the GNU GPL v3.
+
+This is an unofficial vk.com client for Jolla Sailfish OS.
+
+__You can:__
+ + Viewing profiles
+ + Reading news
+ + Chatting
+ + Listening to audios
 
 __For developers:__
  + _master_ branch is for releases
- + _dev_ branch is for bug fixes
- + _dev-new_ branch is for new features
+ + _dev_ branch is for development process
diff --git a/harbour-kat.pro b/harbour-kat.pro
@@ -26,13 +26,15 @@ include("vksdk/vksdk.pri")
 HEADERS += \
     src/settingswrapper.h \
     src/mediaplayerwrapper.h \
-    src/playlistmodel.h
+    src/playlistmodel.h \
+    src/filesaver.h
 
 SOURCES += \
     src/harbour-kat.cpp \
     src/settingswrapper.cpp \
     src/mediaplayerwrapper.cpp \
-    src/playlistmodel.cpp
+    src/playlistmodel.cpp \
+    src/filesaver.cpp
 
 OTHER_FILES += \
     qml/harbour-kat.qml \
@@ -42,14 +44,17 @@ OTHER_FILES += \
     translations/*.ts \
     rpm/harbour-kat.yaml \
     rpm/harbour-kat.spec \
+    harbour-kat.png\
+    harbour-kat.desktop\
     rpm/harbour-kat.changes.in \
     LICENSE \
     README.md
 
 CONFIG += sailfishapp_i18n
 TRANSLATIONS += \
     translations/harbour-kat-ru.ts \
-    translations/harbour-kat-it.ts
+    translations/harbour-kat-it.ts \
+    translations/harbour-kat-nl.ts
 
 DISTFILES += \
     qml/pages/MainMenuPage.qml \
@@ -86,5 +91,8 @@ DISTFILES += \
     qml/views/WallItem.qml \
     qml/pages/RepostPage.qml \
     qml/pages/StatisticsPage.qml \
-    translations/harbour-kat-it.ts
+    qml/pages/SettingsPage.qml \
+    qml/pages/PhotoAlbumPage.qml \
+    qml/pages/TopicsPage.qml \
+    qml/pages/TopicPage.qml
 
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml
@@ -25,6 +25,20 @@ import Sailfish.Silica 1.0
 CoverBackground {
     id: cover
 
+    BackgroundItem {
+        id: background
+        anchors.fill: parent
+        Image {
+            id: bg_image
+            anchors.fill: parent
+            width: parent.width
+            height: parent.height
+            fillMode: Image.PreserveAspectCrop
+            source: "/usr/share/icons/hicolor/86x86/apps/harbour-kat.png"
+            opacity: 0.2
+        }
+    }
+
     Column {
         anchors.centerIn: parent
         spacing: Theme.paddingMedium

diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
@@ -47,19 +47,19 @@ Page {
                 anchors.horizontalCenter: parent.horizontalCenter
                 width: Theme.iconSizeExtraLarge
                 height: Theme.iconSizeExtraLarge
-                source: "../harbour-kat.png"
+                source: "/usr/share/icons/hicolor/86x86/apps/harbour-kat.png"
             }
 
             Label {
                 width: parent.width
                 horizontalAlignment: Text.AlignHCenter
-                text: "v0.5.1"
+                text: "v0.5.3"
             }
 
             Label {
                 width: parent.width
                 horizontalAlignment: Text.AlignHCenter
-                text: "© 2015-2016 Petr Vytovtov"
+                text: "© 2015-2017 Petr Vytovtov"
             }
 
             Label {
@@ -89,13 +89,23 @@ Page {
                 onClicked: Qt.openUrlExternally("https://github.com/osanwe/Kat")
             }
 
+            Label {
+                width: parent.width
+                wrapMode: Text.WordWrap
+                linkColor: Theme.highlightColor
+                onLinkActivated: Qt.openUrlExternally(link)
+                text: qsTr("Thanks for features") + ":<br>" +
+                      "<a href=\"https://github.com/sash13\">Alexander Ryzhkov</a>"
+            }
+
             Label {
                 width: parent.width
                 wrapMode: Text.WordWrap
                 linkColor: Theme.highlightColor
                 onLinkActivated: Qt.openUrlExternally(link)
                 text: qsTr("Localization") + ":<br>" +
-                      qsTr("Italian") + ": <a href=\"https://github.com/fravaccaro\">Fra</a>"
+                      qsTr("Italian") + ": <a href=\"https://github.com/fravaccaro\">Fra</a><br>" +
+                      qsTr("Dutch") + ": <a href=\"https://github.com/richdb\">Richard</a><br>"
             }
         }
 

diff --git a/qml/pages/DialogPage.qml b/qml/pages/DialogPage.qml
@@ -51,6 +51,7 @@ Page {
                 anchors.left: parent.left
                 anchors.right: parent.right
 
+                userId: fromId
                 date: datetime
                 isOut: out
                 isRead: read

diff --git a/qml/pages/GroupProfilePage.qml b/qml/pages/GroupProfilePage.qml
@@ -111,40 +111,44 @@ Page {
                 text: qsTr("Photos")
                 counter: group.photosCount
                 visible: group.photosCount !== 0
-            }
 
-            MoreButton {
-                width: parent.width
-                height: Theme.itemSizeMedium
-                text: qsTr("Audios")
-                counter: group.audiosCount
-                visible: group.audiosCount !== 0
+                onClicked: pageContainer.push(Qt.resolvedUrl("PhotoAlbumPage.qml"), { ownerId: groupId })
             }
 
-            MoreButton {
-                width: parent.width
-                height: Theme.itemSizeMedium
-                text: qsTr("Videos")
-                counter: group.videosCount
-                visible: group.videosCount !== 0
-            }
+//            MoreButton {
+//                width: parent.width
+//                height: Theme.itemSizeMedium
+//                text: qsTr("Audios")
+//                counter: group.audiosCount
+//                visible: group.audiosCount !== 0
+//            }
+
+//            MoreButton {
+//                width: parent.width
+//                height: Theme.itemSizeMedium
+//                text: qsTr("Videos")
+//                counter: group.videosCount
+//                visible: group.videosCount !== 0
+//            }
 
             MoreButton {
                 width: parent.width
                 height: Theme.itemSizeMedium
                 text: qsTr("Topics")
                 counter: group.topicsCount
                 visible: group.topicsCount !== 0
-            }
 
-            MoreButton {
-                width: parent.width
-                height: Theme.itemSizeMedium
-                text: qsTr("Documents")
-                counter: group.docsCount
-                visible: group.docsCount !== 0
+                onClicked: pageContainer.push(Qt.resolvedUrl("TopicsPage.qml"), { ownerId: groupId })
             }
 
+//            MoreButton {
+//                width: parent.width
+//                height: Theme.itemSizeMedium
+//                text: qsTr("Documents")
+//                counter: group.docsCount
+//                visible: group.docsCount !== 0
+//            }
+
             MoreButton {
                 id: wallButton
                 width: parent.width

diff --git a/qml/pages/ImageViewPage.qml b/qml/pages/ImageViewPage.qml
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2016 Petr Vytovtov
+  Copyright (C) 2016-2017 Petr Vytovtov
   Contact: Petr Vytovtov <osanwe@protonmail.ch>
   All rights reserved.
 
@@ -25,55 +25,113 @@ import Sailfish.Silica 1.0
 Page {
     id: imageViewPage
 
+    property var ownerIds
+    property var photoIds
     property var imagesModel
     property var current
+    property bool fromAlbum: false
 
-    SilicaListView {
-        id: flick
+    Drawer {
+        id: drawer
         anchors.fill: parent
-        anchors.bottomMargin: audioPlayer.open ? audioPlayer.height : 0
-        clip: true
-        snapMode: ListView.SnapOneItem
-        orientation: ListView.HorizontalFlick
-        highlightRangeMode: ListView.StrictlyEnforceRange
-        cacheBuffer: width
-
-        model: ListModel {}
-
-        delegate: Item {
-            width: flick.width
-            height: flick.height
-            clip: true
-
-            Image {
-                anchors.fill: parent
-                sourceSize.height: window.height * 2
-                fillMode: Image.PreserveAspectFit
-                source: source_
-
-                PinchArea {
-                    anchors.fill: parent
-                    pinch.target: parent
-                    pinch.minimumScale: 1
-                    pinch.maximumScale: 4
+
+        open: true
+
+        background: SilicaListView {
+            anchors.fill: parent
+
+            model: ListModel {
+
+                ListElement { title: "Save" }
+                ListElement { title: "Like" }
+                ListElement { title: "Share" }
+                ListElement { title: "Copy link" }
+            }
+
+            header: PageHeader {
+                title: (slideshowView.currentIndex + 1) + ' / ' + (fromAlbum ? vksdk.photosModel.count : imagesModel.length)
+            }
+
+            delegate: ListItem {
+
+                width: parent.width
+                height: Theme.itemSizeSmall
+
+                Label {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: parent.width - 2 * Theme.horizontalPageMargin
+                    text: model.title
                 }
+
+                onClicked: switch (index) {
+                           case 0:
+                               fileSaver.save(fromAlbum ? vksdk.photosModel.getUrl(slideshowView.currentIndex) : imagesModel[slideshowView.currentIndex])
+                               break;
+                           case 1:
+                               if (fromAlbum)
+                                   vksdk.likes.addPhoto(vksdk.photosModel.getOwnerId(slideshowView.currentIndex),
+                                                        vksdk.photosModel.getPhotoId(slideshowView.currentIndex))
+                               else
+                                   vksdk.likes.addPhoto(ownerIds[slideshowView.currentIndex],
+                                                        photoIds[slideshowView.currentIndex])
+                               break;
+                           case 2:
+                               if (fromAlbum)
+                                   pageStack.push(Qt.resolvedUrl("RepostPage.qml"),
+                                                  { sourceId: vksdk.photosModel.getOwnerId(slideshowView.currentIndex),
+                                                    postId: vksdk.photosModel.getPhotoId(slideshowView.currentIndex),
+                                                    type: "photo" })
+                               else
+                                   pageStack.push(Qt.resolvedUrl("RepostPage.qml"), { sourceId: ownerIds[slideshowView.currentIndex],
+                                                                                  postId: photoIds[slideshowView.currentIndex],
+                                                                                  type: "photo" })
+                               break;
+                           case 3:
+                               Clipboard.text = imagesModel[slideshowView.currentIndex]
+                               break;
+                           }
             }
         }
-    }
 
-    Label {
-        anchors.top: parent.top
-        anchors.right: parent.right
-        anchors.topMargin: Theme.paddingLarge
-        anchors.rightMargin: Theme.paddingLarge
-        text: (flick.currentIndex + 1) + ' / ' + imagesModel.length
+        SlideshowView {
+            id: slideshowView
+            width: imageViewPage.width
+            height: imageViewPage.height
+            model: fromAlbum ? vksdk.photosModel : imagesModel.length
+
+            delegate: Image {
+                    id: imageView
+                    width: imageViewPage.width
+                    height: width * (sourceSize.height / sourceSize.width)
+                    fillMode: Image.PreserveAspectFit
+                    source: fromAlbum ? photoUrl : imagesModel[index]
+
+                    PinchArea {
+                        anchors.fill: parent
+                        pinch.target: parent
+                        pinch.minimumScale: 1
+                        pinch.maximumScale: 4
+
+                        MouseArea {
+                            anchors.fill: parent
+                            drag.target: imageView
+                            drag.axis: Drag.XAndYAxis
+                            drag.minimumX: (slideshowView.width - imageView.width * imageView.scale) / 2
+                            drag.minimumY: (slideshowView.height - imageView.height * imageView.scale) / 2
+                            drag.maximumX: Math.abs(slideshowView.width - imageView.width * imageView.scale) / 2
+                            drag.maximumY: Math.abs(slideshowView.height - imageView.height * imageView.scale) / 2
+                            onClicked: drawer.open = !drawer.open
+                            onPositionChanged: { // TODO
+                                console.log(drag.minimumX + " <= " + imageView.x + " <= " + drag.maximumX)
+                                console.log(drag.minimumY + " <= " + imageView.y + " <= " + drag.maximumY)
+                            }
+                        }
+                    }
+                }
+        }
     }
 
-//    onStatusChanged: if (status === PageStatus.Active) pageStack.pushAttached(Qt.resolvedUrl("AudioPlayerPage.qml"))
-
-    Component.onCompleted: {
-        for (var index in imagesModel) flick.model.append({ source_: imagesModel[index] })
-        flick.currentIndex = current
-    }
+    Component.onCompleted: slideshowView.currentIndex = current
 }