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

Open
wants to merge 208 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 198 commits
Commits
Show all changes
208 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
ce8c315
added automatic pagination in friend list
lorenzo-ranciaffi Jan 23, 2025
273c7b8
add friend to friend list on accepted request event
lorenzo-ranciaffi Jan 23, 2025
3fd78f4
manage profile pictures
lorenzo-ranciaffi Jan 23, 2025
4c6dfd6
added friend request prewarm + removed useless use of profileCache
lorenzo-ranciaffi Jan 23, 2025
78b26b4
updated latest protocol changes
lorux0 Jan 23, 2025
207ff46
add new events
lorux0 Jan 23, 2025
5dc5171
Merge branch 'refs/heads/dev' into feat/friends/protocol-updates
lorux0 Jan 23, 2025
5f1226c
Add friends icon animation textures
RominaMarchetti Jan 23, 2025
7492f44
fix compatibility issues with friend requests
lorux0 Jan 23, 2025
523f691
wip request events management
lorenzo-ranciaffi Jan 24, 2025
34c1b52
Merge branch 'dev' into feat/friends/friends-panel-ui
lorenzo-ranciaffi Jan 24, 2025
91d0524
open request panel
lorenzo-ranciaffi Jan 24, 2025
90527e3
removed background button
lorenzo-ranciaffi Jan 24, 2025
3b0baba
manage identity change
lorenzo-ranciaffi Jan 24, 2025
152e83b
added profile thumbnail caching
lorenzo-ranciaffi Jan 24, 2025
5762e14
fix test
lorux0 Jan 24, 2025
b3afaaf
added panel shortcuts
lorenzo-ranciaffi Jan 24, 2025
1a907f0
fix thread safe rpc connection
lorux0 Jan 24, 2025
dd7aa3d
sidebar friend button animation
lorenzo-ranciaffi Jan 27, 2025
9b8593b
friend list user and request height change
lorenzo-ranciaffi Jan 27, 2025
77c2bff
migrate friends panel to persistent UI
lorenzo-ranciaffi Jan 28, 2025
b784c52
Merge branch 'dev' into feat/friends/friends-panel-ui
lorenzo-ranciaffi Jan 28, 2025
9f1c8c1
Merge branch 'feat/friends/protocol-updates' into feat/friends/friend…
lorenzo-ranciaffi Jan 28, 2025
f81dd19
removed profile from generic context menu component
lorenzo-ranciaffi Jan 28, 2025
49eba62
moved from Profile to new object + fix Web3Address changes
lorenzo-ranciaffi Jan 28, 2025
290e3c2
fix fetch real data & add uniques only
lorux0 Jan 28, 2025
42ce9fa
Merge branch 'refs/heads/dev' into feat/friends/friends-panel-ui
lorux0 Jan 28, 2025
235eabf
hooked friend bus events
lorenzo-ranciaffi Jan 28, 2025
e8be2b8
Add envelope icon
RominaMarchetti Jan 28, 2025
c59cad3
wip - friend panel design aligned to figma
lorenzo-ranciaffi Jan 28, 2025
0cf1199
Polish Friend entries prefabs. Update Menu icon.
RominaMarchetti Jan 28, 2025
3a13b5e
Update EmptyEntry.prefab
RominaMarchetti Jan 28, 2025
40bdd7f
Update BlockedUser.prefab
RominaMarchetti Jan 28, 2025
f4d8bfa
Update pending entries and empty state
RominaMarchetti Jan 28, 2025
21e51ff
Polish loading view
RominaMarchetti Jan 28, 2025
c2101f8
Polish Friends panel. Update close button component.
RominaMarchetti Jan 28, 2025
3c3b3d1
Fix friends icon size jump into the animations
RominaMarchetti Jan 28, 2025
fe0b958
add friendship iteractions to passport
lorux0 Jan 28, 2025
df4bea0
update protocol
lorux0 Jan 28, 2025
c85cdbc
fixed scroll entries texts + RPC timestamps
lorenzo-ranciaffi Jan 29, 2025
9bd6aea
Increase quality to friends panel images
RominaMarchetti Jan 29, 2025
0083198
improved websocket handshake concurrency
lorux0 Jan 29, 2025
535041c
implement mutual friends on passport
lorux0 Jan 29, 2025
c22154d
fix mutual pagination param
lorux0 Jan 29, 2025
764f737
rename remove friend event
lorux0 Jan 29, 2025
2367e55
handle friend removal
lorenzo-ranciaffi Jan 29, 2025
be59119
fix fetch friend requests
lorux0 Jan 29, 2025
c24dcf0
fix requests pagination
lorenzo-ranciaffi Jan 29, 2025
5bd3e17
various fixes
lorenzo-ranciaffi Jan 29, 2025
96c4e08
fix removal of peer friendship
lorux0 Jan 29, 2025
7712c15
properly refresh list
lorenzo-ranciaffi Jan 30, 2025
2b4e2e1
context menu action and request buttons actions
lorenzo-ranciaffi Jan 30, 2025
f94c2e9
passport context menu
lorenzo-ranciaffi Jan 30, 2025
bb9eab7
Update hover color for StatusWrapper and UserEntry
RominaMarchetti Jan 30, 2025
c7f0c2f
fix missing request loading state
lorenzo-ranciaffi Jan 30, 2025
4e20448
Polish FriendRequestUser container
RominaMarchetti Jan 30, 2025
fc37fa7
Merge branch 'feat/friends/friends-panel-ui' of https://github.com/de…
RominaMarchetti Jan 30, 2025
8b8864f
add profile picture in context menus
lorenzo-ranciaffi Jan 30, 2025
b2fb85c
Merge branch 'feat/friends/friends-panel-ui' of github.com:decentrala…
lorenzo-ranciaffi Jan 30, 2025
32d2756
Revert "Merge branch 'feat/friends/friends-panel-ui' of https://githu…
RominaMarchetti Jan 30, 2025
b64ea71
Merge branch 'feat/friends/friends-panel-ui' of https://github.com/de…
RominaMarchetti Jan 30, 2025
b5af266
Revert "Polish FriendRequestUser container"
RominaMarchetti Jan 30, 2025
5c9770a
Polish user container for requests
RominaMarchetti Jan 30, 2025
2bfd68a
removed report function from context menus
lorenzo-ranciaffi Jan 30, 2025
e6c7026
PolishSendContainer
RominaMarchetti Jan 30, 2025
a04cbca
Merge branch 'feat/friends/friends-panel-ui' of https://github.com/de…
RominaMarchetti Jan 30, 2025
715d2b2
make thumbnail cache always return a sprite
lorenzo-ranciaffi Jan 30, 2025
3288365
Polish CancelContainer
RominaMarchetti Jan 30, 2025
8186331
wip - context menu user profile refactor
lorenzo-ranciaffi Jan 30, 2025
9a63cdd
Merge branch 'feat/friends/friends-panel-ui' of github.com:decentrala…
lorenzo-ranciaffi Jan 30, 2025
d61461f
Polish ReceivedContainer UI
RominaMarchetti Jan 30, 2025
100f0bb
Merge branch 'feat/friends/friends-panel-ui' of https://github.com/de…
RominaMarchetti Jan 30, 2025
973da85
Polish UI for request cancelled, rejected and accepted feedback
RominaMarchetti Jan 30, 2025
86052b0
Add animations to add link modal
RominaMarchetti Jan 30, 2025
255a5e2
Fix mutual friends masks
RominaMarchetti Jan 30, 2025
b7832a6
Polish passport friend button UI
RominaMarchetti Jan 30, 2025
20fed2a
Update copies
RominaMarchetti Jan 30, 2025
a62a1a2
reconnect rpc on logout & login
lorux0 Jan 30, 2025
b2ac1a5
add support to fetch user position by id
lorux0 Jan 30, 2025
ba98ee5
Decrease passport and add link modal overlay transparency
RominaMarchetti Jan 30, 2025
42879d4
refactor identity change with new cache event
lorenzo-ranciaffi Jan 31, 2025
4d44d29
fix copy info toasts
lorenzo-ranciaffi Jan 31, 2025
f16cc13
wip refactor userprofile context menu component buttons
lorenzo-ranciaffi Jan 31, 2025
36e8959
fix requests context menui
lorenzo-ranciaffi Jan 31, 2025
5130245
fix context menu interactions
lorenzo-ranciaffi Jan 31, 2025
3e048f7
Add rays and particles texture to friend request accepted
RominaMarchetti Jan 31, 2025
ace8733
Merge branch 'feat/friends/friends-panel-ui' of https://github.com/de…
RominaMarchetti Jan 31, 2025
d288f17
fix typo
lorenzo-ranciaffi Jan 31, 2025
c629ee3
fix passport & friend request converted to popup
lorux0 Jan 31, 2025
fa94c2c
revert passport soft mask
lorux0 Jan 31, 2025
c3e9fcc
fix friend request date format
lorux0 Jan 31, 2025
7aa59bb
minor date format refactor
lorux0 Jan 31, 2025
87dcbaa
hide user blocking behind feature flag
lorenzo-ranciaffi Jan 31, 2025
32548de
fix user hashtag on friend request
lorux0 Jan 31, 2025
4915354
fix cancel confirmation user representation
lorux0 Jan 31, 2025
7b1ed04
Update Passport section buttons
RominaMarchetti Jan 31, 2025
e613149
Fix photos panel, character and badges preview
RominaMarchetti Jan 31, 2025
6ec09c2
implement rays animation on friend request operation & rollback frien…
lorux0 Jan 31, 2025
564723a
refresh friendship status on passport when comeback from friend request
lorux0 Jan 31, 2025
3bfd92c
Mutual friends mascara moved to image asset as child
RominaMarchetti Jan 31, 2025
afec1e9
Merge branch 'feat/friends/friends-panel-ui' of https://github.com/de…
RominaMarchetti Jan 31, 2025
00928b5
avoid showing interactions from passport for our user
lorux0 Jan 31, 2025
6948741
Update EquippedItem_PassportField.prefab
RominaMarchetti Jan 31, 2025
f465301
Merge branch 'feat/friends/friends-panel-ui' of https://github.com/de…
RominaMarchetti Jan 31, 2025
434801e
Update photos section empty state copy
RominaMarchetti Jan 31, 2025
709f811
show/hide chat via bus
lorenzo-ranciaffi Feb 3, 2025
601004a
removed duplicated assembly reference
lorenzo-ranciaffi Feb 3, 2025
d97acba
fix async methods suffix
lorenzo-ranciaffi Feb 3, 2025
760875b
Merge branch 'refs/heads/dev' into feat/friends/friends-panel-ui
lorux0 Feb 3, 2025
52bb7c9
add online status logic
lorenzo-ranciaffi Feb 3, 2025
7a405ab
fix fast jump in button
lorenzo-ranciaffi Feb 3, 2025
4e31e7d
fix requests tab badge position
lorenzo-ranciaffi Feb 3, 2025
4f7a8c3
Merge branch 'feat/friends/friends-panel-ui' into feat/friends/friend…
lorenzo-ranciaffi Feb 3, 2025
537f30b
fix missing notifications (reverted web3 address comparison)
lorux0 Feb 3, 2025
737a4fd
fix reconnect rpc
lorux0 Feb 3, 2025
5234029
wip - notifications
lorenzo-ranciaffi Feb 4, 2025
6cd476d
fix reject friend request
lorux0 Feb 4, 2025
536454c
Merge branch 'feat/friends/friends-panel-ui' into feat/friends/friend…
lorenzo-ranciaffi Feb 4, 2025
9aea523
avoid friends notification parsing if flag is disabled
lorenzo-ranciaffi Feb 4, 2025
c22b071
add app arg for friend api url
lorux0 Feb 4, 2025
25351a5
fix request counter on user cancelling the request
lorux0 Feb 4, 2025
cda1ac0
added toast notifications
lorenzo-ranciaffi Feb 5, 2025
70ba825
Merge branch 'refs/heads/feat/friends/friends-panel-ui' into feat/fri…
lorux0 Feb 5, 2025
42c5641
Merge branch 'refs/heads/dev' into feat/friends/friends-panel-ui
lorux0 Feb 5, 2025
fa804e5
fix disconnect rpc on identity clear
lorux0 Feb 5, 2025
ccf8999
Merge branch 'refs/heads/feat/friends/friends-panel-ui' into feat/fri…
lorux0 Feb 5, 2025
a8bec32
add feature flag
lorux0 Feb 5, 2025
4a4c7bb
notifications menu entry
lorenzo-ranciaffi Feb 5, 2025
9dd7732
Merge branch 'refs/heads/feat/friends/friends-panel-ui-with-online-st…
lorux0 Feb 5, 2025
8d74cd7
align notification events models
lorenzo-ranciaffi Feb 5, 2025
393f484
add rpc prod url
lorux0 Feb 5, 2025
3e18aa3
keep streams open in case of errors
lorux0 Feb 5, 2025
96f9fc4
add comms-adapter program arg
lorux0 Feb 5, 2025
22fcdc4
fix user profile thumbnail render
lorenzo-ranciaffi Feb 6, 2025
5a4cc6d
untested - friend online status push notifications
lorenzo-ranciaffi Feb 6, 2025
20af603
implement passport context menu friendship operations
lorux0 Feb 6, 2025
a6ffd69
fix push notifications
lorenzo-ranciaffi Feb 6, 2025
f29c04c
fix friend list buttons on status update
lorenzo-ranciaffi Feb 6, 2025
205ff78
fix friend service crash
lorux0 Feb 6, 2025
3215feb
Merge branch 'refs/heads/dev' into feat/friends/friends-panel-ui
lorux0 Feb 6, 2025
68252db
fix jumpin coordinates
lorux0 Feb 6, 2025
7ff7413
fix nre on app quit
lorux0 Feb 6, 2025
eb08c45
moved from array to list to manage entry buttons
lorenzo-ranciaffi Feb 7, 2025
1d40b45
fix friends notification
lorenzo-ranciaffi Feb 7, 2025
9df6593
fix notification badge text size
lorenzo-ranciaffi Feb 7, 2025
466b633
fix notification name length problem
lorenzo-ranciaffi Feb 7, 2025
8d4978e
fix friend panel closure using the sidebar button
lorenzo-ranciaffi Feb 7, 2025
39b7807
fix broken chat messages after closing friend panel
lorenzo-ranciaffi Feb 7, 2025
17a0497
fix chat interactions on friend panel show
lorenzo-ranciaffi Feb 7, 2025
29d62e7
fix sorting
lorenzo-ranciaffi Feb 7, 2025
bc405f7
use of thumbnail cache on friend requests
lorux0 Feb 7, 2025
a6dfe50
stream reconnection attempts
lorux0 Feb 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@ private static string RawUrl(DecentralandUrl decentralandUrl) =>
DecentralandUrl.CameraReelImages => $"https://camera-reel-service.decentraland.{ENV}/api/images",
DecentralandUrl.CameraReelPlaces => $"https://camera-reel-service.decentraland.{ENV}/api/places",
DecentralandUrl.CameraReelLink => $"https://reels.decentraland.{ENV}",
// TODO: use the environment once the service is deployed to prod
DecentralandUrl.ApiFriends => "wss://rpc-social-service-ea.decentraland.zone",
// DecentralandUrl.ApiFriends => $"wss://rpc-social-service-ea.decentraland.{ENV}",
DecentralandUrl.ApiFriends => $"wss://rpc-social-service-ea.decentraland.{ENV}",
DecentralandUrl.AssetBundleRegistry => $"https://asset-bundle-registry.decentraland.{ENV}/entities/active",
_ => throw new ArgumentOutOfRangeException(nameof(decentralandUrl), decentralandUrl, null!)
};
Expand Down
3 changes: 2 additions & 1 deletion Explorer/Assets/DCL/Chat/Chat.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"GUID:875a5d5129614170bd769ed012c2eb3d",
"GUID:f4a0f40a2545482b8929d4c3c642f50a",
"GUID:ca4e81cdd6a34d1aa54c32ad41fc5b3b",
"GUID:54660b0fae444b4cbfdafa9d68108f04"
"GUID:54660b0fae444b4cbfdafa9d68108f04",
"GUID:977f79b5e6de8468d8967dfff5ca8128"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
12 changes: 11 additions & 1 deletion Explorer/Assets/DCL/Chat/ChatController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using DCL.Chat.History;
using DCL.Chat.MessageBus;
using DCL.Emoji;
using DCL.Friends.Chat.BusInterface;
using DCL.Input;
using DCL.Input.Component;
using DCL.Input.Systems;
Expand Down Expand Up @@ -83,7 +84,8 @@ public ChatController(
Entity playerEntity,
DCLInput dclInput,
IEventSystem eventSystem,
IInputBlock inputBlock
IInputBlock inputBlock,
IChatLifecycleBusController chatLifecycleBusController
) : base(viewFactory)
{
this.chatEntryConfiguration = chatEntryConfiguration;
Expand All @@ -102,7 +104,15 @@ IInputBlock inputBlock
this.eventSystem = eventSystem;
this.inputBlock = inputBlock;

chatLifecycleBusController.SubscribeToHideChatCommand(HideBusCommandReceived);

device = InputSystem.GetDevice<Mouse>();

}

private void HideBusCommandReceived()
{
HideViewAsync(CancellationToken.None).Forget();
}

protected override void OnViewInstantiated()
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

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

Loading
Loading