feat: [Re-Discover] Polishing

Explorer/Assets/DCL/Events/EventCardBigView.cs

@@ -3,7 +3,6 @@
 using DCL.EventsApi;
 using DCL.PlacesAPIService;
 using DCL.Profiles;
-using DCL.UI;
 using DCL.UI.Profiles.Helpers;
 using DG.Tweening;
 using System.Collections.Generic;

Explorer/Assets/DCL/Events/EventCardView.cs

@@ -65,6 +65,7 @@ public struct FriendsConnectedThumbnail
             {
                 public GameObject root;
                 public ProfilePictureView picture;
+                public HoverableTooltip tooltip;
             }
         }
 
@@ -187,6 +188,7 @@ public virtual void Configure(EventDTO eventInfo, ThumbnailLoader thumbnailLoade
                         if (!friendExists) continue;
                         Profile.CompactInfo friendInfo = friends[i];
                         friendsThumbnails[i].picture.Setup(profileRepositoryWrapper!, friendInfo);
+                        friendsThumbnails[i].tooltip.Configure(friendInfo.Name);
                     }
                 }
             }

Explorer/Assets/DCL/Events/EventsByDayController.cs

@@ -131,7 +131,7 @@ private async UniTask LoadEventsAsync(DateTime fromDate, CancellationToken ct)
                     placesIds.Add(eventInfo.place_id);
             }
 
-            Result<PlacesData.IPlacesAPIResponse> placesResponse = await placesAPIService.GetPlacesByIdsAsync(placesIds, ct)
+            Result<PlacesData.IPlacesAPIResponse> placesResponse = await placesAPIService.GetDestinationsByIdsAsync(placesIds, ct)
                                                                                          .SuppressToResultAsync(ReportCategory.COMMUNITIES);
 
             if (placesResponse.Success)

Explorer/Assets/DCL/Events/EventsCalendarController.cs

