Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add inventory screen titles #45

Merged
merged 7 commits into from
Aug 6, 2021
Merged

feat: add inventory screen titles #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ca837a
feat: add inventory screen title
jdrueckert Aug 5, 2021
90d3dd0
fix: recursion
jdrueckert Aug 5, 2021
990824b
feat: add titles for container inventory screen
jdrueckert Aug 5, 2021
fe54f15
i18n: attempt to translate the container name
skaldarnar Aug 6, 2021
1491e47
chore: fix JSON style issues
skaldarnar Aug 6, 2021
1d9b057
chore: move get CharacterComponent into binding
jdrueckert Aug 6, 2021
0d9a999
Merge remote-tracking branch 'origin/feat/add-inventory-screen-title'…
jdrueckert Aug 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions assets/skins/inventoryDefault.skin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,11 @@
"fixed-width": 40,
"fixed-height": 40
}
},
"families": {
"title": {
"font":"NotoSans-Regular-Medium",
"text-align-horizontal": "left"
}
}
}
58 changes: 46 additions & 12 deletions assets/ui/ingame/containerScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,67 @@
"contents": {
"type": "relativeLayout",
"contents": [
{
"type": "UILabel",
"id": "containerTitle",
"family": "title",
"layoutInfo": {
"height": 30,
"use-content-width": true,
"position-left": {
"target": "LEFT",
"widget": "container"
},
"position-bottom": {
"target": "TOP",
"widget": "container",
"offset": 10
}
}
},
{
"type": "InventoryGrid",
"id": "inventory",
"id": "container",
"maxHorizontalCells": 10,
"layoutInfo": {
"use-content-width": true,
"use-content-height": true,
"position-bottom": {
"target": "BOTTOM",
"offset": 128
"position-horizontal-center": {},
"position-vertical-center": {}
}
},
{
"type": "UILabel",
"id": "inventoryTitle",
"family": "title",
"text": "${engine:menu#category-inventory}",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for using the translated string here. I noticed this only has an effect after restarting the game and created MovingBlocks/Terasology#4837 to track that.

"layoutInfo": {
"height": 30,
"use-content-width": true,
"position-left": {
"target": "LEFT",
"widget": "container"
},
"position-horizontal-center": {}
"position-top": {
"target": "BOTTOM",
"widget": "container",
"offset": 16
}
}
},
{
"type": "InventoryGrid",
"id": "container",
"id": "inventory",
"maxHorizontalCells": 10,
"layoutInfo": {
"use-content-width": true,
"use-content-height": true,
"position-bottom": {
"target": "TOP",
"widget": "inventory",
"offset": 16
},
"position-horizontal-center": {}
"position-horizontal-center": {},
"position-top": {
"target": "BOTTOM",
"widget": "inventoryTitle",
"offset": 10
}
}
}
]
Expand Down
20 changes: 20 additions & 0 deletions assets/ui/ingame/inventoryScreen.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,25 @@
"contents": {
"type": "relativeLayout",
"contents": [
{
"type": "UILabel",
"id": "title",
"family": "title",
"text": "${engine:menu#category-inventory}",
"layoutInfo": {
"height": 30,
"use-content-width": true,
"position-left": {
"target": "LEFT",
"widget": "inventory"
},
"position-bottom": {
"target": "TOP",
"widget": "inventory",
"offset": 10
}
}
},
{
"type": "InventoryGrid",
"id": "inventory",
Expand All @@ -18,3 +37,4 @@
]
}
}

31 changes: 27 additions & 4 deletions src/main/java/org/terasology/module/inventory/ui/ContainerScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
package org.terasology.module.inventory.ui;

import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.engine.i18n.TranslationSystem;
import org.terasology.engine.logic.characters.CharacterComponent;
import org.terasology.engine.logic.common.DisplayNameComponent;
import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.nui.databinding.ReadOnlyBinding;
import org.terasology.engine.registry.In;
import org.terasology.engine.rendering.nui.CoreScreenLayer;
import org.terasology.nui.databinding.ReadOnlyBinding;
import org.terasology.nui.widgets.UILabel;

/**
*/
Expand All @@ -16,6 +20,9 @@ public class ContainerScreen extends CoreScreenLayer {
@In
private LocalPlayer localPlayer;

@In
private TranslationSystem i18n;

private InventoryGrid containerInventory;

@Override
Expand All @@ -29,13 +36,29 @@ public EntityRef get() {
});
inventory.setCellOffset(10);

UILabel containerTitle = find("containerTitle", UILabel.class);
containerInventory = find("container", InventoryGrid.class);

EntityRef characterEntity = localPlayer.getCharacterEntity();
containerInventory.bindTargetEntity(new ReadOnlyBinding<EntityRef>() {
@Override
public EntityRef get() {
EntityRef characterEntity = localPlayer.getCharacterEntity();
CharacterComponent characterComponent = characterEntity.getComponent(CharacterComponent.class);
return characterComponent.predictedInteractionTarget;
return characterEntity.getComponent(CharacterComponent.class).predictedInteractionTarget;
}
});
containerTitle.bindText(new ReadOnlyBinding<String>() {
@Override
public String get() {
Prefab parentPrefab = characterEntity.getComponent(CharacterComponent.class).predictedInteractionTarget.getParentPrefab();
DisplayNameComponent displayName = parentPrefab.getComponent(DisplayNameComponent.class);
if (displayName != null) {
// The display name may contain a translatable string reference, thus we attempt to get the translation.
// If the string is just non-translatable display name the fallback mechanism will yield just the input string.
// NOTE: Unfortunately, this contract is not guaranteed by `TranslationSystem#translate(String)`.
return i18n.translate(displayName.name);
} else {
return parentPrefab.getName();
}
}
});
}
Expand Down