chore: native timepicker- set -initial time

unoplatform · Nov 28, 2024 · 8d2813c · 8d2813c
1 parent dabd0a6
commit 8d2813c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/TimePicker/TimePickerSelector.Android.cs b/src/Uno.UI/UI/Xaml/Controls/TimePicker/TimePickerSelector.Android.cs
@@ -37,7 +37,7 @@ private protected override void OnLoaded()
 		public void Initialize()
 		{
 			SaveInitialTime();
-			SetPickerTime(Time);
+			SetPickerTime(Time == default ? DateTime.Now.TimeOfDay : Time);
 			SetPickerClockIdentifier(ClockIdentifier);
 		}
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/TimePicker/TimePickerSelector.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/TimePicker/TimePickerSelector.iOS.cs
@@ -39,7 +39,10 @@ private protected override void OnLoaded()
 
 			UpdatePickerStyle();
 			DatePickerSelector.OverrideUIDatePickerTheme(this);
-			SetPickerTime(Time.RoundToNextMinuteInterval(MinuteIncrement));
+
+			// Set the default time to current time if no time is set
+			var initialTime = Time == default ? DateTime.Now.TimeOfDay : Time;
+			SetPickerTime(initialTime.RoundToNextMinuteInterval(MinuteIncrement));
 			SetPickerClockIdentifier(ClockIdentifier);
 			SaveInitialTime();
 			_picker.ValueChanged += OnValueChanged;