Merge branch 'internal_public' of https://github.com/syncfusion/maui-toolkit into internal_public

Author: DhanarajRajendran

maui/src/NumericEntry/SfNumericEntry.Methods.cs

@@ -166,14 +166,8 @@ void SetTextBoxMargin()
 			if (_textBox != null)
 			{
 				_textBox.ButtonSize = ButtonSize + 4;
-				int defaultMargin = IsTextInputLayout ? 0 : 10;
 				double rightMargin = _buttonSpace;
-
-		#if ANDROID || IOS || MACCATALYST
-				_textBox.Margin = new Thickness(defaultMargin, 0, rightMargin, 0);
-		#else
-				_textBox.Margin = new Thickness(0, 0, rightMargin, 0);
-		#endif
+				_textBox.Margin = GetMarginBasedOnTextAlignment(0, 0, rightMargin, 0);
 			}
 		}
 
@@ -947,9 +941,11 @@ async void OnTextBoxPaste(object? sender, int caretPosition)
 		/// <param name="numberBox">The SfNumericEntry control.</param>
 		/// <param name="oldValue">The previous value.</param>
 		/// <param name="newValue">The new value.</param>
-		static void RaiseValueChangedEvent(SfNumericEntry numberBox, double? oldValue, double? newValue)
+		static async void RaiseValueChangedEvent(SfNumericEntry numberBox, double? oldValue, double? newValue)
 		{
 			var valueChangedEventArgs = new NumericEntryValueChangedEventArgs(newValue, oldValue);
+			//Fix included for Value loop issue.
+			await Task.Yield();
 			numberBox.ValueChanged?.Invoke(numberBox, valueChangedEventArgs);
 		}
 
@@ -2275,6 +2271,30 @@ void UpdateMaximumFractionDigit()
 			}
 		}
 
+		/// <summary> 
+		/// On iOS and MacCatalyst, it ensures a minimum left or right margin value when the 
+		/// text alignment is Start or End respectively.
+		/// On other platforms, it returns the provided thickness without modification.
+		/// <param name="left">The original left margin.</param>
+		/// <param name="top">The original top margin.</param>
+		/// <param name="right">The original right margin.</param>
+		/// <param name="bottom">The original bottom margin.</param>
+		/// <returns>Returns a <see cref="Thickness"/> value adjusted based on the specified text alignment.</returns>
+		/// </summary>
+		internal Thickness GetMarginBasedOnTextAlignment(double left, double top, double right, double bottom)
+		{
+#if MACCATALYST || IOS
+			return HorizontalTextAlignment switch
+			{
+				TextAlignment.Start => new Thickness(left > 0 ? left : MinimumMargin, top, right, bottom),
+				TextAlignment.End => new Thickness(left, top, right > 0 ? right : MinimumMargin, bottom),
+				_ => new Thickness(left, top, right, bottom)
+			};
+#else
+			return new Thickness(left, top, right, bottom);
+#endif
+		}
+
 		/// <summary>
 		/// Restricts digits in the fractional part of the number in the <see cref="SfNumericEntry"/>.
 		/// </summary>

maui/src/NumericEntry/SfNumericEntry.cs

@@ -308,6 +308,11 @@ public partial class SfNumericEntry : SfView, ITextElement, ITouchListener, IKey
         /// </summary>
         string _previousText = string.Empty;
 #endif
+
+#if MACCATALYST || IOS
+		const double MinimumMargin = 7;
+#endif
+
 		#endregion
 
 		#region Constructor

maui/src/NumericEntry/SfNumericUpDown.cs

@@ -921,13 +921,7 @@ void SetTextBoxMargin()
 			if (_textBox != null)
 			{
 				_textBox.ButtonSize = ButtonSize + 4;
-				int defaultMargin = IsTextInputLayout ? 0 : 10;
-
-#if ANDROID || IOS || MACCATALYST
-				_textBox.Margin = new Thickness(_leftMargin + defaultMargin, 0, _rightMargin, 0);
-#else
-				_textBox.Margin = new Thickness(_leftMargin, 0, _rightMargin, 0);
-#endif
+				_textBox.Margin = GetMarginBasedOnTextAlignment(_leftMargin, 0, _rightMargin, 0);
 			}
 		}
 

