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.

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: friends panel UI #3166

Draft
wants to merge 56 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
249e9fb
wip sidebar button
lorenzo-ranciaffi Jan 8, 2025
05bdf0b
wip friends panel
lorenzo-ranciaffi Jan 9, 2025
656c1b7
basic friends panel
lorenzo-ranciaffi Jan 9, 2025
e92850b
wip scrollview
lorenzo-ranciaffi Jan 9, 2025
29f77ee
added notification badge
lorenzo-ranciaffi Jan 9, 2025
70d9e38
added panel tabs
lorenzo-ranciaffi Jan 9, 2025
c70d1a3
Merge branch 'dev' into feat/friends/friends-panel-ui
lorenzo-ranciaffi Jan 10, 2025
db9e3fe
panel refactor
lorenzo-ranciaffi Jan 10, 2025
de04803
hide chat on panel show
lorenzo-ranciaffi Jan 10, 2025
945a719
wip blocked user prefab
lorenzo-ranciaffi Jan 10, 2025
9b431c8
blocked users wip
lorenzo-ranciaffi Jan 13, 2025
77f96a1
wip scroll view elements
lorenzo-ranciaffi Jan 13, 2025
91f51bf
wip sections
lorenzo-ranciaffi Jan 14, 2025
a704244
wip friend list panel
lorenzo-ranciaffi Jan 14, 2025
e9e5799
foldable sections in friend list
lorenzo-ranciaffi Jan 15, 2025
24f8aab
friend list user info
lorenzo-ranciaffi Jan 15, 2025
f81be48
identity change tweaks
lorenzo-ranciaffi Jan 15, 2025
cef499c
friend list main button opens passport
lorenzo-ranciaffi Jan 15, 2025
902826d
wip request section
lorenzo-ranciaffi Jan 15, 2025
21ac38b
moved request manager and controller logic to common class
lorenzo-ranciaffi Jan 16, 2025
c79f5a1
fix blockeduser prefab
lorenzo-ranciaffi Jan 16, 2025
9475252
moved actions to abstract methods + fix looplist logic + fix requests…
lorenzo-ranciaffi Jan 17, 2025
93eaa73
setup notification indicators
lorenzo-ranciaffi Jan 17, 2025
6c9a6e5
fix notification indicator
lorenzo-ranciaffi Jan 17, 2025
998fe13
customized friend and request objects
lorenzo-ranciaffi Jan 17, 2025
63c8dd2
wip blocked panel
lorenzo-ranciaffi Jan 17, 2025
7ae4ec5
Add friends notification texture. Update inspector configuration for …
RominaMarchetti Jan 17, 2025
63278b9
Add friends and common new icons
RominaMarchetti Jan 17, 2025
cc9dd0c
moved everything inside FriendsPlugin
lorenzo-ranciaffi Jan 20, 2025
272770c
Merge branch 'dev' into feat/friends/friends-panel-ui
lorenzo-ranciaffi Jan 20, 2025
349fd0b
generalized single collection stack
lorenzo-ranciaffi Jan 20, 2025
46830ad
friend list with no online/offline distinction
lorenzo-ranciaffi Jan 20, 2025
7283569
moved section notification indicator
lorenzo-ranciaffi Jan 20, 2025
c98f0cd
moved everything under /FriendPanel
lorenzo-ranciaffi Jan 20, 2025
103988f
changed attributes visibility
lorenzo-ranciaffi Jan 20, 2025
a28abc2
Merge branch 'dev' into feat/friends/friends-panel-ui
lorenzo-ranciaffi Jan 21, 2025
f5d2bb2
wip user profile generic context menu component
lorenzo-ranciaffi Jan 21, 2025
12d6814
Add friends and common new icons
RominaMarchetti Jan 17, 2025
daf1998
removed friends references
lorenzo-ranciaffi Jan 21, 2025
7b9bfc7
added prefab in global plugin
lorenzo-ranciaffi Jan 21, 2025
6684e6b
Merge branch 'feat/friends/user-profile-context-menu-control' into fe…
lorenzo-ranciaffi Jan 21, 2025
5858402
wip friend list context menui
lorenzo-ranciaffi Jan 21, 2025
d993c36
fix friend list context menu line separator control
lorenzo-ranciaffi Jan 21, 2025
227008c
fetch friends from service & fix cancellation token
lorux0 Jan 21, 2025
9b42353
fix user profile context menu component
lorenzo-ranciaffi Jan 21, 2025
c89faca
fix friend list context menu
lorenzo-ranciaffi Jan 22, 2025
a4ed716
moved friend list context menu config to scriptable object
lorenzo-ranciaffi Jan 22, 2025
570cf9e
prevent unhover on context menu
lorenzo-ranciaffi Jan 22, 2025
a7729f0
fix request panel
lorenzo-ranciaffi Jan 22, 2025
a6b9638
wip request context menu
lorenzo-ranciaffi Jan 22, 2025
fd49dfd
suggested changes
lorenzo-ranciaffi Jan 22, 2025
36797f6
fix claim badge separator width
lorenzo-ranciaffi Jan 21, 2025
00acc97
fix request notification badge
lorenzo-ranciaffi Jan 22, 2025
d372671
add wip loading objects on sections
lorenzo-ranciaffi Jan 22, 2025
c490fea
bridged request notification badge
lorenzo-ranciaffi Jan 22, 2025
8e88e59
fix loading image mask
lorenzo-ranciaffi Jan 22, 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
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 05e6ec17311e94dfbb4c3e08aaea0891
m_Address: FriendsPanel
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 0703f7736b8c9b244953ae7c6ff9a037
m_Address: LODSettings.asset
m_ReadOnly: 0
Expand Down Expand Up @@ -127,11 +132,6 @@ MonoBehaviour:
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 Down Expand Up @@ -432,6 +432,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: fe90941e720314adfb13574446732ea7
m_Address: UserProfile
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2}
m_SchemaSet:
Expand Down
3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/Chat/ChatView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ public void ToggleChat(bool isOn)
LoopList.gameObject.SetActive(isOn);
}

