General update

KomplexHubContent/pages/FeaturedImagesPage.qml

@@ -11,7 +11,8 @@ Rectangle
 {
     id: rootItem
 
-    readonly property bool searchable: false
+    property string query
+    readonly property bool searchable: paginator.searchable
     property bool popup: false
     property int resultWidth: 256
     property int resultHeight: 245
@@ -20,48 +21,85 @@ Rectangle
 
     FeaturedImagesModel
     {
-        id: imagesModel
+        id: searchModel
+        //query: rootItem.query
         resultsPerPage: paginator.resultsPerPage
-        // windowSize: 80
+
+        Component.onCompleted: () => nextPage()
     }
 
-    PaginatorGrid
+    ColumnLayout
     {
-        id: paginator
+        id: resultsLayout
-        anchors.fill: parent
-        model: imagesModel
-        loading: imagesModel.state === FeaturedImagesModel.Loading
         visible: opacity > 0.01
+        anchors.fill: parent
+        anchors.margins: Constants.mediumMargin
 
-        delegate: ItemDelegate
+        Text
         {
-            id: resultDelegate
+            Layout.alignment: Qt.AlignTop
+            Layout.preferredHeight: 50
 
-            width: resultWidth
+            color: palette.text
-            height: resultHeight
+            font.pixelSize: Constants.h2Font.pixelSize
+            font.bold: true
+            text: qsTr("Featured Images")
+            verticalAlignment: Qt.AlignVCenter
+        }
 
-            required property string uuid
+        Text
-            required property string author
+        {
-            required property string authorId
+            Layout.alignment: Qt.AlignTop
-            required property string authorUrl
+            Layout.preferredHeight: 50
-            required property string thumbnail
-            required property int index
 
-            SearchResultItem
+            color: palette.text
+            font.pixelSize: Constants.h4Font.pixelSize
+            font.bold: true
+            text: qsTr("A specially curated collection of images, courtesy of Pexels")
+            verticalAlignment: Qt.AlignVCenter
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        }
+
+        PaginatorGrid
+        {
+            Layout.alignment: Qt.AlignTop
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
+            id: paginator
+            model: searchModel
+            loading: model.state === FeaturedImagesModel.Loading
+
+            delegate: ItemDelegate
             {
-                anchors.fill: parent
+                id: resultDelegate
-                author: parent.author
-                description: qsTr("No description available")
-                thumbnail: parent.thumbnail
-                uuid: parent.uuid
-                pexels: true
-                selected: paginator.currentIndex === parent.index
 
-                onTriggered: () => paginator.currentIndex = parent.index
+                width: resultWidth
+                height: resultHeight
 
-                onViewMoreTriggered: () =>
+                required property string author
+                required property string description
+                required property string uuid
+                required property string thumbnail
+                required property string authorId
+                required property int index
+
+                SearchResultItem
                 {
-                    showVideoPopup(parent.index)
+                    anchors.fill: parent
+                    title: parent.author
+                    description: parent.description
+                    thumbnail: parent.thumbnail
+                    uuid: parent.uuid
+                    pexels: true
+                    selected: paginator.currentIndex === parent.index
+
+                    onTriggered: () => paginator.currentIndex = parent.index
+
+                    onViewMoreTriggered: () =>
+                    {
+                        showImagePopup(parent.index)
+                    }
                 }
             }
         }
@@ -77,12 +115,12 @@ Rectangle
 
         ImageView
         {
-            id: imageDetailsPopup
+            id: viewMoreImagePopup
             anchors.fill: parent
             opacity: 0
+            visible: opacity > 0.01
 
-            Behavior on opacity
+            Behavior on opacity {
-            {
                 NumberAnimation
                 {
                     duration: 250
@@ -90,8 +128,7 @@ Rectangle
             }
         }
 
-        Behavior on opacity
+        Behavior on opacity {
-        {
             NumberAnimation
             {
                 duration: 250
@@ -99,31 +136,33 @@ Rectangle
         }
     }
 
-    Component.onCompleted: () =>
+    function showImagePopup(index)
     {
-        imagesModel.nextPage()
+        viewMoreImagePopup.author = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.AuthorRole)
-    }
+        viewMoreImagePopup.authorUrl = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.AuthorUrlRole)
-
+        viewMoreImagePopup.description = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.DescriptionRole)
-    function showVideoPopup(index)
+        viewMoreImagePopup.uuid = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.UuidRole)
-    {
+        viewMoreImagePopup.thumbnail = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.LargeThumbnailRole)
-        imagesModel.setItem(index)
+        viewMoreImagePopup.original = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.OriginalUrlRole)
-        imageDetailsPopup.author = searchModel.data(searchModel.index(index,0), ImageSearchModel.AuthorRole)
+        viewMoreImagePopup.portrait = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.PortraitUrlRole)
-        imageDetailsPopup.authorUrl = searchModel.data(searchModel.index(index,0), ImageSearchModel.AuthorUrlRole)
+        viewMoreImagePopup.landscape = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.LandscapeUrlRole)
-        imageDetailsPopup.uuid = searchModel.data(searchModel.index(index,0), ImageSearchModel.UuidRole)
+        viewMoreImagePopup.backgroundPortrait = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.BackgroundPortraitRole)
-        imageDetailsPopup.thumbnail = searchModel.data(searchModel.index(index,0), ImageSearchModel.ThumbnailRole)
+        viewMoreImagePopup.backgroundLandscape = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.BackgroundLandscapeRole)
-        imageDetailsPopup.modelIndex = index
+        viewMoreImagePopup.fullScreen = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.ScreenUrlRole)
-        imageDetailsPopup.model = searchModel.itemModel
+        viewMoreImagePopup.portraitSize = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.PortraitSizeRole)
-        imageDetailsPopup.opacity = 1
+        viewMoreImagePopup.landscapeSize = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.LandscapeSizeRole)
-        paginator.opacity = 0
+        viewMoreImagePopup.fullScreenSize = searchModel.data(searchModel.index(index,0), FeaturedImagesModel.ScreenSizeRole)
+        viewMoreImagePopup.opacity = 1
         popupContainer.opacity = 1
