moved actions to abstract methods + fix looplist logic + fix requests…

… panel

Explorer/Assets/DCL/Friends/UI/Sections/FriendPanelRequestManager.cs

@@ -18,9 +18,6 @@ public abstract class FriendPanelRequestManager<T> : IDisposable where T : Frien
         private readonly int emptyElementIndex;
         private readonly int userElementIndex;
 
-        private Action<T>? elementCustomizer;
-        private Func<int, Profile> firstCollectionAccessor;
-        private Func<int, Profile> secondCollectionAccessor;
         private int pageNumber = 0;
         private int totalFetched = 0;
 
@@ -53,20 +50,16 @@ protected FriendPanelRequestManager(IFriendsService friendsService,
             this.userElementIndex = userElementIndex;
         }
 
-        protected void SetElementCustomizer(Action<T> customizer) { elementCustomizer = customizer; }
-
-        protected void ConfigureAccessors(Func<int, Profile> firstAccessor,
-            Func<int, Profile> secondAccessor)
-        {
-            this.firstCollectionAccessor = firstAccessor;
-            this.secondCollectionAccessor = secondAccessor;
-        }
-
         public abstract void Dispose();
 
         protected abstract int GetFirstCollectionCount();
         protected abstract int GetSecondCollectionCount();
 
+        protected abstract Profile GetFirstCollectionElement(int index);
+        protected abstract Profile GetSecondCollectionElement(int index);
+
+        protected virtual void CustomiseElement(T element) { }
+
         public LoopListViewItem2 GetLoopListItemByIndex(LoopListView2 loopListView, int index)
         {
             LoopListViewItem2 listItem = null;
@@ -91,8 +84,8 @@ public LoopListViewItem2 GetLoopListItemByIndex(LoopListView2 loopListView, int
                 {
                     listItem = loopListView.NewListViewItem(loopListView.ItemPrefabDataList[userElementIndex].mItemPrefab.name);
                     T friendListUserView = listItem.GetComponent<T>();
-                    friendListUserView.Configure(firstCollectionAccessor(index - 1));
-                    elementCustomizer?.Invoke(friendListUserView);
+                    friendListUserView.Configure(GetFirstCollectionElement(index - 1));
+                    CustomiseElement(friendListUserView);
                     friendListUserView.RemoveMainButtonClickListeners();
                     friendListUserView.MainButtonClicked += profile => FriendElementClicked?.Invoke(profile);
                 }
@@ -113,8 +106,8 @@ public LoopListViewItem2 GetLoopListItemByIndex(LoopListView2 loopListView, int
                 {
                     listItem = loopListView.NewListViewItem(loopListView.ItemPrefabDataList[userElementIndex].mItemPrefab.name);
                     T friendListUserView = listItem.GetComponent<T>();
-                    friendListUserView.Configure(secondCollectionAccessor(index - onlineFriendMarker - 2));
-                    elementCustomizer?.Invoke(friendListUserView);
+                    friendListUserView.Configure(GetSecondCollectionElement(index - onlineFriendMarker - 2));
+                    CustomiseElement(friendListUserView);
                     friendListUserView.RemoveMainButtonClickListeners();
                     friendListUserView.MainButtonClicked += profile => FriendElementClicked?.Invoke(profile);
                 }

Explorer/Assets/DCL/Friends/UI/Sections/FriendPanelSectionController.cs

@@ -96,7 +96,6 @@ protected virtual async UniTaskVoid Init(CancellationToken ct)
             if (friendListPagedRequestManager.HasElements)
             {
                 view.LoopList.SetListItemCount(friendListPagedRequestManager.GetElementsNumber(), false);
-                view.LoopList.RefreshAllShownItem();
                 friendListPagedRequestManager.FirstFolderClicked += FolderClicked;
                 friendListPagedRequestManager.SecondFolderClicked += FolderClicked;
             }

Explorer/Assets/DCL/Friends/UI/Sections/Friends/FriendListPagedRequestManager.cs

@@ -15,40 +15,41 @@ public class FriendListPagedRequestManager : FriendPanelRequestManager<FriendLis
         private List<Profile> onlineFriends = new ();
         private List<Profile> offlineFriends = new ();
 
-        public event Action<Profile> JumpInClicked;
-        public event Action<Profile> ContextMenuClicked;
+        public event Action<Profile>? JumpInClicked;
+        public event Action<Profile>? ContextMenuClicked;
 
         public FriendListPagedRequestManager(IFriendsService friendsService,
             IFriendsEventBus friendEventBus,
             int pageSize) : base(friendsService, friendEventBus, pageSize, FriendPanelStatus.ONLINE, FriendPanelStatus.OFFLINE, STATUS_ELEMENT_INDEX, EMPTY_ELEMENT_INDEX, USER_ELEMENT_INDEX)
         {
-            ConfigureAccessors(GetOnlineProfile, GetOfflineProfile);
-            SetElementCustomizer(friendListUserView =>
-            {
-                friendListUserView.ContextMenuButton.onClick.RemoveAllListeners();
-                friendListUserView.ContextMenuButton.onClick.AddListener(() => ContextMenuClicked?.Invoke(friendListUserView.UserProfile));
-                friendListUserView.JumpInButton.onClick.RemoveAllListeners();
-                friendListUserView.JumpInButton.onClick.AddListener(() => JumpInClicked?.Invoke(friendListUserView.UserProfile));
-            });
-        }
-
-        private Profile GetOnlineProfile(int index) =>
-            onlineFriends[index];
 
-        private Profile GetOfflineProfile(int index) =>
-            offlineFriends[index];
+        }
 
         public override void Dispose()
         {
 
         }
 
+        protected override Profile GetFirstCollectionElement(int index) =>
+            onlineFriends[index];
+
+        protected override Profile GetSecondCollectionElement(int index) =>
+            offlineFriends[index];
+
         protected override int GetFirstCollectionCount() =>
             onlineFriends.Count;
 
         protected override int GetSecondCollectionCount() =>
             offlineFriends.Count;
 
+        protected override void CustomiseElement(FriendListUserView element)
+        {
+            element.ContextMenuButton.onClick.RemoveAllListeners();
+            element.ContextMenuButton.onClick.AddListener(() => ContextMenuClicked?.Invoke(element.UserProfile));
+            element.JumpInButton.onClick.RemoveAllListeners();
+            element.JumpInButton.onClick.AddListener(() => JumpInClicked?.Invoke(element.UserProfile));
+        }
+
         protected async override UniTask FetchInitialData(CancellationToken ct)
         {
             // PaginatedFriendsResult result = await friendsService.GetFriendsAsync(pageNumber, pageSize, ct);

Explorer/Assets/DCL/Friends/UI/Sections/Requests/RequestsRequestManager.cs

@@ -17,39 +17,39 @@ public class RequestsRequestManager : FriendPanelRequestManager<RequestUserView>
         private List<FriendRequest> receivedRequests = new ();
         private List<FriendRequest> sentRequests = new ();
 
-        public event Action<Profile> ContextMenuClicked;
+        public event Action<Profile>? ContextMenuClicked;
 
         public RequestsRequestManager(IFriendsService friendsService, IFriendsEventBus friendEventBus, int pageSize, IProfileCache profileCache)
-            : base(friendsService, friendEventBus, pageSize, FriendPanelStatus.ONLINE, FriendPanelStatus.OFFLINE, STATUS_ELEMENT_INDEX, EMPTY_ELEMENT_INDEX, USER_ELEMENT_INDEX)
+            : base(friendsService, friendEventBus, pageSize, FriendPanelStatus.RECEIVED, FriendPanelStatus.SENT, STATUS_ELEMENT_INDEX, EMPTY_ELEMENT_INDEX, USER_ELEMENT_INDEX)
         {
             this.profileCache = profileCache;
-            ConfigureAccessors(GetReceivedRequest, GetSentRequest);
-            SetElementCustomizer(requestUserView =>
-            {
-                requestUserView.ContextMenuButton.onClick.RemoveAllListeners();
-                requestUserView.ContextMenuButton.onClick.AddListener(() => ContextMenuClicked?.Invoke(requestUserView.UserProfile));
-                //TODO (Lorenzo): set the request date
-                // requestUserView.RequestDate = ???
-            });
         }
 
         public override void Dispose()
         {
-            throw new NotImplementedException();
-        }
-
-        private Profile GetReceivedRequest(int index) =>
-            profileCache.Get(receivedRequests[index].From);
 
-        private Profile GetSentRequest(int index) =>
-            profileCache.Get(sentRequests[index].To);
+        }
 
         protected override int GetFirstCollectionCount() =>
             receivedRequests.Count;
 
         protected override int GetSecondCollectionCount() =>
             sentRequests.Count;
 
+        protected override Profile GetFirstCollectionElement(int index) =>
+            profileCache.Get(receivedRequests[index].From);
+
+        protected override Profile GetSecondCollectionElement(int index) =>
+            profileCache.Get(sentRequests[index].To);
+
+        protected override void CustomiseElement(RequestUserView element)
+        {
+            element.ContextMenuButton.onClick.RemoveAllListeners();
+            element.ContextMenuButton.onClick.AddListener(() => ContextMenuClicked?.Invoke(element.UserProfile));
+            //TODO (Lorenzo): set the request date
+            // requestUserView.RequestDate = ???
+        }
+
         protected async override UniTask FetchInitialData(CancellationToken ct)
         {
 

Explorer/Assets/DCL/Friends/UI/Sections/Requests/RequestsSectionController.cs

@@ -40,9 +40,7 @@ protected override async UniTaskVoid Init(CancellationToken ct)
             friendListInitCts = friendListInitCts.SafeRestart();
             await friendListPagedRequestManager.Init(ct);
 
-            view.SetEmptyState(!friendListPagedRequestManager.HasElements);
             view.SetLoadingState(false);
-            view.SetScrollView(friendListPagedRequestManager.HasElements);
 
             view.LoopList.SetListItemCount(friendListPagedRequestManager.GetElementsNumber(), false);
             view.LoopList.RefreshAllShownItem();