Skip to content

Commit 7901dda

Browse files
baruchInsert-techbaruchInsert-tech
authored
feat: Add basic layout (MAPCO-8663) (#22)
* Add basic layout with placeholders * update yahalom components and assign placeholders
1 parent 3ed3c23 commit 7901dda

File tree

6 files changed

+84
-1
lines changed

6 files changed

+84
-1
lines changed

‎Assets/UI.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/UI/USS.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/UI/UXML.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/UI/UXML/AppHUD.uxml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
2+
<ui:VisualElement name="TopBarContainer" style="flex-grow: 1; background-color: rgb(255, 255, 255); align-self: center; align-content: auto; align-items: center; width: 1227px; height: 48px; min-height: 48px; max-height: 48px; min-width: 1227px; max-width: 1227px; position: absolute; margin-top: 0; top: 24px; flex-direction: row-reverse; justify-content: space-around;">
3+
<ui:VisualElement name="Icon" style="flex-grow: 1; width: 24px; height: 24px;" />
4+
<ui:VisualElement name="Divider" style="width: 1px; height: 42px; background-color: rgb(200, 200, 200); margin-left: 0; margin-right: 0;" />
5+
<ui:VisualElement name="Title" style="flex-grow: 1; width: 160px; height: 32px; flex-direction: row-reverse; align-self: center; justify-content: space-around; align-items: center;">
6+
<ui:Label text="Label" />
7+
</ui:VisualElement>
8+
<ui:VisualElement name="Divider" style="width: 1px; height: 42px; background-color: rgb(200, 200, 200); margin-left: 0; margin-right: 0;" />
9+
<ui:VisualElement name="SearchContainer" style="flex-grow: 1; width: 325px; height: 32px; flex-direction: row-reverse; align-items: center; justify-content: space-around; align-self: center;">
10+
<ui:VisualElement name="SearchIcon" style="flex-grow: 1; width: 24px; height: 24px; min-width: 24px; max-width: 24px; max-height: 24px; min-height: 24px;" />
11+
<YahalomUIPackage.Runtime.BasicInputField.BasicInputField style="flex-direction: row-reverse; width: 268px; height: 26px;" />
12+
</ui:VisualElement>
13+
<ui:VisualElement name="DropdownContainer" style="flex-grow: 1; flex-direction: row-reverse; width: 442px; height: 32px; align-items: center; justify-content: space-around; align-self: center;">
14+
<ui:Label text="Label" name="DropdownTitle" />
15+
<ui:VisualElement style="flex-grow: 1;" />
16+
</ui:VisualElement>
17+
<ui:VisualElement name="IntelligenceContainer" style="flex-grow: 1; flex-direction: row-reverse; width: 154px; height: 32px; align-items: center; justify-content: space-around; align-self: center;">
18+
<YahalomUIPackage.Runtime.BasicButton.BasicButton style="width: 154px; height: 32px; flex-direction: row-reverse; align-items: center; justify-content: space-around; align-self: center;">
19+
<ui:VisualElement name="IntelligenceIcon" style="flex-grow: 1; width: 24px; height: 24px; background-color: rgb(255, 255, 255); flex-direction: row-reverse; justify-content: flex-start; right: auto; position: relative; flex-wrap: nowrap; align-items: flex-end; min-height: 24px; max-height: 24px; max-width: 24px; min-width: 24px;" />
20+
<ui:Button text="Button" name="IntelligenceIconTitle" />
21+
</YahalomUIPackage.Runtime.BasicButton.BasicButton>
22+
</ui:VisualElement>
23+
<ui:VisualElement name="Divider" style="width: 1px; height: 42px; background-color: rgb(200, 200, 200); margin-left: 0; margin-right: 0;" />
24+
<ui:VisualElement name="ConnectionContainer" style="flex-grow: 1; flex-direction: row-reverse; width: 60px; height: 32px; align-self: center; justify-content: space-around; align-items: center;">
25+
<ui:VisualElement name="ConnectionIcon" style="flex-grow: 1; width: 24px; height: 24px;" />
26+
<YahalomUIPackage.Runtime.BasicDropdown.BasicDropdown name="ConnectionDropdown" style="flex-direction: row-reverse; width: 24px; height: 24px;" />
27+
</ui:VisualElement>
28+
<YahalomUIPackage.Runtime.BasicButton.BasicButton name="SettingsButton" style="width: 32px; height: 32px;" />
29+
</ui:VisualElement>
30+
<ui:VisualElement name="WorkspaceButtonContainer" style="flex-grow: 1; background-color: rgb(255, 255, 255); width: 231px; min-width: 231px; max-width: 231px; height: 48px; min-height: 48px; max-height: 48px; position: absolute; align-self: flex-end; margin-right: 0; margin-top: 0; margin-left: 0; right: 0; top: 24px; flex-direction: row-reverse; justify-content: space-around; align-items: center;">
31+
<ui:Label text="Label" name="MissonTitle" style="width: 44px;" />
32+
<ui:Label text="Label" name="MissonName" style="width: 89px;" />
33+
<YahalomUIPackage.Runtime.BasicButton.BasicButton name="MissionButton" style="width: 32px; height: 24px; min-width: 32px; min-height: 24px; max-height: 24px;" />
34+
</ui:VisualElement>
35+
<ui:VisualElement name="HelpButtonContainer" style="flex-grow: 1; width: 48px; height: 48px; min-height: 48px; min-width: 48px; max-width: 48px; max-height: 48px; position: absolute; background-color: rgb(255, 255, 255); right: 16px; bottom: 16px;">
36+
<YahalomUIPackage.Runtime.BasicButton.BasicButton name="HelpButton" style="margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; height: 100%; justify-content: space-around; width: 100%;" />
37+
</ui:VisualElement>
38+
<ui:VisualElement name="BottomButtonsContainer" style="flex-grow: 1; position: absolute; bottom: 16px; flex-direction: row-reverse; align-self: center; padding-right: 0; margin-top: 0; margin-right: 0; display: flex; visibility: visible; overflow: visible; justify-content: space-between; align-items: stretch; align-content: flex-start; width: 339px; min-width: 339px; max-width: 339px; height: 78px; min-height: 78px; max-height: 78px;">
39+
<ui:VisualElement name="SimulationButtonContainer" style="flex-grow: 1; width: 84px; height: 78px; min-width: 84px; max-width: 84px; min-height: 78px; max-height: 78px;">
40+
<YahalomUIPackage.Runtime.BasicButton.BasicButton style="width: 100%; height: 100%; min-width: 100%; max-width: 100%; min-height: 100%; max-height: 100%; align-self: center; justify-content: flex-start; align-items: center; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0;" />
41+
</ui:VisualElement>
42+
<ui:GroupBox name="ButtonsGroup" style="bottom: auto; height: 78px; min-height: 78px; max-height: 78px; width: 241px; min-width: 241px; max-width: 241px; position: relative; right: auto; background-color: rgb(255, 255, 255); align-self: auto; margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0; padding-top: 0; padding-bottom: 0; padding-left: 0; flex-direction: row; justify-content: space-around; align-items: center; align-content: flex-start;">
43+
<YahalomUIPackage.Runtime.BasicButton.BasicButton name="MoreButton" style="width: 60px; height: 42px; padding-left: 0; padding-bottom: 0; padding-right: 0; padding-top: 0; margin-left: 0; margin-bottom: 0; margin-right: 0; margin-top: 0;" />
44+
<ui:VisualElement name="Divider" style="width: 1px; height: 42px; background-color: rgb(200, 200, 200); margin-left: 0; margin-right: 0;" />
45+
<YahalomUIPackage.Runtime.BasicButton.BasicButton name="ScreenShotButton" style="height: 42px; width: 60px; padding-left: 0; padding-bottom: 0; padding-right: 0; padding-top: 0; margin-left: 0; margin-bottom: 0; margin-right: 0; margin-top: 0;" />
46+
<YahalomUIPackage.Runtime.BasicButton.BasicButton name="MarkerButton" style="height: 42px; width: 60px; padding-left: 0; padding-bottom: 0; padding-right: 0; padding-top: 0; margin-left: 0; margin-bottom: 0; margin-top: 0; margin-right: 0;" />
47+
</ui:GroupBox>
48+
</ui:VisualElement>
49+
</ui:UXML>

‎Assets/UI/UXML/AppHUD.uxml.meta‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Packages/packages-lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"depth": 0,
2525
"source": "git",
2626
"dependencies": {},
27-
"hash": "f936ac83dad04a4d8cd5eda178dc36339030ae82"
27+
"hash": "4c1161623d67ec92e7dd490d0233d50f68707468"
2828
},
2929
"com.unity.burst": {
3030
"version": "1.8.24",

0 commit comments

Comments
 (0)