+        resultsLayout.opacity = 0
         rootItem.popup = true
     }
 
     function closePopup()
     {
-        imageDetailsPopup.opacity = 0
+        viewMoreImagePopup.opacity = 0
         popupContainer.opacity = 0
-        paginator.opacity = 1
+        resultsLayout.opacity = 1
         rootItem.popup = false
     }
 }

KomplexHubContent/pages/FeaturedPacksPage.qml

@@ -11,6 +11,7 @@ Rectangle
 {
     id: rootItem
 
+    property string query
     readonly property bool searchable: false
     property bool popup: false
     property int resultWidth: 256
@@ -18,50 +19,87 @@ Rectangle
 
     color: palette.base
 
-    FeaturedPacksModel
+    NewestPacksModel
     {
         id: packsModel
         resultsPerPage: paginator.resultsPerPage
-        // windowSize: 80
+
+        Component.onCompleted: () => nextPage()
     }
 
-    PaginatorGrid
+    ColumnLayout
     {
-        id: paginator
+        id: resultsLayout
-        anchors.fill: parent
-        model: packsModel
-        loading: packsModel.state === FeaturedPacksModel.Loading
         visible: opacity > 0.01
+        anchors.fill: parent
+        anchors.margins: Constants.mediumMargin
 
-        delegate: ItemDelegate
+        Text
         {
-            id: resultDelegate
+            Layout.alignment: Qt.AlignTop
+            Layout.preferredHeight: 50
 
-            width: resultWidth
+            color: palette.text
-            height: resultHeight
+            font.pixelSize: Constants.h2Font.pixelSize
+            font.bold: true
+            text: qsTr("Featured Images")
+            verticalAlignment: Qt.AlignVCenter
+        }
 
-            required property string uuid
+        Text
-            required property string author
+        {
-            required property string authorId
+            Layout.alignment: Qt.AlignTop
-            required property string authorUrl
+            Layout.preferredHeight: 50
-            required property string thumbnail
-            required property int index
 
-            SearchResultItem
+            color: palette.text
+            font.pixelSize: Constants.h4Font.pixelSize
+            font.bold: true
+            text: qsTr("Newest packs submitted to Komplex.dev")
+            verticalAlignment: Qt.AlignVCenter
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        }
+
+        PaginatorGrid
+        {
+            Layout.alignment: Qt.AlignTop
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
+            id: paginator
+            model: packsModel
+            loading: model.state === NewestPacksModel.Loading
+
+            delegate: ItemDelegate
             {
-                anchors.fill: parent
+                id: resultDelegate
-                author: parent.author
-                description: qsTr("No description available")
-                thumbnail: parent.thumbnail
-                uuid: parent.uuid
-                pexels: true
-                selected: paginator.currentIndex === parent.index
 
-                onTriggered: () => paginator.currentIndex = parent.index
+                width: resultWidth
+                height: resultHeight
 
-                onViewMoreTriggered: () =>
+                required property string name
+                required property string author
+                required property string description
+                required property string uuid
+                required property string thumbnail
+                required property string authorId
+                required property int index
+
+                SearchResultItem
                 {
-                    showVideoPopup(parent.index)
+                    anchors.fill: parent
+                    title: parent.name
+                    author: parent.author
+                    description: parent.description
+                    thumbnail: parent.thumbnail
+                    uuid: parent.uuid
+                    selected: paginator.currentIndex === parent.index
+
+                    onTriggered: () => paginator.currentIndex = parent.index
+
+                    onViewMoreTriggered: () =>
+                    {
+                        showWallpaperPopup(parent.index)
+                    }
                 }
             }
         }
@@ -77,12 +115,12 @@ Rectangle
 
         PackView
         {
-            id: packDetailsPopup
+            id: viewMoreWallpaperPopup
             anchors.fill: parent
             opacity: 0
+            visible: opacity > 0.01
 
-            Behavior on opacity
+            Behavior on opacity {
-            {
                 NumberAnimation
                 {
                     duration: 250
@@ -90,8 +128,7 @@ Rectangle
             }
         }
 
-        Behavior on opacity
+        Behavior on opacity {
-        {
             NumberAnimation
             {
                 duration: 250
@@ -99,31 +136,23 @@ Rectangle
         }
     }
 
-    Component.onCompleted: () =>
-    {
-        packsModel.nextPage()
-    }
-
-    function showVideoPopup(index)
-    {
-        packsModel.setItem(index)
-        packDetailsPopup.author = searchModel.data(searchModel.index(index,0), VideoSearchModel.AuthorRole)
-        packDetailsPopup.authorUrl = searchModel.data(searchModel.index(index,0), VideoSearchModel.AuthorUrlRole)
-        packDetailsPopup.uuid = searchModel.data(searchModel.index(index,0), VideoSearchModel.UuidRole)
-        packDetailsPopup.thumbnail = searchModel.data(searchModel.index(index,0), VideoSearchModel.ThumbnailRole)
-        packDetailsPopup.modelIndex = index
-        packDetailsPopup.model = searchModel.itemModel
-        packDetailsPopup.opacity = 1
-        paginator.opacity = 0
-        popupContainer.opacity = 1
-        rootItem.popup = true
-    }
-
     function closePopup()
     {
-        packDetailsPopup.opacity = 0
+        viewMoreWallpaperPopup.opacity = 0
         popupContainer.opacity = 0
-        paginator.opacity = 1
+        resultsLayout.opacity = 1
         rootItem.popup = false
     }
+
+    function showWallpaperPopup(index)
+    {
+        viewMoreWallpaperPopup.author = packsModel.data(packsModel.index(index,0), NewestPacksModel.AuthorRole)
+        viewMoreWallpaperPopup.authorId = packsModel.data(packsModel.index(index,0), NewestPacksModel.AuthorIdRole)
+        viewMoreWallpaperPopup.description = packsModel.data(packsModel.index(index,0), NewestPacksModel.DescriptionRole)
+        viewMoreWallpaperPopup.thumbnail = packsModel.data(packsModel.index(index,0), NewestPacksModel.ThumbnailRole)
+        viewMoreWallpaperPopup.opacity = 1
+        popupContainer.opacity = 1
+        resultsLayout.opacity = 0
+        rootItem.popup = true
+    }
 }

KomplexHubContent/pages/FeaturedVideosPage.qml

@@ -25,43 +25,79 @@ Rectangle
         windowSize: 80
     }
 
-    PaginatorGrid
+    ColumnLayout
     {
-        id: paginator
+        id: resultsLayout
-        anchors.fill: parent
-        model: videosModel
-        loading: videosModel.state === FeaturedVideosModel.Loading
         visible: opacity > 0.01
+        anchors.fill: parent
+        anchors.margins: Constants.mediumMargin
 
-        delegate: ItemDelegate
+        Text
         {
-            id: resultDelegate
+            Layout.alignment: Qt.AlignTop
+            Layout.preferredHeight: 50
 
-            width: resultWidth
+            color: palette.text
-            height: resultHeight
+            font.pixelSize: Constants.h2Font.pixelSize
+            font.bold: true
+            text: qsTr("Most Popular Videos")
+            verticalAlignment: Qt.AlignVCenter
+        }
 
-            required property string uuid
+        Text
-            required property string author
+        {
-            required property string authorId
+            Layout.alignment: Qt.AlignTop
-            required property string authorUrl
+            Layout.preferredHeight: 50
-            required property string thumbnail
-            required property int index
 
-            SearchResultItem
+            color: palette.text
+            font.pixelSize: Constants.h4Font.pixelSize
+            font.bold: true
+            text: qsTr("Most popular videos, provided courtesy of Pexels")
+            verticalAlignment: Qt.AlignVCenter
+            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+        }
+
+        PaginatorGrid
+        {
+            Layout.alignment: Qt.AlignTop
+            Layout.fillHeight: true
+            Layout.fillWidth: true
+
+            id: paginator
+            model: videosModel
+            loading: videosModel.state === FeaturedVideosModel.Loading
+            visible: opacity > 0.01
+
+            delegate: ItemDelegate
             {
-                anchors.fill: parent
+                id: resultDelegate
-                author: parent.author
-                description: qsTr("No description available")
-                thumbnail: parent.thumbnail
-                uuid: parent.uuid
-                pexels: true
-                selected: paginator.currentIndex === parent.index
 
-                onTriggered: () => paginator.currentIndex = parent.index
+                width: resultWidth
+                height: resultHeight
 
-                onViewMoreTriggered: () =>
+                required property string uuid
+                required property string author
+                required property string authorId
+                required property string authorUrl
+                required property string thumbnail
+                required property int index
+
+                SearchResultItem
                 {
-                    showVideoPopup(parent.index)
+                    anchors.fill: parent
+                    author: parent.author
+                    description: qsTr("")
+                    thumbnail: parent.thumbnail
+                    uuid: parent.uuid
+                    pexels: true
+                    selected: paginator.currentIndex === parent.index
+
+                    onTriggered: () => paginator.currentIndex = parent.index
+
+                    onViewMoreTriggered: () =>
+                    {
+                        showVideoPopup(parent.index)
+                    }
                 }
             }
         }
@@ -80,6 +116,7 @@ Rectangle
             id: videoDetailsPopup
             anchors.fill: parent
             opacity: 0
+            visible: opacity > 0.01
 
             Behavior on opacity
             {
@@ -114,7 +151,7 @@ Rectangle
         videoDetailsPopup.modelIndex = index
         videoDetailsPopup.model = searchModel.itemModel
         videoDetailsPopup.opacity = 1
-        paginator.opacity = 0
+        resultsLayout.opacity = 0
         popupContainer.opacity = 1
         rootItem.popup = true
     }
@@ -123,7 +160,7 @@ Rectangle
     {
         videoDetailsPopup.opacity = 0
         popupContainer.opacity = 0
-        paginator.opacity = 1
+        resultsLayout.opacity = 1
         rootItem.popup = false
     }
 }

KomplexHubContent/pages/HomePage.qml

@@ -282,7 +282,6 @@ Item
             anchors.fill: parent
             opacity: 0
             visible: opacity > 0.01
-            //model: videosModel.itemModel
 
             Behavior on opacity {
                 NumberAnimation
@@ -298,7 +297,6 @@ Item
             anchors.fill: parent
             opacity: 0
             visible: opacity > 0.01
-            //model: videosModel.itemModel
 
             Behavior on opacity {
                 NumberAnimation
@@ -316,48 +314,83 @@ Item
         }
     }
 
-    FeaturedVideosPage
+    Component
     {
-        id: featuredVideosPage
+        id: featuredVideosComponent
-        anchors.fill: parent
-        opacity: 0
-        visible: opacity > 0.01
 
-        Behavior on opacity {
+        FeaturedVideosPage
-            NumberAnimation
+        {
-            {
+            id: featuredVideosPage
-                duration: 250
+            anchors.fill: parent
+            opacity: 0
+
+            Behavior on opacity {
+                NumberAnimation
+                {
+                    duration: 250
+                }
             }
+
+            Component.onCompleted: () => featuredVideosPage.opacity = 1
         }
     }
 
-    FeaturedPacksPage
+    Component
     {
-        id: featuredPacksPage
+        id: featuredPacksComponent
-        anchors.fill: parent
-        opacity: 0
-        visible: opacity > 0.01
 
-        Behavior on opacity {
+        FeaturedPacksPage
-            NumberAnimation
+        {
+            id: featuredPacksPage
+            anchors.fill: parent
+            opacity: 0
+
+            Behavior on opacity
             {
-                duration: 250
+                NumberAnimation
+                {
+                    duration: 250
+                }
             }
+
+            Component.onCompleted: () => featuredPacksPage.opacity = 1
         }
     }
 
-    FeaturedImagesPage
+    Component
     {
-        id: featuredImagesPage
+        id: featuredImagesComponent
+
+        FeaturedImagesPage
+        {
+            id: featuredImagesPage
+            anchors.fill: parent
+            opacity: 0
+
+            Behavior on opacity
+            {
+                NumberAnimation
+                {
+                    duration: 250
+                }
+            }
+
+            Component.onCompleted: () => featuredImagesPage.opacity = 1
+        }
+    }
+
+    Item
+    {
+        id: featuredLoaderItem
         anchors.fill: parent
         opacity: 0
         visible: opacity > 0.01
+        enabled: visible
 
-        Behavior on opacity {
+        Loader
-            NumberAnimation
+        {
-            {
+            id: featuredLoader
-                duration: 250
+            anchors.fill: parent
-            }
         }
     }
 
@@ -427,21 +460,24 @@ Item
     function showFeaturedVideosPage()
     {
         resultsLayout.opacity = 0
-        featuredVideosPage.opacity = 1
+        featuredLoaderItem.opacity = 1
+        featuredLoader.sourceComponent = featuredVideosComponent
         popup = true
     }
 
     function showFeaturedPacksPage()
     {
         resultsLayout.opacity = 0
-        featuredPacksPage.opacity = 1
+        featuredLoaderItem.opacity = 1
+        featuredLoader.sourceComponent = featuredPacksComponent
         popup = true
     }
 
     function showFeaturedImagesPage()
     {
         resultsLayout.opacity = 0
-        featuredImagesPage.opacity = 1
+        featuredLoaderItem.opacity = 1
+        featuredLoader.sourceComponent = featuredImagesComponent
         popup = true
     }
 
@@ -496,25 +532,13 @@ Item
 
     function closePopup()
     {
-        if(featuredVideosPage.popup)
+        if(featuredLoader.item && featuredLoader.item.popup)
         {
-            featuredVideosPage.closePopup()
+            featuredLoader.item.closePopup()
-            return
-        }
-        if(featuredImagesPage.popup)
-        {
-            featuredImagesPage.closePopup()
-            return
-        }
-        if(featuredPacksPage.popup)
-        {
-            featuredPacksPage.closePopup()
             return
         }
 
-        featuredVideosPage.opacity = 0
+        featuredLoaderItem.opacity = 0
-        featuredImagesPage.opacity = 0
-        featuredPacksPage.opacity = 0
         viewMoreImagePopup.opacity = 0
         viewMoreVideoPopup.opacity = 0
         viewMoreWallpaperPopup.opacity = 0

KomplexHubContent/pages/LiveSearchPage.qml

@@ -33,8 +33,8 @@ Item
         {
             id: resultDelegate
 
-            width: 256
+            width: resultWidth
-            height: 245
+            height: resultHeight
 
             required property string name
             required property string author
@@ -47,7 +47,8 @@ Item
             SearchResultItem
             {
                 anchors.fill: parent
-                title: parent.author
+                title: parent.name
+                author: parent.author
                 description: parent.description
                 thumbnail: parent.thumbnail
                 uuid: parent.uuid

KomplexHubModule/Controls/HorizontalPaginator.qml

@@ -47,8 +47,6 @@ Item
                     height: 245
                     color: palette.accent
                     radius: 5
-                    // x: resultsView.currentItem.x
-                    // y: resultsView.currentItem.y
                     Behavior on x { SpringAnimation { spring: 3; damping: 0.2 } }
                     Behavior on y { SpringAnimation { spring: 3; damping: 0.2 } }
                 }

KomplexHubPlugin/common/coreservices.cpp

@@ -1,5 +1,6 @@
 #include "coreservices.h"
 #include "logging.h"
+#include "userservices.h"
 
 QNetworkAccessManager *CoreServices::s_networkAccessManager = nullptr;
 QMutex CoreServices::s_networkAccessMutex;
@@ -45,11 +46,7 @@ auto CoreServices::networkAccessManager() -> QWeakPointer<QNetworkAccessManager>
 
 auto CoreServices::sessionToken() -> QByteArray
 {
-    LOG_ERROR_X(true,
+    return UserServices::userCredentials().sessionToken;
-        "CoreServices::sessionToken",
-        "User services not yet implemented",
-        {}
-    );
 }
 
 auto CoreServices::screenSize() -> QSize

KomplexHubPlugin/common/qwallet.cpp

@@ -133,3 +133,8 @@ auto QWallet::errorString() const -> const QString &
 {
     return m_errorString;
 }
+
+auto QWallet::setErrorString(const QString &errorString) const -> void
+{
+    m_errorString = errorString;
+}

KomplexHubPlugin/common/slidingcachecontroller.h

@@ -337,14 +337,17 @@ private:
             return false;
         }
 
-        qsizetype windowSize = this->windowSize();
+        qsizetype prefetchThreshold = SLIDING_CACHE_PREFETCH_THRESHOLD;
 
-        if(windowSize == 0)
+        if(prefetchThreshold >= windowSize())
         {
-            windowSize = SLIDING_CACHE_WINDOW_SIZE;
+            prefetchThreshold = std::floor
+            (
+                static_cast<qreal>(windowSize()) * 0.8
+            );
         }
 
-        while (index >= m_windowOffset + (SLIDING_CACHE_WINDOW_SIZE - SLIDING_CACHE_PREFETCH_THRESHOLD))
+        while (index >= m_windowOffset + (windowSize() - prefetchThreshold))
         {
             if(!slideForward())
             {
@@ -414,7 +417,7 @@ private:
             m_windowOffset = 0;
         }
 
-        QThread::sleep(KOMPLEX_RATE_LIMIT);
+        // QThread::sleep(KOMPLEX_RATE_LIMIT);
 
         FetchResult<T> result = m_fetch(
             m_windowOffset,
@@ -497,7 +500,7 @@ private:
             false
         );
 
-        QThread::sleep(KOMPLEX_RATE_LIMIT);
+        // QThread::sleep(KOMPLEX_RATE_LIMIT);
 
         m_windowOffset -= movementSize;
 

KomplexHubPlugin/common/userservices.h

@@ -83,7 +83,7 @@ private:
     QString m_errorString;
     inline static UserCredentials s_userCredentials;
 
-    inline const static char PART_SEPARATOR = static_cast<char>('\0x1f');
+    inline const static char PART_SEPARATOR = static_cast<char>('\x1f');
 
     Q_PROPERTY(UserCredentials userCredentials READ userCredentials NOTIFY userCredentialsChanged FINAL)
     Q_PROPERTY(QString errorString READ errorString WRITE setErrorString NOTIFY errorStringChanged FINAL)

KomplexHubPlugin/featuredimagesmodel.cpp

@@ -343,3 +343,23 @@ auto FeaturedImagesModel::totalPages() const -> qsizetype
 
     return 0;
 }
+
+auto FeaturedImagesModel::hasNextPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() < m_paginator->totalPages();
+}
+
+auto FeaturedImagesModel::hasPreviousPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() > 0;
+}

KomplexHubPlugin/featuredimagesmodel.h

@@ -213,6 +213,20 @@ public:
      */
     Q_INVOKABLE auto previousPage() -> void;
 
+    /**
+     * @brief hasNextPage
+     * Calculates if there are more pages based on the current page calculation
+     * @return
+     */
+    auto hasNextPage() const -> bool;
+
+    /**
+     * @brief hasPreviousPage
+     * If page is greater than 1, returns true
+     * @return
+     */
+    auto hasPreviousPage() const -> bool;
+
 protected:
     /**
      * @brief setErrorString
@@ -343,6 +357,8 @@ private:
     Q_PROPERTY(qsizetype resultsPerPage READ resultsPerPage WRITE setResultsPerPage NOTIFY resultsPerPageChanged FINAL)
     Q_PROPERTY(qsizetype totalResults READ totalResults NOTIFY totalResultsChanged FINAL)
     Q_PROPERTY(qsizetype totalPages READ totalPages NOTIFY totalPagesChanged FINAL)
+    Q_PROPERTY(bool hasNextPage READ hasNextPage NOTIFY pageChanged FINAL)
+    Q_PROPERTY(bool hasPreviousPage READ hasPreviousPage NOTIFY pageChanged FINAL)
     Q_PROPERTY(qsizetype page READ page NOTIFY pageChanged FINAL)
 };
 Q_DECLARE_METATYPE(FeaturedImagesModel)

KomplexHubPlugin/featuredpacksmodel.cpp

@@ -311,6 +311,26 @@ auto FeaturedPacksModel::previousPage() -> void
     }
 }
 
+auto FeaturedPacksModel::hasNextPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() < m_paginator->totalPages();
+}
+
+auto FeaturedPacksModel::hasPreviousPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() > 0;
+}
+
 qsizetype FeaturedPacksModel::page() const
 {
     if(m_paginator != nullptr)

KomplexHubPlugin/featuredpacksmodel.h

@@ -208,6 +208,20 @@ public:
      */
     Q_INVOKABLE auto previousPage() -> void;
 
+    /**
+     * @brief hasNextPage
+     * Calculates if there are more pages based on the current page calculation
+     * @return
+     */
+    auto hasNextPage() const -> bool;
+
+    /**
+     * @brief hasPreviousPage
+     * If page is greater than 1, returns true
+     * @return
+     */
+    auto hasPreviousPage() const -> bool;
+
 protected:
     /**
      * @brief setErrorString
@@ -310,6 +324,8 @@ private:
     Q_PROPERTY(qsizetype resultsPerPage READ resultsPerPage WRITE setResultsPerPage NOTIFY resultsPerPageChanged FINAL)
     Q_PROPERTY(qsizetype totalResults READ totalResults NOTIFY totalResultsChanged FINAL)
     Q_PROPERTY(qsizetype totalPages READ totalPages NOTIFY totalPagesChanged FINAL)
+    Q_PROPERTY(bool hasNextPage READ hasNextPage NOTIFY pageChanged FINAL)
+    Q_PROPERTY(bool hasPreviousPage READ hasPreviousPage NOTIFY pageChanged FINAL)
     Q_PROPERTY(qsizetype page READ page NOTIFY pageChanged FINAL)
 };
 Q_DECLARE_METATYPE(FeaturedPacksModel)

KomplexHubPlugin/featuredvideosmodel.cpp

@@ -365,3 +365,23 @@ auto FeaturedVideosModel::totalPages() const -> qsizetype
 
     return 0;
 }
+
+auto FeaturedVideosModel::hasNextPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() < m_paginator->totalPages();
+}
+
+auto FeaturedVideosModel::hasPreviousPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() > 0;
+}

KomplexHubPlugin/featuredvideosmodel.h

@@ -231,6 +231,20 @@ public:
      */
     auto setWindowSize(qsizetype size) -> void;
 
+    /**
+     * @brief hasNextPage
+     * Calculates if there are more pages based on the current page calculation
+     * @return
+     */
+    auto hasNextPage() const -> bool;
+
+    /**
+     * @brief hasPreviousPage
+     * If page is greater than 1, returns true
+     * @return
+     */
+    auto hasPreviousPage() const -> bool;
+
 protected:
     /**
      * @brief setErrorString
@@ -327,6 +341,8 @@ private:
     Q_PROPERTY(qsizetype totalResults READ totalResults NOTIFY totalResultsChanged FINAL)
     Q_PROPERTY(qsizetype totalPages READ totalPages NOTIFY totalPagesChanged FINAL)
     Q_PROPERTY(qsizetype page READ page NOTIFY pageChanged FINAL)
+    Q_PROPERTY(bool hasNextPage READ hasNextPage NOTIFY pageChanged FINAL)
+    Q_PROPERTY(bool hasPreviousPage READ hasPreviousPage NOTIFY pageChanged FINAL)
     Q_PROPERTY(VideoItemModel *itemModel READ itemModel CONSTANT FINAL)
     Q_PROPERTY(qsizetype windowSize READ windowSize WRITE setWindowSize NOTIFY windowSizeChanged FINAL)
 };

KomplexHubPlugin/newestpacksmodel.cpp

@@ -320,3 +320,24 @@ auto NewestPacksModel::totalPages() const -> qsizetype
 
     return 0;
 }
+
+auto NewestPacksModel::hasNextPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() < m_paginator->totalPages();
+
+}
+
+auto NewestPacksModel::hasPreviousPage() const -> bool
+{
+    if(m_paginator == nullptr)
+    {
+        return false;
+    }
+
+    return m_paginator->page() > 0;
+}

KomplexHubPlugin/newestpacksmodel.h

@@ -215,6 +215,20 @@ public:
      */
     Q_INVOKABLE auto previousPage() const -> void;
 
+    /**
+     * @brief hasNextPage
+     * Calculates if there are more pages based on the current page calculation
+     * @return
+     */
+    auto hasNextPage() const -> bool;
+
+    /**
+     * @brief hasPreviousPage
+     * If page is greater than 1, returns true
+     * @return
+     */
+    auto hasPreviousPage() const -> bool;
+
 protected:
     /**
      * @brief setErrorString
@@ -321,6 +335,8 @@ private:
     Q_PROPERTY(qsizetype totalResults READ totalResults NOTIFY totalResultsChanged FINAL)
     Q_PROPERTY(qsizetype totalPages READ totalPages NOTIFY totalPagesChanged FINAL)
     Q_PROPERTY(qsizetype page READ page NOTIFY pageChanged FINAL)
+    Q_PROPERTY(bool hasNextPage READ hasNextPage NOTIFY pageChanged FINAL)
+    Q_PROPERTY(bool hasPreviousPage READ hasPreviousPage NOTIFY pageChanged FINAL)
 };
 Q_DECLARE_METATYPE(NewestPacksModel)
 

KomplexHubPlugin/paginators/featuredimagespaginator.h

@@ -36,11 +36,8 @@ class KOMPLEX_EXPORT FeaturedImagesPaginator : public ImagePaginator
 public:
     explicit FeaturedImagesPaginator(QObject *parent = nullptr) : ImagePaginator(parent)
     {
-        setUri(
+        setUri(KOMPLEX_ENDPOINT_IMAGES_FEATURED);
-            QString::fromUtf8(KOMPLEX_ENDPOINT_IMAGES_FEATURED)
+        controller()->setWindowSize(32);
-        );
-
-        controller()->setWindowSize(20);
     }
 };
 

KomplexHubPlugin/paginators/featuredpackspaginator.h

@@ -36,10 +36,7 @@ class KOMPLEX_EXPORT FeaturedPacksPaginator : public WallpaperPaginator
 public:
     explicit FeaturedPacksPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
     {
-        setUri(
+        setUri(KOMPLEX_ENDPOINT_PACKS_FEATURED);
-            QString::fromUtf8(KOMPLEX_ENDPOINT_PACKS_FEATURED)
-        );
-
         controller()->setWindowSize(32);
     }
 };

KomplexHubPlugin/paginators/featuredvideospaginator.h

@@ -36,11 +36,8 @@ class KOMPLEX_EXPORT FeaturedVideosPaginator : public VideoPaginator
 public:
     explicit FeaturedVideosPaginator(QObject *parent = nullptr) : VideoPaginator(parent)
     {
-        setUri(
+        setUri(KOMPLEX_ENDPOINT_VIDEOS_FEATURED);
-            QString::fromUtf8(KOMPLEX_ENDPOINT_VIDEOS_FEATURED)
+        controller()->setWindowSize(32);
-        );
-
-        controller()->setWindowSize(20);
     }
 };
 

KomplexHubPlugin/paginators/imagesearchpaginator.h

@@ -38,10 +38,7 @@ class KOMPLEX_EXPORT ImageSearchPaginator : public ImagePaginator
 public:
     explicit ImageSearchPaginator(QObject *parent = nullptr) : ImagePaginator(parent)
     {
-        setUri(
+        setUri(KOMPLEX_ENDPOINT_IMAGES_SEARCH);
-            QString::fromUtf8(KOMPLEX_ENDPOINT_IMAGES_SEARCH)
-        );
-
         setQueryable(true);
     }
 };

KomplexHubPlugin/paginators/newestpackspaginator.h

@@ -36,10 +36,7 @@ class KOMPLEX_EXPORT NewestPacksPaginator : public WallpaperPaginator
 public:
     explicit NewestPacksPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
     {
-        setUri(
+        setUri(KOMPLEX_ENDPOINT_PACKS_NEWEST);
-            QString::fromUtf8(KOMPLEX_ENDPOINT_PACKS_NEWEST)
-        );
-
         controller()->setWindowSize(20);
     }
 };

KomplexHubPlugin/paginators/packsearchpaginator.h

@@ -36,10 +36,7 @@ class KOMPLEX_EXPORT PackSearchPaginator : public WallpaperPaginator
 public:
     explicit PackSearchPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
     {
-        setUri(
+        setUri(KOMPLEX_ENDPOINT_PACKS_SEARCH);
-            QString::fromUtf8(KOMPLEX_ENDPOINT_PACKS_SEARCH)
-        );
-
         setQueryable(true);
     }
 };

KomplexHubPlugin/paginators/paginator.h

@@ -303,13 +303,13 @@ public:
         return m_cacheController.windowSize();
     }
 
-protected:
-
     auto queryable() const -> bool
     {
         return m_queryable;
     }
 
+protected:
+
     auto setQueryable(bool queryable) -> void
     {
         m_queryable = queryable;

KomplexHubPlugin/paginators/videopaginator.h

@@ -245,6 +245,8 @@ protected:
             loop.exec();
         }
 
+        manager.clear();
+
         LOG_ERROR_X(reply->error() != QNetworkReply::NoError,
             "NewestPacksPaginator::getNetworkReply",
             reply->errorString().toStdString().c_str(),

KomplexHubPlugin/paginators/videosearchpaginator.h

@@ -36,10 +36,7 @@ class KOMPLEX_EXPORT VideoSearchPaginator : public VideoPaginator
 public:
     explicit VideoSearchPaginator(QObject *parent = nullptr) : VideoPaginator(parent)
     {
-        setUri(
+        setUri(KOMPLEX_ENDPOINT_VIDEOS_SEARCH);
-            QString::fromUtf8(KOMPLEX_ENDPOINT_VIDEOS_SEARCH)
-        );
-
         setQueryable(true);
     }
 };

KomplexHubPlugin/paginators/wallpaperpaginator.h

@@ -248,6 +248,8 @@ protected:
             loop.exec();
         }
 
+        manager.clear();
+
         LOG_ERROR_X(reply->error() != QNetworkReply::NoError,
             "NewestPacksPaginator::getNetworkReply",
             reply->errorString().toStdString().c_str(),