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

feat: generic dynamic context menu + reel gallery integration #3071

Merged
merged 45 commits into from
Jan 20, 2025
Merged

feat: generic dynamic context menu + reel gallery integration #3071

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8523506
wip
lorenzo-ranciaffi Jan 3, 2025
e3ab563
wip
lorenzo-ranciaffi Jan 3, 2025
5943bbd
wip
lorenzo-ranciaffi Jan 3, 2025
e1bc7fc
fix scriptable objects
lorenzo-ranciaffi Jan 3, 2025
b52e8d2
improved SO
lorenzo-ranciaffi Jan 3, 2025
ac6c09d
fix and integration into reel gallery
lorenzo-ranciaffi Jan 3, 2025
5d0e5ad
extension and initial values
lorenzo-ranciaffi Jan 6, 2025
06caf8c
moved all SO in own classes
lorenzo-ranciaffi Jan 6, 2025
abfb65f
fix toggle graphics
lorenzo-ranciaffi Jan 6, 2025
278bc57
added readonly serialized attribute drawer
lorenzo-ranciaffi Jan 6, 2025
aae1e1e
context menu conversion test
lorenzo-ranciaffi Jan 6, 2025
e0b2e48
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 6, 2025
2039858
fix custom property naming
lorenzo-ranciaffi Jan 6, 2025
2fc3279
more test conversion
lorenzo-ranciaffi Jan 6, 2025
682984a
fix context menu position
lorenzo-ranciaffi Jan 6, 2025
22ae88b
avoid layout rebuild for height calculation
lorenzo-ranciaffi Jan 6, 2025
18aed20
restructured components
lorenzo-ranciaffi Jan 6, 2025
939556f
more generic management of components
lorenzo-ranciaffi Jan 7, 2025
d5484f3
reference lambdas and values by config instead of indexes
lorenzo-ranciaffi Jan 7, 2025
e25937d
more generic pool manager
lorenzo-ranciaffi Jan 7, 2025
41121a5
expose elements spacing in context menu config
lorenzo-ranciaffi Jan 7, 2025
c03f7d0
exposed layout settings
lorenzo-ranciaffi Jan 7, 2025
d73b1cc
fix reel gallery context menu behavior
lorenzo-ranciaffi Jan 7, 2025
2bb9953
removed unused import
lorenzo-ranciaffi Jan 7, 2025
660b442
ported camera reel gallery context menu to new generic architecture
lorenzo-ranciaffi Jan 8, 2025
f694ec9
fix asmdef pointers
lorenzo-ranciaffi Jan 8, 2025
8cfd7d3
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 8, 2025
cf7e072
add required component
lorenzo-ranciaffi Jan 8, 2025
7b56cb9
changed class names
lorenzo-ranciaffi Jan 9, 2025
9d76599
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 9, 2025
18c2b99
use asset references instead of indexes
lorenzo-ranciaffi Jan 9, 2025
6c262a0
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 9, 2025
8b49855
added generic types for component configure method
lorenzo-ranciaffi Jan 10, 2025
06dbf24
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 10, 2025
dfae86e
moved scriptable object logic to code builder
lorenzo-ranciaffi Jan 14, 2025
53a71a1
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 14, 2025
07ce827
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 16, 2025
b3e145a
suggested modifications
lorenzo-ranciaffi Jan 16, 2025
98829f0
removed unnecessary abstraction layer in components
lorenzo-ranciaffi Jan 16, 2025
f5ad975
refactored context menu closing task
lorenzo-ranciaffi Jan 16, 2025
2e59aee
removed background button click event and used onClickAsync directly …
lorenzo-ranciaffi Jan 16, 2025
a60cde0
prevent double Hide invocation
lorenzo-ranciaffi Jan 16, 2025
b3a0421
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 16, 2025
c6bdcf7
Merge branch 'dev' into feat/dynamic-context-menu
lorenzo-ranciaffi Jan 20, 2025
c71845d
removed generic Delegate and initial value. Moved everything as typed…
lorenzo-ranciaffi Jan 20, 2025
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
25 changes: 25 additions & 0 deletions Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,21 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3c3c8d365c6ef4acfa3665168b5737a9
m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/ButtonWithTextAndIcon.prefab
lorenzo-ranciaffi marked this conversation as resolved.
Show resolved Hide resolved
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3efe8a48fc3905f47a0648abd6859394
m_Address: MapCameraObject
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 43daf6965002847a19f241e71b28fd9b
m_Address: Assets/DCL/InWorldCamera/CameraReelGallery/Assets/ContextMenuSO/ReelGalleryContextMenuConfig.asset
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4a2a7b610414b45c1b576946ce094877
m_Address: NftCategoryIcons
m_ReadOnly: 0
Expand All @@ -122,6 +132,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 52bc5c5fe83f743cdba8dab60b247e96
m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/Separator.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 53b70d09c4a814878a30c68582ad4523
m_Address: Assets/DCL/MapRenderer/Addressables/HotUserMarkerObject.prefab
m_ReadOnly: 0
Expand Down Expand Up @@ -157,6 +172,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5ef9c85ff80df42e88f2946a299f1102
m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/GenericContextMenu.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5f2c1af519efc4b82b87b887f93077fc
m_Address: Assets/DCL/MapRenderer/Addressables/Favorite.prefab
m_ReadOnly: 0
Expand All @@ -167,6 +187,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 60ec312971597448e978368a5382c0f1
m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/ToggleWithText.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 62f68ba25f6c905428b36a081b072566
m_Address: EmoteAudioSource
m_ReadOnly: 0
Expand Down
50 changes: 25 additions & 25 deletions Explorer/Assets/DCL/ExplorePanel/Assets/ExplorePanelUI.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1965,23 +1965,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_SizeDelta.x
value: 20
value: 0
objectReference: {fileID: 0}
- target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.x
value: 85.770004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 267759340061970864, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
value: 0
objectReference: {fileID: 0}
- target: {fileID: 452888844655872247, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -2689,19 +2689,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_SizeDelta.x
value: 24
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4355553488569849823, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4392543827313620798, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_PresetInfoIsWorld
Expand Down Expand Up @@ -2949,23 +2949,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_SizeDelta.x
value: 32.11
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.x
value: 113.825005
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6131980454684310232, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6206568137154906387, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -3165,23 +3165,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_SizeDelta.x
value: 10
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.x
value: 68.770004
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7820116009902200831, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7879708898242044120, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -3297,23 +3297,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_SizeDelta.x
value: 35.77
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.x
value: 26
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8963147552032789253, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchoredPosition.y
value: -15
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9086857670890158988, guid: ad0eada9babef44e5bb3f06b080eef83, type: 3}
propertyPath: m_AnchorMax.x
Expand Down Expand Up @@ -9043,7 +9043,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8968749121595387193, guid: 56d4550f784694f7a89e739437f9ca7a, type: 3}
propertyPath: m_Size
value: 1
value: 0.99999994
objectReference: {fileID: 0}
- target: {fileID: 9095025335429269016, guid: 56d4550f784694f7a89e739437f9ca7a, type: 3}
propertyPath: m_AnchorMax.y
Expand Down
Loading
Loading