public bool IsChatVisible() =>
PanelBackgroundCanvasGroup.gameObject.activeSelf;

public void OnPointerEnter(PointerEventData eventData)
{
OnChatViewPointerEnter?.Invoke();
Expand Down
1 change: 1 addition & 0 deletions Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ public static class FeatureFlagsStrings
public const string VIDEO_PRIORITIZATION = "alfa-video-prioritization";

public const string CAMERA_REEL = "alfa-camera-reel";
public const string FRIENDS = "alfa-friends";
}
}
14 changes: 13 additions & 1 deletion Explorer/Assets/DCL/Friends/DCL.Friends.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,19 @@
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:5ab29fa8ae5769b49ab29e390caca7a4",
"GUID:ca4e81cdd6a34d1aa54c32ad41fc5b3b",
"GUID:3640f3c0b42946b0b8794a1ed8e06ca5"
"GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
"GUID:e9db755bba99425db4ca5d30e48b7429",
"GUID:7175400a68914a45acecc9fb068de3b8",
"GUID:702f733b4deb246808c6ce84d93b5c9c",
"GUID:45f6fff651a0a514f8edfdaf9cce45af",
"GUID:766b242fb43af451aaa331f39872177d",
"GUID:ae249ee11a6e0ea4aa01cefc0246a151",
"GUID:b97826ed91484ac1af953a8afc03316e",
"GUID:ba053ae967dabc94a811350e36a486f3",
"GUID:6055be8ebefd69e48b49212b09b47b2f",
"GUID:5462d37de7d4344df8aade58a45b403e",
"GUID:e169fa6683c924c7e99a85981a91d953",
"GUID:2f30d6e5229a74284acedda491abcc6e"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
8 changes: 8 additions & 0 deletions Explorer/Assets/DCL/Friends/Textures.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 127 additions & 0 deletions Explorer/Assets/DCL/Friends/Textures/EmptyBlockedUsersIcon.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/Friends/Textures/Friends off.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 127 additions & 0 deletions Explorer/Assets/DCL/Friends/Textures/Friends off.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Explorer/Assets/DCL/Friends/Textures/Friends on border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading