Commit c010ef24 authored by Gerard Gascón's avatar Gerard Gascón
Browse files

feature: Added remove last emoji ability

parent df2fa8ae

Assets/Scenes/Main.unity

+281 −0
Original line number Diff line number Diff line
@@ -239,6 +239,140 @@ RectTransform: 
  m_AnchoredPosition: {x: 0, y: 0}

  m_SizeDelta: {x: 0, y: 0}

  m_Pivot: {x: 0, y: 0}

--- !u!1 &468556174

GameObject:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  serializedVersion: 6

  m_Component:

  - component: {fileID: 468556175}

  - component: {fileID: 468556177}

  - component: {fileID: 468556176}

  m_Layer: 5

  m_Name: Text (TMP)

  m_TagString: Untagged

  m_Icon: {fileID: 0}

  m_NavMeshLayer: 0

  m_StaticEditorFlags: 0

  m_IsActive: 1

--- !u!224 &468556175

RectTransform:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 468556174}

  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}

  m_LocalPosition: {x: 0, y: 0, z: 0}

  m_LocalScale: {x: 1, y: 1, z: 1}

  m_ConstrainProportionsScale: 0

  m_Children: []

  m_Father: {fileID: 1060367307}

  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

  m_AnchorMin: {x: 0, y: 0}

  m_AnchorMax: {x: 1, y: 1}

  m_AnchoredPosition: {x: 0, y: 0}

  m_SizeDelta: {x: 0, y: 0}

  m_Pivot: {x: 0.5, y: 0.5}

--- !u!114 &468556176

MonoBehaviour:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 468556174}

  m_Enabled: 1

  m_EditorHideFlags: 0

  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

  m_Material: {fileID: 0}

  m_Color: {r: 1, g: 1, b: 1, a: 1}

  m_RaycastTarget: 1

  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}

  m_Maskable: 1

  m_OnCullStateChanged:

    m_PersistentCalls:

      m_Calls: []

  m_text: Undo

  m_isRightToLeft: 0

  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

  m_fontSharedMaterials: []

  m_fontMaterial: {fileID: 0}

  m_fontMaterials: []

  m_fontColor32:

    serializedVersion: 2

    rgba: 4281479730

  m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}

  m_enableVertexGradient: 0

  m_colorMode: 3

  m_fontColorGradient:

    topLeft: {r: 1, g: 1, b: 1, a: 1}

    topRight: {r: 1, g: 1, b: 1, a: 1}

    bottomLeft: {r: 1, g: 1, b: 1, a: 1}

    bottomRight: {r: 1, g: 1, b: 1, a: 1}

  m_fontColorGradientPreset: {fileID: 0}

  m_spriteAsset: {fileID: 0}

  m_tintAllSprites: 0

  m_StyleSheet: {fileID: 0}

  m_TextStyleHashCode: -1183493901

  m_overrideHtmlColors: 0

  m_faceColor:

    serializedVersion: 2

    rgba: 4294967295

  m_fontSize: 24

  m_fontSizeBase: 24

  m_fontWeight: 400

  m_enableAutoSizing: 0

  m_fontSizeMin: 18

  m_fontSizeMax: 72

  m_fontStyle: 0

  m_HorizontalAlignment: 2

  m_VerticalAlignment: 512

  m_textAlignment: 65535

  m_characterSpacing: 0

  m_wordSpacing: 0

  m_lineSpacing: 0

  m_lineSpacingMax: 0

  m_paragraphSpacing: 0

  m_charWidthMaxAdj: 0

  m_enableWordWrapping: 1

  m_wordWrappingRatios: 0.4

  m_overflowMode: 0

  m_linkedTextComponent: {fileID: 0}

  parentLinkedComponent: {fileID: 0}

  m_enableKerning: 1

  m_enableExtraPadding: 0

  checkPaddingRequired: 0

  m_isRichText: 1

  m_parseCtrlCharacters: 1

  m_isOrthographic: 1

  m_isCullingEnabled: 0

  m_horizontalMapping: 0

  m_verticalMapping: 0

  m_uvLineOffset: 0

  m_geometrySortingOrder: 0

  m_IsTextObjectScaleStatic: 0

  m_VertexBufferAutoSizeReduction: 0

  m_useMaxVisibleDescender: 1

  m_pageToDisplay: 1

  m_margin: {x: 0, y: 0, z: 0, w: 0}

  m_isUsingLegacyAnimationComponent: 0

  m_isVolumetricText: 0

  m_hasFontAssetChanged: 0

  m_baseMaterial: {fileID: 0}

  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

--- !u!222 &468556177

CanvasRenderer:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 468556174}

  m_CullTransparentMesh: 1

--- !u!1001 &516388491

PrefabInstance:

  m_ObjectHideFlags: 0
@@ -550,6 +684,7 @@ RectTransform: 
  - {fileID: 1408054169}

  - {fileID: 1869765661}

  - {fileID: 516388492}

  - {fileID: 1060367307}

  m_Father: {fileID: 0}

  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

  m_AnchorMin: {x: 0, y: 0}
@@ -562,6 +697,152 @@ RectTransform: 
  m_CorrespondingSourceObject: {fileID: 5783143251392024687, guid: 5430324ec74b5f04581d090658d90b3e, type: 3}

  m_PrefabInstance: {fileID: 7128632576251210280}

  m_PrefabAsset: {fileID: 0}

--- !u!1 &1060367306

GameObject:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  serializedVersion: 6

  m_Component:

  - component: {fileID: 1060367307}

  - component: {fileID: 1060367310}

  - component: {fileID: 1060367309}

  - component: {fileID: 1060367308}

  - component: {fileID: 1060367311}

  m_Layer: 5

  m_Name: UndoButton

  m_TagString: Untagged

  m_Icon: {fileID: 0}

  m_NavMeshLayer: 0

  m_StaticEditorFlags: 0

  m_IsActive: 1

