Skip to content
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
8 changes: 3 additions & 5 deletions Explorer/Assets/DCL/Chat/Assets/ChatInputBox.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@ MonoBehaviour:
unfocusedBackgroundColor: {r: 0, g: 0, b: 0, a: 0.57254905}
<emojiContainer>k__BackingField:
<emojiPanelConfiguration>k__BackingField: {fileID: 11400000, guid: 51646f2adc3264ba7bf9b4f90febbd22, type: 2}
<emojiButtonPrefab>k__BackingField: {fileID: 8273076807335735701, guid: 7d0a647adf3334ee1a142e7bf69f128d, type: 3}
<emojiSectionViewPrefab>k__BackingField: {fileID: 7843218067654608663, guid: d4552d3a2432742f58c63ba71bdfb50e, type: 3}
<emojiPanelButton>k__BackingField: {fileID: 2972067743100390441}
<emojiPanel>k__BackingField: {fileID: 1062488254353314167}
<addEmojiAudio>k__BackingField: {fileID: 11400000, guid: ab59a5b2a814f02419850961fc490805, type: 2}
Expand Down Expand Up @@ -913,12 +911,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
<Button>k__BackingField: {fileID: 597349649872649681}
<ButtonPressedAudio>k__BackingField: {fileID: 11400000, guid: cbbd6a003fc75e24da47c13feacd92c7, type: 2}
<ButtonHoverAudio>k__BackingField: {fileID: 11400000, guid: 59da234351971c0498a566fb811b0c36, type: 2}
<images>k__BackingField: []
<text>k__BackingField: {fileID: 0}
interactableColor: {r: 1, g: 1, b: 1, a: 1}
hoverColor: {r: 0.54, g: 0.54, b: 0.54, a: 1}
<ButtonPressedAudio>k__BackingField: {fileID: 11400000, guid: cbbd6a003fc75e24da47c13feacd92c7, type: 2}
<ButtonHoverAudio>k__BackingField: {fileID: 11400000, guid: 59da234351971c0498a566fb811b0c36, type: 2}
--- !u!114 &2972067743100390441
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1447,7 +1445,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 991013649414998303, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.x
value: -4.3
value: -4.299988
objectReference: {fileID: 0}
- target: {fileID: 1148349665517489320, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_Color.b
Expand Down
24 changes: 22 additions & 2 deletions Explorer/Assets/DCL/Chat/Assets/ChatPanelView.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -4217,7 +4217,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3333458601965653454, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3652976034242486792, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.x
Expand All @@ -4233,7 +4233,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3915152310419264944, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000022403627
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4554952564761011634, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.y
Expand Down Expand Up @@ -4267,6 +4267,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5737962977412364931, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -4299,6 +4315,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5808473069129717801, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6889008696447158811, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ public class ChatInputView : MonoBehaviour
public class EmojiContainer
{
[field: SerializeField] internal EmojiPanelConfigurationSO emojiPanelConfiguration { get; private set; }
[field: SerializeField] internal EmojiButton emojiButtonPrefab { get; private set; }
[field: SerializeField] internal EmojiSectionView emojiSectionViewPrefab { get; private set; }
[field: SerializeField] internal EmojiButtonView emojiPanelButton { get; private set; }
[field: SerializeField] internal EmojiPanelView emojiPanel { get; private set; }
[field: SerializeField] internal AudioClipConfig addEmojiAudio { get; private set; }
Expand Down
2 changes: 0 additions & 2 deletions Explorer/Assets/DCL/Chat/_Refactor/ChatPanelPresenter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ public ChatPanelPresenter(ChatPanelView view,
view.EmojiPanelView,
emojiContainer.emojiPanelConfiguration,
emojiMapping,
emojiContainer.emojiSectionViewPrefab,
emojiContainer.emojiButtonPrefab,
inputBlock);

reactionsConfig.Atlas.Initialize();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using DCL.Chat.ChatReactions.Configs;
using UnityEngine;
using UnityEngine.UI;
using Utility;

namespace DCL.Chat.ChatReactions.Views
{
Expand Down Expand Up @@ -56,6 +57,10 @@ private void OnDestroy()
listenersAttached = false;
}

private void HandleClicked() => Clicked?.Invoke(AtlasIndex);
private void HandleClicked()
{
Clicked?.Invoke(AtlasIndex);
selectButton.gameObject.DeselectIfSelected();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using DCL.UI;
using UnityEngine;
using UnityEngine.UI;
using Utility;

namespace DCL.Chat.ChatReactions.Views
{
Expand Down Expand Up @@ -47,6 +48,10 @@ private void OnDestroy()
addButton.onClick.RemoveListener(HandleAddClicked);
}

private void HandleAddClicked() => AddClicked?.Invoke();
private void HandleAddClicked()
{
AddClicked?.Invoke();
addButton.gameObject.DeselectIfSelected();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ public class AnnouncementCreationCardView : MonoBehaviour
[SerializeField] internal EmojiButtonView emojiButton = null!;
[SerializeField] internal EmojiPanelView emojiPanel = null!;
[SerializeField] internal EmojiPanelConfigurationSO emojiPanelConfiguration = null!;
[SerializeField] internal EmojiSectionView emojiSectionViewPrefab = null!;
[SerializeField] internal EmojiButton emojiButtonPrefab = null!;
[SerializeField] internal AudioClipConfig addEmojiAudio = null!;
[SerializeField] internal AudioClipConfig openEmojiPanelAudio = null!;
[SerializeField] internal InputSuggestionPanelView suggestionPanel = null!;
Expand Down Expand Up @@ -82,8 +80,6 @@ public void Configure(Profile? profile, ProfileRepositoryWrapper profileDataProv
emojiButton,
emojiPanel,
emojiPanelConfiguration,
emojiSectionViewPrefab,
emojiButtonPrefab,
addEmojiAudio,
openEmojiPanelAudio,
suggestionPanel,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ public AnnouncementEmojiController(
EmojiButtonView emojiButton,
EmojiPanelView emojiPanel,
EmojiPanelConfigurationSO emojiPanelConfiguration,
EmojiSectionView emojiSectionViewPrefab,
EmojiButton emojiButtonPrefab,
AudioClipConfig addEmojiAudio,
AudioClipConfig openEmojiPanelAudio,
InputSuggestionPanelView suggestionPanel,
Expand All @@ -65,9 +63,7 @@ public AnnouncementEmojiController(
emojiPanelPresenter = new EmojiPanelPresenter(
emojiPanel,
emojiPanelConfiguration,
emojiMapping,
emojiSectionViewPrefab,
emojiButtonPrefab
emojiMapping
);

suggestionPanelController = new InputSuggestionPanelController(suggestionPanel);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
<Button>k__BackingField: {fileID: 7131277802467687865}
<ButtonPressedAudio>k__BackingField: {fileID: 11400000, guid: cbbd6a003fc75e24da47c13feacd92c7, type: 2}
<ButtonHoverAudio>k__BackingField: {fileID: 11400000, guid: 59da234351971c0498a566fb811b0c36, type: 2}
<images>k__BackingField: []
<text>k__BackingField: {fileID: 0}
interactableColor: {r: 1, g: 1, b: 1, a: 1}
hoverColor: {r: 0.54, g: 0.54, b: 0.54, a: 1}
<ButtonPressedAudio>k__BackingField: {fileID: 11400000, guid: cbbd6a003fc75e24da47c13feacd92c7, type: 2}
<ButtonHoverAudio>k__BackingField: {fileID: 11400000, guid: 59da234351971c0498a566fb811b0c36, type: 2}
--- !u!114 &4017628168029410300
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -547,8 +547,6 @@ MonoBehaviour:
emojiButton: {fileID: 4017628168029410300}
emojiPanel: {fileID: 2788626263768453102}
emojiPanelConfiguration: {fileID: 11400000, guid: 51646f2adc3264ba7bf9b4f90febbd22, type: 2}
emojiSectionViewPrefab: {fileID: 7843218067654608663, guid: d4552d3a2432742f58c63ba71bdfb50e, type: 3}
emojiButtonPrefab: {fileID: 8273076807335735701, guid: 7d0a647adf3334ee1a142e7bf69f128d, type: 3}
addEmojiAudio: {fileID: 11400000, guid: ab59a5b2a814f02419850961fc490805, type: 2}
openEmojiPanelAudio: {fileID: 11400000, guid: abc438e2962540549b414d54fbc89eed, type: 2}
suggestionPanel: {fileID: 5416596297756989396}
Expand Down Expand Up @@ -1587,7 +1585,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 991013649414998303, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.x
value: -4.3
value: -4.299988
objectReference: {fileID: 0}
- target: {fileID: 1148349665517489320, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_Color.b
Expand Down Expand Up @@ -1651,7 +1649,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3333458601965653454, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3652976034242486792, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.x
Expand Down Expand Up @@ -1702,9 +1700,13 @@ PrefabInstance:
value: 0.9882353
objectReference: {fileID: 0}
- target: {fileID: 3915152310419264944, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_SizeDelta.y
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3915152310419264944, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.0009460449
objectReference: {fileID: 0}
- target: {fileID: 4229219484723640042, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_SizeDelta.x
value: -69.9325
Expand Down Expand Up @@ -1773,6 +1775,22 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320725859219097919, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5737962977412364931, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -1805,6 +1823,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5808473069129717801, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6808936257780205619, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_Colors.m_NormalColor.a
value: 0.15686275
Expand Down Expand Up @@ -1917,6 +1939,10 @@ PrefabInstance:
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8054556835567838397, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_Size
value: 0.9999416
objectReference: {fileID: 0}
- target: {fileID: 8287295318826585892, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_AnchorMax.x
value: 0
Expand All @@ -1937,10 +1963,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8309160911758153689, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_SizeDelta.x
value: 340
objectReference: {fileID: 0}
- target: {fileID: 8568280781661113243, guid: 543dff6efe38c4acb9118c149e6c6eca, type: 3}
propertyPath: m_Pivot.x
value: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2217,7 +2217,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0f85301a9211845c8b8d39b4a4b05762, type: 0}
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down
6 changes: 4 additions & 2 deletions Explorer/Assets/DCL/EmojiPanel/Asset/EmojiButton.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -239,6 +240,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -404,7 +406,7 @@ GameObject:
- component: {fileID: 3633068619696292472}
- component: {fileID: 8273076807335735701}
m_Layer: 5
m_Name: EmojiButton
m_Name: EmojiButton_V2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -493,7 +495,7 @@ MonoBehaviour:
m_NormalColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1}
m_HighlightedColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1}
m_PressedColor: {r: 0, g: 0, b: 0, a: 0}
m_SelectedColor: {r: 0.08627451, g: 0.08235294, b: 0.09411765, a: 1}
m_SelectedColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
Expand Down

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

Loading
Loading