Click on whole item + Handle projects with no right to get details..

Author: mohsenD98

src/qml/QFieldCloudPopup.qml

@@ -132,7 +132,7 @@ Popup {
                   if (cloudConnection.status !== QFieldCloudConnection.LoggedIn || !cloudProjectsModel.currentProject || cloudProjectsModel.currentProject.status !== QFieldCloudProject.Idle)
                     return;
                   connectionSettings.visible = !connectionSettings.visible;
-                  storageMeterBar.visible = !connectionSettings.visible;
+                  storageMeterBar.visible = Qt.binding(() => storageMeterBar.value > 0 && !connectionSettings.visible);
                 }
               }
             }
@@ -912,6 +912,8 @@ Popup {
   }
 
   function fetchSubscriptionInformation() {
+    storageMeterBar.visible = false;
+    storageMeterBar.value = 0;
     if (cloudConnection.status === QFieldCloudConnection.LoggedIn) {
       const owner = cloudProjectsModel.currentProject ? cloudProjectsModel.currentProject.owner : cloudConnection.username;
       cloudConnection.getSubscriptionInformation(owner);

src/qml/imports/Theme/QfMeterBar.qml

@@ -8,7 +8,7 @@ import org.qfield
 /**
  * \ingroup qml
  */
-ColumnLayout {
+Item {
   id: meterBar
 
   property alias value: progressBar.value
@@ -24,137 +24,144 @@ ColumnLayout {
   property int animationDuration: 1000
   property int barHeight: 8
 
-  spacing: 8
+  implicitHeight: content.implicitHeight
+  implicitWidth: content.implicitWidth
 
-  Item {
-    id: upgradeLink
-    Layout.fillWidth: true
-    implicitHeight: upgradeLinkRow.implicitHeight
+  ColumnLayout {
+    id: content
+    anchors.fill: parent
+    spacing: 8
 
-    property string url: ""
-    property bool isCritical: value >= meterBar.criticalThreshold
+    Item {
+      id: upgradeLink
+      Layout.fillWidth: true
+      implicitHeight: upgradeLinkRow.implicitHeight
 
-    Row {
-      id: upgradeLinkRow
-      spacing: 8
+      property string url: ""
+      property bool isCritical: value >= meterBar.criticalThreshold
 
-      Label {
-        text: upgradeLink.isCritical ? qsTr("Tap to upgrade") : qsTr("Tap to manage")
-        font: Theme.tipFont
-        color: Theme.mainTextColor
-        anchors.verticalCenter: parent.verticalCenter
-      }
+      Row {
+        id: upgradeLinkRow
+        spacing: 8
 
-      Shape {
-        width: 10
-        height: 10
-        anchors.verticalCenter: parent.verticalCenter
-
-        ShapePath {
-          strokeWidth: 1.5
-          strokeColor: Theme.mainTextColor
-          fillColor: "transparent"
-          capStyle: ShapePath.RoundCap
-          joinStyle: ShapePath.RoundJoin
-          startX: 0
-          startY: 5
-          PathLine {
-            x: 5.5
-            y: 5
-          }
+        Label {
+          text: upgradeLink.isCritical ? qsTr("Tap to upgrade") : qsTr("Tap to manage")
+          font: Theme.tipFont
+          color: Theme.mainTextColor
+          anchors.verticalCenter: parent.verticalCenter
         }
 
-        ShapePath {
-          strokeWidth: 1.5
-          strokeColor: Theme.mainTextColor
-          fillColor: "transparent"
-          capStyle: ShapePath.RoundCap
-          joinStyle: ShapePath.RoundJoin
-          startX: 4
-          startY: 1.5
-          PathLine {
-            x: 8
-            y: 5
+        Shape {
+          width: 10
+          height: 10
+          anchors.verticalCenter: parent.verticalCenter
+
+          ShapePath {
+            strokeWidth: 1.5
+            strokeColor: Theme.mainTextColor
+            fillColor: "transparent"
+            capStyle: ShapePath.RoundCap
+            joinStyle: ShapePath.RoundJoin
+            startX: 0
+            startY: 5
+            PathLine {
+              x: 5.5
+              y: 5
+            }
           }
-          PathLine {
-            x: 4
-            y: 8.5
+
+          ShapePath {
+            strokeWidth: 1.5
+            strokeColor: Theme.mainTextColor
+            fillColor: "transparent"
+            capStyle: ShapePath.RoundCap
+            joinStyle: ShapePath.RoundJoin
+            startX: 4
+            startY: 1.5
+            PathLine {
+              x: 8
+              y: 5
+            }
+            PathLine {
+              x: 4
+              y: 8.5
+            }
           }
         }
       }
     }
 
-    MouseArea {
-      anchors.fill: parent
-      cursorShape: Qt.PointingHandCursor
-      onClicked: Qt.openUrlExternally(upgradeLink.url)
-    }
-  }
-
-  ProgressBar {
-    id: progressBar
-    Layout.fillWidth: true
-    from: 0
-    to: 1
-
-    property color barColor: {
-      if (meterBar.value < meterBar.warningThreshold) {
-        return meterBar.normalColor;
-      } else if (meterBar.value < meterBar.criticalThreshold) {
-        return meterBar.warningColor;
-      } else {
-        return meterBar.criticalColor;
+    ProgressBar {
+      id: progressBar
+      Layout.fillWidth: true
+      from: 0
+      to: 1
+
+      property color barColor: {
+        if (meterBar.value < meterBar.warningThreshold) {
+          return meterBar.normalColor;
+        } else if (meterBar.value < meterBar.criticalThreshold) {
+          return meterBar.warningColor;
+        } else {
+          return meterBar.criticalColor;
+        }
       }
-    }
 
-    background: Rectangle {
-      implicitHeight: meterBar.barHeight
-      radius: height / 2
-      color: Theme.controlBackgroundAlternateColor
-    }
-
-    contentItem: Item {
-      implicitHeight: meterBar.barHeight
-
-      Rectangle {
-        width: progressBar.visualPosition * parent.width
-        height: parent.height
+      background: Rectangle {
+        implicitHeight: meterBar.barHeight
         radius: height / 2
-        gradient: Gradient {
-          orientation: Gradient.Horizontal
-          GradientStop {
-            position: 0.0
-            color: progressBar.barColor
-          }
-          GradientStop {
-            position: 1.0
-            color: Qt.lighter(progressBar.barColor, 1.4)
+        color: Theme.controlBackgroundAlternateColor
+      }
+
+      contentItem: Item {
+        implicitHeight: meterBar.barHeight
+
+        Rectangle {
+          width: progressBar.visualPosition * parent.width
+          height: parent.height
+          radius: height / 2
+          gradient: Gradient {
+            orientation: Gradient.Horizontal
+            GradientStop {
+              position: 0.0
+              color: progressBar.barColor
+            }
+            GradientStop {
+              position: 1.0
+              color: Qt.lighter(progressBar.barColor, 1.4)
+            }
           }
         }
       }
-    }
 
-    Behavior on value {
-      NumberAnimation {
-        duration: meterBar.animationDuration
+      Behavior on value {
+        NumberAnimation {
+          duration: meterBar.animationDuration
+        }
       }
     }
-  }
 
-  RowLayout {
-    Layout.fillWidth: true
-
-    Label {
-      id: usedLabel
+    RowLayout {
       Layout.fillWidth: true
-      font: Theme.tipFont
-      color: Theme.mainTextColor
-    }
 
-    Label {
-      id: totalLabel
-      font: Theme.tipFont
-      color: Theme.secondaryTextColor
+      Label {
+        id: usedLabel
+        Layout.fillWidth: true
+        font: Theme.tipFont
+        color: Theme.mainTextColor
+      }
+
+      Label {
+        id: totalLabel
+        font: Theme.tipFont
+        color: Theme.secondaryTextColor
+      }
     }
   }
+
+  MouseArea {
+    anchors.fill: parent
+    cursorShape: Qt.PointingHandCursor
+    onClicked: Qt.openUrlExternally(upgradeLink.url)
+  }
 }