diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml index 67abc1c3f9..9beb108b36 100644 --- a/interface/resources/qml/hifi/Card.qml +++ b/interface/resources/qml/hifi/Card.qml @@ -30,6 +30,7 @@ Item { property string imageUrl: ""; property var goFunction: null; property string storyId: ""; + property bool standaloneOptimized: false; property bool drillDownToPlace: false; property bool showPlace: isConcurrency; @@ -39,7 +40,7 @@ Item { property bool isConcurrency: action === 'concurrency'; property bool isAnnouncement: action === 'announcement'; property bool isStacked: !isConcurrency && drillDownToPlace; - property bool standaloneOptimized: true; + property int textPadding: 10; property int smallMargin: 4; @@ -271,6 +272,24 @@ Item { goFunction("hifi://" + hifiUrl); } } + + HiFiGlyphs { + id: standaloneOptomizedBadge + + anchors { + right: actionIcon.left + bottom: parent.bottom; + } + height: (root.isConcurrency && root.standaloneOptimized) ? 34 : 0 + + visible: root.isConcurrency && root.standaloneOptimized + + text: hifi.glyphs.hmd + size: 34 + horizontalAlignment: Text.AlignHCenter + color: messageColor + } + StateImage { id: actionIcon; visible: !isAnnouncement; @@ -282,24 +301,6 @@ Item { right: parent.right; margins: smallMargin; } - - } - HiFiGlyphs { - id: standaloneOptomizedBadge - - anchors { - right: actionIcon.left - verticalCenter: parent.verticalCenter - bottom: parent.bottom; - } - height: root.standaloneOptimized ? 34 : 0 - - visible: standaloneOptimized - - text: hifi.glyphs.hmd - size: 34 - horizontalAlignment: Text.AlignHCenter - color: hifi.colors.blueHighlight } function go() { diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml index 1e89971938..68aab2fdd2 100644 --- a/interface/resources/qml/hifi/Feed.qml +++ b/interface/resources/qml/hifi/Feed.qml @@ -82,6 +82,7 @@ Column { action: data.action || "", thumbnail_url: resolveUrl(thumbnail_url), image_url: resolveUrl(data.details && data.details.image_url), + standalone_optimized: data.standalone_optimized, metaverseId: (data.id || "").toString(), // Some are strings from server while others are numbers. Model objects require uniformity. @@ -127,6 +128,7 @@ Column { hifiUrl: model.place_name + model.path; thumbnail: model.thumbnail_url; imageUrl: model.image_url; + standaloneOptimized: model.standalone_optimized; action: model.action; timestamp: model.created_at; onlineUsers: model.online_users; diff --git a/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml b/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml index 8c7e050ec2..5f97e64e6c 100644 --- a/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml +++ b/interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml @@ -90,6 +90,14 @@ Rectangle { id: -1, name: "Everything" }); + categoriesModel.append({ + id: -1, + name: "Standalone Optimized" + }); + categoriesModel.append({ + id: -1, + name: "Standalone Compatible" + }); result.data.items.forEach(function(category) { categoriesModel.append({ id: category.id,