Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
5f2615a
Migrated Explore Panel opening with shortcuts to its plugin, using ju…
fcolarich Nov 10, 2025
cf12017
Fixes to controllers and improvements to load properly as popups
fcolarich Nov 12, 2025
dd2c08c
Cleanup Notification and Controls panels
fcolarich Nov 13, 2025
f31734a
cleanup references appearance
fcolarich Nov 13, 2025
5128170
Added proper feature registry use for Marketplace credits + fixes to …
fcolarich Nov 13, 2025
a1fc0ba
temp - asmref and asmdef coalescence
fcolarich Nov 25, 2025
3f124f6
Revert "temp - asmref and asmdef coalescence"
fcolarich Nov 25, 2025
f819130
Revert "Added proper feature registry use for Marketplace credits + f…
fcolarich Nov 25, 2025
20662e9
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Nov 26, 2025
efc78d7
fixes after merge + extract controllers so they can be disposed
fcolarich Nov 26, 2025
43b69b9
Fix MVC registration + integrated smart wearables
fcolarich Nov 27, 2025
f640856
fixed settings + added sidebar blocking logic
fcolarich Nov 27, 2025
b16da18
Fixed profile menu controller opening form sidebar
fcolarich Nov 27, 2025
7810ebe
Streamlined Controller
fcolarich Nov 27, 2025
21b0ec1
Added controller to widget + fixed plugin settings
fcolarich Nov 27, 2025
3496f52
Refactored profile widget
fcolarich Dec 3, 2025
30a9a91
Refactored profile menu
fcolarich Dec 3, 2025
518800f
Fixed notifications panel canvas and layout
fcolarich Dec 4, 2025
5931ce3
Fixed sidebar settings button
fcolarich Dec 4, 2025
1396b11
Corrected Sidebar Buttons
fcolarich Dec 4, 2025
c2946bc
Fix help button
fcolarich Dec 4, 2025
21d9817
removed duplicated controller creation
fcolarich Dec 4, 2025
cd46ddf
A lot of tweaks to how hovering works on sidebar buttons
fcolarich Dec 4, 2025
d22bb69
A LOT of tweaks to sidebar buttons and logic
fcolarich Dec 5, 2025
d6a2f96
Changes of names + fixes on prefabs
fcolarich Dec 5, 2025
27665c3
Fixed some issues with Smart wearables button
fcolarich Dec 5, 2025
39d76ab
More tweaks to buttons and sidebar
fcolarich Dec 5, 2025
e3c8770
Replaced use of shared space for several menus with mvc use
fcolarich Dec 8, 2025
e723646
Many changes on how hotkeys are registered and used
fcolarich Dec 9, 2025
b3c3996
migrated hotkey logic into camera plugin
fcolarich Dec 9, 2025
ec04ae9
Added proper logic for explore panel opening using shortcuts
fcolarich Dec 9, 2025
5100d73
Friends Panel fixes
fcolarich Dec 10, 2025
8662574
Added logic to handle toggling the chat from the sidebar
fcolarich Dec 11, 2025
c5484e9
Added Chat toggle event - missing implementation
fcolarich Dec 18, 2025
cc45ed0
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Dec 25, 2025
d2a4c5e
Fixes after merge
fcolarich Dec 25, 2025
6fcae67
Merged asmdefs
fcolarich Dec 25, 2025
3d0c8d0
Integrated more asmdefs with refs
fcolarich Dec 25, 2025
37ceb93
Fixed issue with gifting reference
fcolarich Dec 25, 2025
6f1bc3f
added missing settings to global plugins
fcolarich Dec 25, 2025
bd1c13e
Fixed sidebar marketplace shortcut
fcolarich Dec 25, 2025
021475b
Cleanup of related classes!
fcolarich Dec 29, 2025
653959b
Removed sharedspaceManager references and replaced by calls to mvc ma…
fcolarich Dec 29, 2025
54694b6
Fixed Friends Panel opening/closing logic + cleanup
fcolarich Dec 30, 2025
eccdd8a
Cleanup + fixes for sidebar prefab + fixed several warnings
fcolarich Dec 31, 2025
8f0f4f3
Improvements to events + fixed logic when fullscreen is open
fcolarich Dec 31, 2025
93a256e
Removed Shared Space Manager files + cleanup on classes
fcolarich Dec 31, 2025
03468f3
Edited Sorting Layer Enum to use proper formatting
fcolarich Dec 31, 2025
8ecbc5a
Refactored ChatEventBus to use a pre-registered events pattern
fcolarich Jan 2, 2026
a6c8545
Fixes to chat logic when opening it from other views + cleanup of unu…
fcolarich Jan 2, 2026
70e226b
More cleanup and added missing unsubscribe on Dipose
fcolarich Jan 2, 2026
39cb0b4
Replaced use of FeaturesRegistry instead of direct FF validation
fcolarich Jan 2, 2026
ede1290
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 2, 2026
89fc5a4
Fixed merge issues
fcolarich Jan 2, 2026
0cdc912
more fixes after merge
fcolarich Jan 2, 2026
21ed88d
Fixed issue with panel position
fcolarich Jan 2, 2026
2dc3bf9
Improved Sidebarcontroller with better error handling and cancellatio…
fcolarich Jan 2, 2026
8cb7473
Fixed issue with cts not being used in communities card
fcolarich Jan 2, 2026
72ab73f
Fixed missing logic to highlight/restore buttons when opened through …
fcolarich Jan 2, 2026
014fc15
Fix for submit button closing chat but not sending message
fcolarich Jan 4, 2026
66fe752
Removed commented code
fcolarich Jan 6, 2026
5480d10
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 8, 2026
8a411f5
Fixed some issues post-merge
fcolarich Jan 8, 2026
731f1df
Change name from suggestion + some more cleanup of warnings in variou…
fcolarich Jan 8, 2026
6693e30
Applied suggestions from code reviews
fcolarich Jan 8, 2026
b8e414d
Fixed issue with shortcuts and popups
fcolarich Jan 10, 2026
c36c65d
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 10, 2026
429c47b
Fixes after merge
fcolarich Jan 10, 2026
6b4b46e
Added sorting to PluginsContainerEditor
fcolarich Jan 10, 2026
7ecf29f
Fixed issues after merge with new sidebar button
fcolarich Jan 10, 2026
b005f18
More cleanup, particularly of use of bool params to pass features ena…
fcolarich Jan 10, 2026
580b46b
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 19, 2026
680accb
Fix after merge
fcolarich Jan 19, 2026
49679c1
Fixed issue with opening popups
fcolarich Jan 20, 2026
44e1175
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 20, 2026
7fe7d35
Added try catch to CommunitiesBrowserController to avoid an exception
fcolarich Jan 22, 2026
f889537
added small tweaks to ensure popupcloser behaviour
fcolarich Jan 22, 2026
fab6d43
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 26, 2026
790755f
Fixed merge issues
fcolarich Jan 26, 2026
a10207c
Some randomly updated assets
fcolarich Jan 26, 2026
1dbb6c3
Remove null ref on closing
fcolarich Jan 28, 2026
fd23100
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 28, 2026
d14451a
Fixed issues after merge
fcolarich Jan 28, 2026
7e252d2
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 28, 2026
17f9766
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 29, 2026
c826d1d
Fixed popup closer size
fcolarich Jan 29, 2026
7673b18
Fixed missing sidebar button
fcolarich Jan 30, 2026
56f785e
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Jan 30, 2026
93a76e1
Fixes after merge with Events button etc.
fcolarich Jan 30, 2026
9649e70
Fixed issue with merge
fcolarich Jan 30, 2026
3ac302d
Fixed issue with merge
fcolarich Jan 30, 2026
78188e0
Added missing ref
fcolarich Feb 2, 2026
deb746c
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 2, 2026
a4e7cda
Added missing reference for button
fcolarich Feb 4, 2026
787db67
Fixed issue with condition for Marketplace Credits
fcolarich Feb 4, 2026
b320c54
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 5, 2026
98b94fa
Updated plugins
fcolarich Feb 6, 2026
0355263
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 6, 2026
f4a6fbe
Fix after merge
fcolarich Feb 7, 2026
2f81afe
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 9, 2026
7ee7281
Fixes after dev merge
fcolarich Feb 10, 2026
c8bff88
fixed issues after merge
fcolarich Feb 10, 2026
646a789
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 12, 2026
4f70813
Fixed issues after merge
fcolarich Feb 12, 2026
7a65214
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 12, 2026
e30c611
Fixed issues post-merge
fcolarich Feb 12, 2026
c84a8be
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 18, 2026
9880d1d
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 19, 2026
f8459dd
Fixed features registry + removed unused asmdef
fcolarich Feb 20, 2026
7aa4c3e
Update ChatTranslationSettingsController.cs
fcolarich Feb 20, 2026
64e8bae
Update FeaturesRegistry.cs
fcolarich Feb 27, 2026
77f4ff4
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Feb 27, 2026
9279751
Fixed issues post-merge
fcolarich Feb 27, 2026
a015ca3
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Mar 12, 2026
700941c
Code fixes after merge
fcolarich Mar 12, 2026
7269121
Merge branch 'dev' into feat/replace_shared_space_manager_phase_1
fcolarich Mar 16, 2026
f80324f
Fixed issues afeter merge
fcolarich Mar 16, 2026
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 @@ -10,7 +10,7 @@ namespace DCL.ApplicationBlocklistGuard
public class BlockedScreenController : ControllerBase<BlockedScreenView>
{
private readonly IWebBrowser webBrowser;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Overlay;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.OVERLAY;

public BlockedScreenController(ViewFactoryMethod viewFactory, IWebBrowser webBrowser) : base(viewFactory)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace DCL.ApplicationMinimumSpecsGuard
public class InsufficientDiskSpaceScreenController : ControllerBase<InsufficientDiskSpaceScreenView>
{

public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Overlay;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.OVERLAY;

public InsufficientDiskSpaceScreenController(ViewFactoryMethod viewFactory) : base(viewFactory) { }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class MinimumSpecsScreenController : ControllerBase<MinimumSpecsScreenVie
private readonly IWebBrowser webBrowser;
private readonly IAnalyticsController analytics;
private readonly IReadOnlyList<SpecResult> specResult;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Overlay;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.OVERLAY;
public readonly UniTaskCompletionSource HoldingTask;

private MinimumSpecsTablePresenter specsTablePresenter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class LauncherRedirectionScreenController : ControllerBase<LauncherRedire
private readonly string current;
private readonly string latest;

public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Overlay;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.OVERLAY;

public LauncherRedirectionScreenController(ApplicationVersionGuard.ApplicationVersionGuard versionGuard, ViewFactoryMethod viewFactory, string current, string latest) : base(viewFactory)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public enum AuthStatus
private UniTaskCompletionSource? lifeCycleTask;
private CancellationTokenSource? loginCancellationTokenSource;

public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Fullscreen;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.FULLSCREEN;
public ReactiveProperty<AuthStatus> CurrentState { get; } = new (AuthStatus.None);
public string CurrentRequestID { get; internal set; } = string.Empty;
public LoginMethod CurrentLoginMethod { get; internal set; }
Expand Down Expand Up @@ -126,6 +126,7 @@ public AuthenticationScreenController(
this.decentralandUrlsSource = decentralandUrlsSource;

possibleResolutions.AddRange(ResolutionUtils.GetAvailableResolutions());
fsm = new MVCStateMachine<AuthStateBase>();
}

public override void Dispose()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,25 @@
"GUID:4725c02394ab4ce19f889e4e8001f989",
"GUID:e0eedfa2deb9406daf86fd8368728e39",
"GUID:275e22790c04e9b47a5085d7b0c4432a",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:45fc0f02fe4e57c4a93a421d8f6f53df",
"GUID:6830e2f56251b492e9934f1fafbc8c7d",
"GUID:d832748739a186646b8656bdbd447ad0",
"GUID:e169fa6683c924c7e99a85981a91d953",
"GUID:0401f68d61b24c63a3abf51e27bb46f1",
"GUID:0b3eab7834a09c24ca4e84fe0d8a43ce",
"GUID:5eabe9a3d4dd19d42a16208ea5411062",
"GUID:543b8f091a5947a3880b7f2bca2358bd",
"GUID:d605e90bf5403438488dab77b4043585",
"GUID:ac3295688c7c22745a96e6ac34718181",
"GUID:8614faad1014549c88b57654b0fb41bd",
"GUID:1d75b3d8691c845b1a51082e81433dfc",
"GUID:4794e238ed0f65142a4aea5848b513e5",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:6830e2f56251b492e9934f1fafbc8c7d",
"GUID:d832748739a186646b8656bdbd447ad0",
"GUID:e169fa6683c924c7e99a85981a91d953",
"GUID:0b3eab7834a09c24ca4e84fe0d8a43ce",
"GUID:5eabe9a3d4dd19d42a16208ea5411062",
"GUID:54d33bbd50a28174e8ba0110106203c2",
"GUID:d28a7e4beeca475418c15757abf1b6f1",
"GUID:4794e238ed0f65142a4aea5848b513e5",
"GUID:8baf705856414dad9a73b3f382f1bc8b",
"GUID:d0fdd32139c48634e9a421636d17ce04",
"GUID:6da682aafc9e2724594f4e4bf9cc2550",
"GUID:e25ef972de004615a22937e739de2def"
"GUID:e25ef972de004615a22937e739de2def",
"GUID:6da682aafc9e2724594f4e4bf9cc2550"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "Wearables",
"rootNamespace": "",
"references": [
"GUID:8322ea9340a544c59ddc56d4793eac74",
"GUID:543b8f091a5947a3880b7f2bca2358bd",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:9e314663ce958b746873cb22d57ede55",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public class AvatarController : ISection, IDisposable
private readonly URLParameter marketplaceSourceParam = new ("utm_source", "backpack");

public AvatarController(AvatarView view,
FeatureFlagsConfiguration featureFlags,
IWebBrowser webBrowser,
AvatarSlotView[] slotViews,
NftTypeIconSO rarityBackgrounds,
Expand Down Expand Up @@ -66,7 +65,7 @@ public AvatarController(AvatarView view,
outfitsPresenter,
(RectTransform) view.transform);

bool isOutfitsEnabled = featureFlags.IsEnabled(FeatureFlagsStrings.OUTFITS_ENABLED);
bool isOutfitsEnabled = FeaturesRegistry.Instance.IsEnabled(FeatureId.BACKPACK_OUTFITS);
if (!isOutfitsEnabled)
tabsManager.SetTabEnabled(AvatarSubSection.Outfits, false);

Expand Down
4 changes: 2 additions & 2 deletions Explorer/Assets/DCL/Backpack/Backpack.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"GUID:e0eedfa2deb9406daf86fd8368728e39",
"GUID:d28a7e4beeca475418c15757abf1b6f1",
"GUID:ba053ae967dabc94a811350e36a486f3",
"GUID:8614faad1014549c88b57654b0fb41bd"
],
"GUID:8614faad1014549c88b57654b0fb41bd",
"GUID:1d75b3d8691c845b1a51082e81433dfc"],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
Expand Down
4 changes: 0 additions & 4 deletions Explorer/Assets/DCL/Backpack/BackpackController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,13 @@
using DCL.Backpack.EmotesSection;
using DCL.Browser;
using DCL.CharacterPreview;
using DCL.FeatureFlags;
using DCL.Input;
using DCL.Multiplayer.Connections.DecentralandUrls;
using DCL.Profiles;
using DCL.Profiles.Self;
using DCL.UI;
using DCL.WebRequests;
using ECS;
using ECS.StreamableLoading.Common;
using Runtime.Wearables;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -66,7 +64,6 @@ public class BackpackController : ISection, IDisposable

public BackpackController(
BackpackView view,
FeatureFlagsConfiguration featureFlags,
ISelfProfile selfProfile,
IWebBrowser webBrowser,
AvatarView avatarView,
Expand Down Expand Up @@ -154,7 +151,6 @@ public BackpackController(

avatarController = new AvatarController(
avatarView,
featureFlags,
webBrowser,
avatarSlotViews,
rarityInfoPanelBackgrounds,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"reference": "GUID:f56000518aba31544aa96f4739e50a64"
}

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

Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
using DCL.Backpack.Gifting.Services.GiftItemLoader;
using DCL.Backpack.Gifting.Styling;
using DCL.Diagnostics;
using DCL.ExplorePanel;
using DCL.NotificationsBus.NotificationTypes;
using DCL.Profiles;
using DCL.UI;
using DCL.UI.SharedSpaceManager;
using MVC;
using UnityEngine;
using Utility;
Expand All @@ -17,15 +17,15 @@ namespace DCL.Backpack.Gifting.Notifications
{
public class GiftReceivedPopupController : ControllerBase<GiftReceivedPopupView, GiftReceivedNotification>
{
public const string UnknownItemName = "Unknown Item";
private const string UNKNOWN_ITEM_NAME = "Unknown Item";

private readonly IProfileRepository profileRepository;
private readonly WearableStylingCatalog? wearableCatalog;
private readonly ImageControllerProvider imageControllerProvider;
private readonly ISharedSpaceManager sharedSpaceManager;
private readonly IGiftItemLoaderService giftItemLoaderService;
private readonly IMVCManager mvcManager;

public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Popup;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.POPUP;

private ImageController imageController;
private CancellationTokenSource? lifeCts;
Expand All @@ -36,14 +36,14 @@ public GiftReceivedPopupController(
IGiftItemLoaderService giftItemLoaderService,
WearableStylingCatalog wearableCatalog,
ImageControllerProvider imageControllerProvider,
ISharedSpaceManager sharedSpaceManager)
IMVCManager mvcManager)
: base(viewFactory)
{
this.profileRepository = profileRepository;
this.giftItemLoaderService = giftItemLoaderService;
this.wearableCatalog = wearableCatalog;
this.mvcManager = mvcManager;
this.imageControllerProvider = imageControllerProvider;
this.sharedSpaceManager = sharedSpaceManager;
}

protected override void OnViewInstantiated()
Expand All @@ -57,11 +57,11 @@ protected override void OnViewShow()
viewInstance!.SubTitleText.text = GiftingTextIds.GiftOpenedTitle;
viewInstance.ItemNameText.text = GiftingTextIds.GiftLoading;
viewInstance.GiftItemView.SetLoading();

lifeCts = new CancellationTokenSource();

imageController.SpriteLoaded += OnImageLoaded;

LoadFullDataAsync(inputData, lifeCts.Token)
.Forget();

Expand Down Expand Up @@ -120,7 +120,7 @@ private async UniTask LoadFullDataAsync(GiftReceivedNotification notification, C
}
else
{
viewInstance!.ItemNameText.text = UnknownItemName;
viewInstance!.ItemNameText.text = UNKNOWN_ITEM_NAME;
viewInstance.GiftItemView.SetLoadedState();
}
}
Expand All @@ -133,10 +133,10 @@ private async UniTask LoadFullDataAsync(GiftReceivedNotification notification, C
ReportHub.LogException(e, ReportCategory.GIFTING);
if (viewInstance == null) return;

viewInstance.ItemNameText.text = UnknownItemName;
viewInstance.ItemNameText.text = UNKNOWN_ITEM_NAME;
viewInstance.GiftItemView.SetLoadedState();
}

}

private void OnImageLoaded(Sprite sprite)
Expand Down Expand Up @@ -175,10 +175,10 @@ protected override async UniTask WaitForCloseIntentAsync(CancellationToken ct)
UniTask.WhenAny(closeBtn, backpackBtn, bgBtn);

if (result == 1)
await sharedSpaceManager.OpenBackpackAsync();
mvcManager.ShowAndForget(ExplorePanelController.IssueCommand(new ExplorePanelParameter(ExploreSections.Backpack, BackpackSections.Emotes)), ct);

await PlayHideAnimationAsync(CancellationToken.None);
lifeCts.SafeCancelAndDispose();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,21 @@ namespace DCL.Backpack.Gifting.Notifications
public class GiftReceivedPopupView : ViewBase, IView
{
[field: Header("Canvas Group")]
[field: SerializeField] public CanvasGroup MainCanvasGroup { get; private set; }

[field: Header("Labels")]
[field: SerializeField] public TMP_Text SubTitleText { get; private set; }
[field: SerializeField] public CanvasGroup MainCanvasGroup { get; private set; } = null!;

[field: SerializeField] public TMP_Text TitleText { get; private set; }
[field: SerializeField] public TMP_Text ItemNameText { get; private set; }
[field: Header("Labels")]
[field: SerializeField] public TMP_Text SubTitleText { get; private set; } = null!;
[field: SerializeField] public TMP_Text TitleText { get; private set; } = null!;
[field: SerializeField] public TMP_Text ItemNameText { get; private set; } = null!;

[field: Header("Item Container")]
[field: SerializeField] public GiftOpenedItemView GiftItemView { get; private set; }
[field: SerializeField] public GiftOpenedItemView GiftItemView { get; private set; } = null!;

[field: Header("Buttons")]
[field: SerializeField] public Button OpenBackpackButton { get; private set; }

[field: SerializeField] public Button CloseButton { get; private set; }
[field: SerializeField] public Button BackgroundOverlayButton { get; private set; }

[field: SerializeField]
public GiftTransferBackgroundAnimation BackgroundRaysAnimation { get; private set; }

[field: SerializeField]
public AudioClipConfig Sound { get; set; }
[field: SerializeField] public Button OpenBackpackButton { get; private set; } = null!;
[field: SerializeField] public Button CloseButton { get; private set; } = null!;
[field: SerializeField] public Button BackgroundOverlayButton { get; private set; } = null!;
[field: SerializeField] public GiftTransferBackgroundAnimation BackgroundRaysAnimation { get; private set; } = null!;
[field: SerializeField] public AudioClipConfig Sound { get; set; } = null!;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class GiftSelectionController : ControllerBase<GiftingView, GiftSelection
private const string CouldNotFindTokenForUrnLog = "Could not find a valid tokenId for URN {0}. Aborting gift transfer.";
private const string DefaultGiftItemName = "Item";

public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Popup;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.POPUP;

private readonly IProfileRepository profileRepository;
private readonly GiftSelectionComponentFactory componentFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using DCL.Input.Component;
using DCL.Profiles;
using DCL.UI.ProfileElements;
using DCL.UI.Profiles.Helpers;
using DCL.Utilities;
using UnityEngine;
using Utility;
Expand All @@ -30,7 +29,7 @@ public class GiftingHeaderPresenter : IDisposable

private readonly GiftingHeaderView view;
private readonly IProfileRepository profileRepository;
private readonly UserWalletAddressElementController walletAddressController;
private readonly UserWalletAddressElementPresenter walletAddressController;
private readonly IInputBlock inputBlock;

private readonly ReactiveProperty<ProfileThumbnailViewModel> profileThumbnail =
Expand All @@ -52,7 +51,7 @@ public GiftingHeaderPresenter(GiftingHeaderView view,
this.profileRepository = profileRepository;
this.inputBlock = inputBlock;

walletAddressController = new UserWalletAddressElementController(view.UserProfileWallet);
walletAddressController = new UserWalletAddressElementPresenter(view.UserProfileWallet);

view.UserProfileImage.Bind(profileThumbnail);
view.SearchBar.inputField.onSelect.AddListener(DisableInputs);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public sealed class GiftTransferController
{
private static readonly TimeSpan LONG_RUNNING_HINT_DELAY = TimeSpan.FromSeconds(10);

public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Popup;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.POPUP;

private enum State { Waiting, Success, Failed }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace DCL.Backpack.Gifting.Presenters
public sealed class GiftTransferSuccessController
: ControllerBase<GiftTransferSuccessView, GiftTransferSuccessParams>
{
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Popup;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.POPUP;

private CancellationTokenSource? lifeCts;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace DCL.ChangeRealmPrompt
{
public partial class ChangeRealmPromptController : ControllerBase<ChangeRealmPromptView, ChangeRealmPromptController.Params>
{
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Popup;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.POPUP;

private readonly ICursor cursor;
private readonly Action<string> changeRealmCallback;
Expand Down
1 change: 0 additions & 1 deletion Explorer/Assets/DCL/Chat/ChatEntryView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System;
using System.Globalization;
using DCL.Chat.ChatViewModels;
using DCL.FeatureFlags;
using DCL.Translation;
using DCL.Utilities;
using MVC;
Expand Down
Loading
Loading