maui/src/SegmentedControl/Helper/SegmentViewHelper.cs

@@ -280,10 +280,20 @@ internal static Color GetSelectedSegmentForeground(ISegmentItemInfo? itemInfo, S
 			{
 				return segmentItem.SelectedSegmentTextColor ?? itemInfo?.SelectionIndicatorSettings?.TextColor ?? Colors.White;
 			}
+			else
+			{
+				Color textColor;
+				if (itemInfo != null && itemInfo.SelectionIndicatorSettings != null && !itemInfo.SelectedSegmentTextColor.Equals(itemInfo.SelectionIndicatorSettings.TextColor))
+				{
+					textColor = itemInfo.SelectionIndicatorSettings.TextColor;
+				}
+				else
+				{
+					textColor = BrushToColorConverter(GetSelectedSegmentStroke(itemInfo, segmentItem));
+				}
 
-			// If the selection indicator is not filled, get the text color from the selected segment background.
-			Brush textColor = GetSelectedSegmentStroke(itemInfo, segmentItem);
-			return BrushToColorConverter(textColor);
+				return segmentItem.SelectedSegmentTextColor ?? textColor;
+			}
 		}
 
 		/// <summary>

maui/src/SegmentedControl/Interface/ISegmentInfo.cs

@@ -87,6 +87,11 @@ internal interface ISegmentInfo
 		/// </summary>
 		Brush KeyboardFocusStroke { get; }
 
+		/// <summary>
+		/// Gets the selected text color for the segment.
+		/// </summary>
+		Color SelectedSegmentTextColor { get; }
+
 		/// <summary>
 		/// Gets the background brush for the segment when it is disabled.
 		/// </summary>

maui/src/SegmentedControl/Model/SfSegmentedControl.cs

@@ -290,6 +290,19 @@ public partial class SfSegmentedControl
 				typeof(SfSegmentedControl),
 				defaultValueCreator: bindable => null);
 
+		/// <summary>
+		/// Identifies the <see cref="SelectedSegmentTextColor"/> dependency property.
+		/// </summary>
+		/// <value>
+		/// Identifies the <see cref="SelectedSegmentTextColor"/> bindable property.
+		/// </value>
+		internal static readonly BindableProperty SelectedSegmentTextColorProperty =
+			BindableProperty.Create(
+				nameof(SelectedSegmentTextColor),
+				typeof(Color), typeof(SfSegmentedControl),
+				defaultValueCreator: bindable => Color.FromArgb("#FFFFFF"),
+				propertyChanged: OnSelectedSegmentTextColorChanged);
+
 		/// <summary>
 		/// Identifies the <see cref="KeyboardFocusStroke"/> dependency property.
 		/// </summary>
@@ -993,6 +1006,15 @@ internal Brush HoveredBackground
 			set { SetValue(HoveredBackgroundProperty, value); }
 		}
 
+		/// <summary>
+		/// Gets or sets the selected text color brush for the segment.
+		/// </summary>
+		internal Color SelectedSegmentTextColor
+		{
+			get { return (Color)this.GetValue(SelectedSegmentTextColorProperty); }
+			set { this.SetValue(SelectedSegmentTextColorProperty, value); }
+		}
+
 		/// <summary>
 		/// Gets or sets the focused keyboard stroke for the segment.
 		/// </summary>
@@ -1280,6 +1302,23 @@ static void OnKeyboardFocusStrokeChanged(BindableObject bindable, object oldValu
 			segmentedControl._keyNavigationView?.InvalidateDrawable();
 		}
 