--- !u!224 &1060367307

RectTransform:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 1060367306}

  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}

  m_LocalPosition: {x: 0, y: 0, z: 0}

  m_LocalScale: {x: 1, y: 1, z: 1}

  m_ConstrainProportionsScale: 0

  m_Children:

  - {fileID: 468556175}

  m_Father: {fileID: 726795831}

  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

  m_AnchorMin: {x: 0.5, y: 0.5}

  m_AnchorMax: {x: 0.5, y: 0.5}

  m_AnchoredPosition: {x: -84.6, y: -133.3}

  m_SizeDelta: {x: 160, y: 30}

  m_Pivot: {x: 0.5, y: 0.5}

--- !u!114 &1060367308

MonoBehaviour:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 1060367306}

  m_Enabled: 1

  m_EditorHideFlags: 0

  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

  m_Navigation:

    m_Mode: 3

    m_WrapAround: 0

    m_SelectOnUp: {fileID: 0}

    m_SelectOnDown: {fileID: 0}

    m_SelectOnLeft: {fileID: 0}

    m_SelectOnRight: {fileID: 0}

  m_Transition: 1

  m_Colors:

    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}

    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}

    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}

    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}

    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}

    m_ColorMultiplier: 1

    m_FadeDuration: 0.1

  m_SpriteState:

    m_HighlightedSprite: {fileID: 0}

    m_PressedSprite: {fileID: 0}

    m_SelectedSprite: {fileID: 0}

    m_DisabledSprite: {fileID: 0}

  m_AnimationTriggers:

    m_NormalTrigger: Normal

    m_HighlightedTrigger: Highlighted

    m_PressedTrigger: Pressed

    m_SelectedTrigger: Selected

    m_DisabledTrigger: Disabled

  m_Interactable: 1

  m_TargetGraphic: {fileID: 1060367309}

  m_OnClick:

    m_PersistentCalls:

      m_Calls:

      - m_Target: {fileID: 1060367311}

        m_TargetAssemblyTypeName: UndoButton, Assembly-CSharp

        m_MethodName: UndoClick

        m_Mode: 1

        m_Arguments:

          m_ObjectArgument: {fileID: 0}

          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine

          m_IntArgument: 0

          m_FloatArgument: 0

          m_StringArgument: 

          m_BoolArgument: 0

        m_CallState: 2

--- !u!114 &1060367309

MonoBehaviour:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 1060367306}

  m_Enabled: 1

  m_EditorHideFlags: 0

  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

  m_Material: {fileID: 0}

  m_Color: {r: 1, g: 1, b: 1, a: 1}

  m_RaycastTarget: 1

  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}

  m_Maskable: 1

  m_OnCullStateChanged:

    m_PersistentCalls:

      m_Calls: []

  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}

  m_Type: 1

  m_PreserveAspect: 0

  m_FillCenter: 1

  m_FillMethod: 4

  m_FillAmount: 1

  m_FillClockwise: 1

  m_FillOrigin: 0

  m_UseSpriteMesh: 0

  m_PixelsPerUnitMultiplier: 1

--- !u!222 &1060367310

CanvasRenderer:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 1060367306}

  m_CullTransparentMesh: 1

--- !u!114 &1060367311

MonoBehaviour:

  m_ObjectHideFlags: 0

  m_CorrespondingSourceObject: {fileID: 0}

  m_PrefabInstance: {fileID: 0}

  m_PrefabAsset: {fileID: 0}

  m_GameObject: {fileID: 1060367306}

  m_Enabled: 1

  m_EditorHideFlags: 0

  m_Script: {fileID: 11500000, guid: 680df1608b0d6b540972873124e33ad1, type: 3}

  m_Name: 

  m_EditorClassIdentifier: 

--- !u!1 &1079303791

GameObject:

  m_ObjectHideFlags: 0

Assets/Scripts/Messaging/Composer/InputField.cs

+8 −0
Original line number Diff line number Diff line 
using System.Text.RegularExpressions;

using TMPro;

using UnityEngine;
@@ -12,5 +13,12 @@ namespace Messaging.Composer { 
		public void WriteEmoji(string emoji) {

			fieldText.text += emoji;

		}



		private readonly Regex _removeRegex = new(@"<([a-z]+)(?![^>]*\/>)[^>]*>(?!.*<([a-z]+)(?![^>]*\/>)[^>]*>)");



		public void RemoveEmoji() {

			string newText = _removeRegex.Replace(fieldText.text, "");

			fieldText.SetText(newText);

		}

	}

}
 
 No newline at end of file

Assets/Scripts/Messaging/Composer/UndoButton.cs

0 → 100644
+16 −0
Original line number Diff line number Diff line 
using System;

using UnityEngine;



namespace Messaging.Composer {

	public class UndoButton : MonoBehaviour {

		private InputField _inputField;



		private void Awake() {

			_inputField = FindObjectOfType<InputField>();

		}



		public void UndoClick() {

			_inputField.RemoveEmoji();

		}

	}

}
 
 No newline at end of file

Assets/Scripts/Messaging/Composer/UndoButton.cs.meta

0 → 100644
+11 −0
Original line number Diff line number Diff line 
fileFormatVersion: 2

guid: 680df1608b0d6b540972873124e33ad1

MonoImporter:

  externalObjects: {}

  serializedVersion: 2

  defaultReferences: []

  executionOrder: 0

  icon: {instanceID: 0}

  userData: 

  assetBundleName: 

  assetBundleVariant: