Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:58:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stand-alone Optimized Tagging - Add tagging for GOTO User Stories

Browse source
This commit is contained in:
Roxanne Skelly 2019-02-20 14:23:54 -08:00
parent d957b38f10
commit dca166f821
3 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
interface/resources/qml/hifi/Card.qml
View file

@ -30,6 +30,7 @@ Item {
property string imageUrl: ""; property string imageUrl: "";
property var goFunction: null; property var goFunction: null;
property string storyId: ""; property string storyId: "";
property bool standaloneOptimized: false;
property bool drillDownToPlace: false; property bool drillDownToPlace: false;
property bool showPlace: isConcurrency; property bool showPlace: isConcurrency;
@ -39,7 +40,7 @@ Item {
property bool isConcurrency: action === 'concurrency'; property bool isConcurrency: action === 'concurrency';
property bool isAnnouncement: action === 'announcement'; property bool isAnnouncement: action === 'announcement';
property bool isStacked: !isConcurrency && drillDownToPlace; property bool isStacked: !isConcurrency && drillDownToPlace;
property bool standaloneOptimized: true;
property int textPadding: 10; property int textPadding: 10;
property int smallMargin: 4; property int smallMargin: 4;
@ -271,6 +272,24 @@ Item {
goFunction("hifi://" + hifiUrl); 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 { StateImage {
id: actionIcon; id: actionIcon;
visible: !isAnnouncement; visible: !isAnnouncement;
@ -282,24 +301,6 @@ Item {
right: parent.right; right: parent.right;
margins: smallMargin; 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() { function go() {

2
interface/resources/qml/hifi/Feed.qml
View file

@ -82,6 +82,7 @@ Column {
action: data.action || "", action: data.action || "",
thumbnail_url: resolveUrl(thumbnail_url), thumbnail_url: resolveUrl(thumbnail_url),
image_url: resolveUrl(data.details && data.details.image_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. 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; hifiUrl: model.place_name + model.path;
thumbnail: model.thumbnail_url; thumbnail: model.thumbnail_url;
imageUrl: model.image_url; imageUrl: model.image_url;
standaloneOptimized: model.standalone_optimized;
action: model.action; action: model.action;
timestamp: model.created_at; timestamp: model.created_at;
onlineUsers: model.online_users; onlineUsers: model.online_users;

8
interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml
View file

@ -90,6 +90,14 @@ Rectangle {
id: -1, id: -1,
name: "Everything" name: "Everything"
}); });
categoriesModel.append({
id: -1,
name: "Standalone Optimized"
});
categoriesModel.append({
id: -1,
name: "Standalone Compatible"
});
result.data.items.forEach(function(category) { result.data.items.forEach(function(category) {
categoriesModel.append({ categoriesModel.append({
id: category.id, id: category.id,