@@ -22,6 +22,7 @@ public class EventsCalendarController : IDisposable
     {
         public event Action<EventDTO>? EventCardClicked;
 
+        private const string GET_LIVE_EVENTS_ERROR_MESSAGE = "There was an error loading live events. Please try again.";
         private const string GET_EVENTS_ERROR_MESSAGE = "There was an error loading events. Please try again.";
 
         private readonly EventsCalendarView view;
@@ -188,7 +189,7 @@ private async UniTask CheckHighlightedBannerAsync(DateTime fromDate, Cancellatio
                         placesIds.Add(eventInfo.place_id);
                 }
 
-                Result<PlacesData.IPlacesAPIResponse> placesResponse = await placesAPIService.GetPlacesByIdsAsync(placesIds, ct)
+                Result<PlacesData.IPlacesAPIResponse> placesResponse = await placesAPIService.GetDestinationsByIdsAsync(placesIds, ct)
                                                                                              .SuppressToResultAsync(ReportCategory.COMMUNITIES);
 
                 if (placesResponse.Success)
@@ -204,6 +205,18 @@ private async UniTask LoadEventsAsync(DateTime fromDate, int numberOfDays, Cance
             view.ClearAllEvents();
             view.SetAsLoading(true);
 
+            Result<IReadOnlyList<EventDTO>> liveEventsResults = await eventsApiService.GetEventsAsync(ct, onlyLiveEvents: true)
+                                                                                      .SuppressToResultAsync(ReportCategory.EVENTS);
+
+            if (ct.IsCancellationRequested)
+                return;
+
+            if (!liveEventsResults.Success)
+            {
+                NotificationsBusController.Instance.AddNotification(new ServerErrorNotification(GET_LIVE_EVENTS_ERROR_MESSAGE));
+                return;
+            }
+
             var fromDateUtc = fromDate.AddDays(-1).ToUniversalTime();
             var toDateUtc = fromDate.AddDays(numberOfDays).AddSeconds(-1).ToUniversalTime();
             Result<IReadOnlyList<EventDTO>> eventsResult = await eventsApiService.GetEventsByDateRangeAsync(fromDateUtc, toDateUtc, true, ct)
@@ -218,27 +231,45 @@ private async UniTask LoadEventsAsync(DateTime fromDate, int numberOfDays, Cance
                 return;
             }
 
+            List<EventDTO> eventsList = new ();
+            if (fromDate.Date == DateTime.Today)
+            {
+                // In case we have live events prior to today, they have to be also shown on the calendar, so we add them into the current results
+                foreach (EventDTO liveEventInfo in liveEventsResults.Value)
+                {
+                    DateTime eventLocalDate = DateTimeOffset.Parse(liveEventInfo.next_start_at).ToLocalTime().DateTime;
+                    if (eventLocalDate.Date < fromDate)
+                        eventsList.Add(liveEventInfo);
+                }
+            }
+            foreach (EventDTO eventInfo in eventsResult.Value)
+            {
+                DateTime eventLocalDate = DateTimeOffset.Parse(eventInfo.next_start_at).ToLocalTime().DateTime;
+                if (eventLocalDate.Date >= fromDate)
+                    eventsList.Add(eventInfo);
+            }
 
             using PoolExtensions.Scope<List<List<EventDTO>>> eventsGroupedByDay = EVENTS_GROUPED_BY_DAY_POOL.AutoScope();
             for (var i = 0; i < numberOfDays; i++)
                 eventsGroupedByDay.Value.Add(new List<EventDTO>());
 
-            if (eventsResult.Value.Count > 0)
+            if (eventsList.Count > 0)
             {
-                eventsStateService.AddEvents(eventsResult.Value);
+                eventsStateService.AddEvents(eventsList);
 
                 List<string> placesIds = new ();
-                foreach (EventDTO eventInfo in eventsResult.Value)
+                List<EventDTO> liveEventsPriorToToday = new ();
+                foreach (EventDTO eventInfo in eventsList)
                 {
                     DateTime eventLocalDate = DateTimeOffset.Parse(eventInfo.next_start_at).ToLocalTime().DateTime;
 
                     for (var i = 0; i < numberOfDays; i++)
                     {
-                        // Live events are always shown on the calendar
+                        // Live events prior to today have to be also shown on the calendar
                         bool isTodayColumn = i == 0;
-                        if (eventInfo.live && fromDate.Date == DateTime.Today && isTodayColumn)
+                        if (eventInfo.live && fromDate.Date == DateTime.Today && isTodayColumn && eventLocalDate.Date < fromDate)
                         {
-                            eventsGroupedByDay.Value[i].Add(eventInfo);
+                            liveEventsPriorToToday.Add(eventInfo);
                             break;
                         }
 
@@ -253,7 +284,21 @@ private async UniTask LoadEventsAsync(DateTime fromDate, int numberOfDays, Cance
                         placesIds.Add(eventInfo.place_id);
                 }
 
-                Result<PlacesData.IPlacesAPIResponse> placesResponse = await placesAPIService.GetPlacesByIdsAsync(placesIds, ct)
+                // Live events prior to today have to be placed after the today's live events
+                if (liveEventsPriorToToday.Count > 0)
+                {
+                    var todayLiveEventsCount = 0;
+                    foreach (EventDTO eventInfo in eventsGroupedByDay.Value[0])
+                    {
+                        if (eventInfo.live)
+                            todayLiveEventsCount++;
+                    }
+
+                    foreach (EventDTO liveEventInfo in liveEventsPriorToToday)
+                        eventsGroupedByDay.Value[0].Insert(todayLiveEventsCount++, liveEventInfo);
+                }
+
+                Result<PlacesData.IPlacesAPIResponse> placesResponse = await placesAPIService.GetDestinationsByIdsAsync(placesIds, ct)
                                                                                              .SuppressToResultAsync(ReportCategory.COMMUNITIES);
 
                 if (placesResponse.Success)

Explorer/Assets/DCL/Events/EventsCalendarView.cs

@@ -49,9 +49,12 @@ private struct EventListConfiguration
             public HoverableUiElement hoverableUiElement;
             public CanvasGroup scrollBarCanvasGroup;
             public SkeletonLoadingView skeletonLoadingView;
+            public GameObject moreEventsArrow;
+            public ScrollRect scrollRect;
         }
 
         private readonly Dictionary<int, List<string>> currentEventsIds = new ();
+        private readonly Dictionary<int, float> currentOccupancies = new (5);
         private DateTime currentFromDate;
         private int currentNumberOfDaysShowed;
         private EventsStateService eventsStateService = null!;
@@ -65,6 +68,13 @@ private void Awake()
 
             foreach (EventsDaySelectorButton daySelectorButton in daySelectorButtons)
                 daySelectorButton.ButtonClicked += OnDaySelectorButtonClicked;
+
+            for (var i = 0; i < eventsLists.Count; i++)
+            {
+                int eventsListIndex = i;
+                EventListConfiguration eventListConfiguration = eventsLists[eventsListIndex];
+                eventListConfiguration.scrollRect.onValueChanged.AddListener(_ => OnEventsScrollValueChanged(eventsListIndex));
+            }
         }
 
         private void OnDestroy()
@@ -74,6 +84,9 @@ private void OnDestroy()
 
             foreach (EventsDaySelectorButton daySelectorButton in daySelectorButtons)
                 daySelectorButton.ButtonClicked -= OnDaySelectorButtonClicked;
+
+            foreach (EventListConfiguration eventListConfiguration in eventsLists)
+                eventListConfiguration.scrollRect.onValueChanged.RemoveAllListeners();
         }
 
         public void SetDependencies(
@@ -243,6 +256,8 @@ private void FillWithEmptyCards(IReadOnlyList<EventDTO> events, int eventsListIn
                 }
             }
 
+            currentOccupancies[eventsListIndex] = columnOccupancyValue;
+
             int numberOfEmptyCards = columnOccupancyValue switch
                                      {
                                          <= 0.5f => 3,
@@ -254,6 +269,12 @@ private void FillWithEmptyCards(IReadOnlyList<EventDTO> events, int eventsListIn
                 currentEventsIds[eventsListIndex].Add(string.Empty);
         }
 
+        private void OnEventsScrollValueChanged(int eventsListIndex)
+        {
+            bool scrollIsNotAtTheBottom = eventsLists[eventsListIndex].scrollRect.verticalNormalizedPosition > 0.01f && currentOccupancies[eventsListIndex] > 1.5f;
+            eventsLists[eventsListIndex].moreEventsArrow.SetActive(scrollIsNotAtTheBottom);
+        }
+
         private void OnDaySelectorButtonClicked(DateTime date) =>
             DaySelectorButtonClicked?.Invoke(date);