Move Home > Scores > Cloud scores components into project module

src/project/qml/MuseScore/Project/CMakeLists.txt

@@ -98,20 +98,23 @@ qt_add_qml_module(project_qml
         internal/Properties/PropertyItem.qml
         internal/SaveToCloud/SaveLocationOption.qml
         internal/ScoresPage/CloudScoreIndicatorButton.qml
+        internal/ScoresPage/CloudScoresGridView.qml
+        internal/ScoresPage/CloudScoresListView.qml
+        internal/ScoresPage/CloudScoresView.qml
         internal/ScoresPage/RecentScoresView.qml
         internal/ScoresPage/ScoreGridItem.qml
         internal/ScoresPage/ScoreListItem.qml
+        internal/ScoresPage/ScoresGridView.qml
+        internal/ScoresPage/ScoresListView.qml
+        internal/ScoresPage/ScoresView.qml
         internal/ScoresPage/ScoreThumbnail.qml
         Message.qml
         MigrationDialog.qml
         NewScoreDialog.qml
         ProjectPropertiesDialog.qml
         ProjectUploadedDialog.qml
         SaveToCloudDialog.qml
-        ScoresGridView.qml
-        ScoresListView.qml
         ScoresPage.qml
-        ScoresView.qml
         UploadProgressDialog.qml
     RESOURCES
         internal/Migration/migration.png
@@ -125,6 +128,7 @@ qt_add_qml_module(project_qml
         resources/AudioCom_Waveform.png
         resources/PublishScores.png
     IMPORTS
+        TARGET muse_cloud_qml
         TARGET muse_ui_qml
         TARGET muse_uicomponents_qml
         TARGET notationscene_qml

src/project/qml/MuseScore/Project/ScoresPage.qml

@@ -25,9 +25,6 @@ import QtQuick.Layouts
 import Muse.Ui
 import Muse.UiComponents
 import MuseScore.Project
-import Muse.Cloud
-
-import "internal/ScoresPage"
 
 FocusScope {
     id: root

src/project/qml/MuseScore/Project/internal/ScoresPage/CloudScoresGridView.qml

@@ -0,0 +1,110 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-only
+ * MuseScore-Studio-CLA-applies
+ *
+ * MuseScore Studio
+ * Music Composition & Notation
+ *
+ * Copyright (C) 2023 MuseScore Limited and others
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+import QtQuick
+
+import Muse.Ui
+import Muse.UiComponents
+import MuseScore.Project
+
+ScoresGridView {
+    id: root
+
+    navigation.name: "OnlineScoresGrid"
+    navigation.accessible.name: qsTrc("project", "Online scores grid")
+
+    isNoResultsMessageAllowed: model.state === CloudScoresModel.Fine
+
+    Component.onCompleted: {
+        prv.updateDesiredRowCount()
+    }
+
+    Connections {
+        target: root.model
+
+        function onStateChanged() {
+            if (root.model.state === CloudScoresModel.Fine) {
+                // After the model has loaded more, check if even more is needed
+                prv.updateDesiredRowCount();
+            }
+        }
+    }
+
+    QtObject {
+        id: prv
+
+        readonly property int remainingFullRowsBelowViewport:
+            Math.floor(root.view.count / root.view.columns) - Math.ceil((root.view.contentY + root.view.height) / root.view.cellHeight)
+
+        readonly property bool isSatisfied: remainingFullRowsBelowViewport >= 3
+
+        onIsSatisfiedChanged: {
+            if (!isSatisfied) {
+                updateDesiredRowCount();
+            }
+        }
+
+        property bool updateDesiredRowCountScheduled: false
+
+        function updateDesiredRowCount() {
+            if (updateDesiredRowCountScheduled) {
+                return
+            }
+
+            if (isSatisfied || !root.model.hasMore) {
+                return
+            }
+
+            updateDesiredRowCountScheduled = true
+
+            Qt.callLater(function() {
+                let newDesiredRowCount = root.model.rowCount + (3 - remainingFullRowsBelowViewport) * view.columns
+
+                if (root.model.desiredRowCount < newDesiredRowCount) {
+                    root.model.desiredRowCount = newDesiredRowCount
+                }
+
+                updateDesiredRowCountScheduled = false
+            })
+        }
+    }
+
+    view.footer: root.model.state === CloudScoresModel.Loading
+                 ? busyIndicatorComp : null
+
+    Component {
+        id: busyIndicatorComp
+
+        Item {
+            width: GridView.view ? GridView.view.width : 0
+            height: indicator.implicitHeight + indicator.anchors.topMargin + indicator.anchors.bottomMargin
+
+            StyledBusyIndicator {
+                id: indicator
+
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.top: parent.top
+                anchors.topMargin: root.view.spacingBetweenRows / 2
+                anchors.bottomMargin: root.view.spacingBetweenRows / 2
+            }
+        }
+    }
+}