+		/// <summary>
+		/// Occurs when <see cref="SelectedSegmentTextColor"/> property changed.
+		/// </summary>
+		/// <param name="bindable">The bindable object.</param>
+		/// <param name="oldValue">The old value.</param>
+		/// <param name="newValue">The new value.</param>
+		static void OnSelectedSegmentTextColorChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+			SfSegmentedControl segmentedControl = (SfSegmentedControl)bindable;
+			if (segmentedControl == null || segmentedControl._segmentLayout == null || !segmentedControl.IsLoaded)
+			{
+				return;
+			}
+
+			segmentedControl._segmentLayout?.UpdateSelectedSegmentItemStyle();
+		}
+
 		/// <summary>
 		/// Occurs when <see cref="DisabledSegmentBackground"/> property changed.
 		/// </summary>

maui/src/SegmentedControl/SfSegmentedControl.cs

@@ -88,6 +88,7 @@ public SfSegmentedControl()
 			ThemeElement.InitializeThemeResources(this, "SfSegmentedControlTheme");
 			SetDynamicResource(HoveredBackgroundProperty, "SfSegmentedControlHoveredBackground");
 			SetDynamicResource(KeyboardFocusStrokeProperty, "SfSegmentedControlKeyboardFocusStroke");
+			SetDynamicResource(SelectedSegmentTextColorProperty, "SfSegmentedControlSelectionTextColor");
 			MinimumWidthRequest = 180;
 			MinimumHeightRequest = 40;
 			SelectionIndicatorSettings.Parent = this;
@@ -130,6 +131,11 @@ public SfSegmentedControl()
 		/// </summary>
 		Brush ISegmentInfo.KeyboardFocusStroke => KeyboardFocusStroke;
 
+		/// <summary>
+		/// Gets the selected text color for the segment.
+		/// </summary>
+		Color ISegmentInfo.SelectedSegmentTextColor => this.SelectedSegmentTextColor;
+
 		#endregion
 
 		#region Public methods

maui/tests/Syncfusion.Maui.Toolkit.UnitTest/Buttons/SfSegmentedControlUnitTests.cs

@@ -1222,7 +1222,7 @@ public void GetSelectedSegmentForeground_ReturnsColorFromSelectedSegmentbackgrou
 			var itemInfo = new SfSegmentedControl { SelectionIndicatorSettings = new SelectionIndicatorSettings { SelectionIndicatorPlacement = SelectionIndicatorPlacement.Border } };
 			var segmentItem = new SfSegmentItem { SelectedSegmentTextColor = Colors.Yellow };
 			var resultColor = SegmentViewHelper.GetSelectedSegmentForeground(itemInfo, segmentItem);
-			var expected = Color.FromRgba(0.40392157, 0.3137255, 0.6431373, 1);
+			var expected = Color.FromRgba(255, 255, 0, 255);
 			Assert.Equal(expected, resultColor);
 		}
 

maui/tests/Syncfusion.Maui.Toolkit.UnitTest/Editors/SfNumericEntryUnitTests.cs

@@ -519,27 +519,6 @@ public void UpdateEffectsRendererBounds_ShouldReturn_EffectsRenderer()
 			Assert.NotNull(GetPrivateField(numericEntry, "_effectsRenderer"));
 		}
 
-		[Fact]
-		public void RaiseValueChangedEvent_ShouldTrigger_ValueChangedEvent()
-		{
-			var numericEntry = new SfNumericEntry();
-			double? oldValue = 50;
-			double? newValue = 60;
-			bool eventTriggered = false;
-
-			numericEntry.ValueChanged += (sender, e) =>
-			{
-				eventTriggered = true;
-				Assert.Equal(oldValue, e.OldValue);
-				Assert.Equal(newValue, e.NewValue);
-			};
-
-			InvokeStaticPrivateMethod(numericEntry, "RaiseValueChangedEvent", new object[] { numericEntry, oldValue, newValue });
-
-			Assert.True(eventTriggered);
-		}
-
-
 		[Theory]
 		[InlineData("42.5", 0)]
 		[InlineData("invalid", 42.5)]