diff --git a/src/Compatibility/Core/src/Android/Renderers/TimePickerRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/TimePickerRenderer.cs
index 83203a21169d..8e4b05ea7ba6 100644
--- a/src/Compatibility/Core/src/Android/Renderers/TimePickerRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/TimePickerRenderer.cs
@@ -140,7 +140,7 @@ void IPickerRenderer.OnClick()
TimePicker view = Element;
ElementController.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, true);
- _dialog = CreateTimePickerDialog(view.Time.Hours, view.Time.Minutes);
+ _dialog = CreateTimePickerDialog(view.Time?.Hours ?? 0, view.Time?.Minutes ?? 0);
_dialog.Show();
}
@@ -159,17 +159,17 @@ void OnCancelButtonClicked(object sender, EventArgs e)
}
[PortHandler]
- void SetTime(TimeSpan time)
+ void SetTime(TimeSpan? time)
{
if (String.IsNullOrEmpty(Element.Format))
{
var timeFormat = "t";
- EditText.Text = DateTime.Today.Add(time).ToString(timeFormat);
+ EditText.Text = DateTime.Today.Add(time ?? TimeSpan.Zero).ToString(timeFormat);
}
else
{
var timeFormat = Element.Format;
- EditText.Text = DateTime.Today.Add(time).ToString(timeFormat);
+ EditText.Text = DateTime.Today.Add(time ?? TimeSpan.Zero).ToString(timeFormat);
}
Element.InvalidateMeasureNonVirtual(Internals.InvalidationTrigger.MeasureChanged);
diff --git a/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs b/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs
index ded027021259..4d9139a7e415 100644
--- a/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs
+++ b/src/Compatibility/Core/src/Windows/TimePickerRenderer.cs
@@ -173,7 +173,7 @@ void UpdateFont()
[PortHandler]
void UpdateTime()
{
- Control.Time = Element.Time;
+ Control.Time = Element.Time ?? TimeSpan.Zero;
if (Element.Format?.Contains('H', StringComparison.Ordinal) == true)
{
Control.ClockIdentifier = "24HourClock";
diff --git a/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs
index fe997dc64d2c..d6ac8915442e 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs
@@ -217,7 +217,7 @@ void UpdateCharacterSpacing()
[PortHandler]
void UpdateTime()
{
- _picker.Date = new DateTime(1, 1, 1).Add(Element.Time).ToNSDate();
+ _picker.Date = new DateTime(1, 1, 1).Add(Element.Time ?? TimeSpan.Zero).ToNSDate();
string iOSLocale = NSLocale.CurrentLocale.CountryCode;
var cultureInfos = CultureInfo.GetCultures(CultureTypes.AllCultures)
.Where(c => c.Name.EndsWith("-" + iOSLocale)).FirstOrDefault();
@@ -228,12 +228,12 @@ void UpdateTime()
{
string timeformat = cultureInfos.DateTimeFormat.ShortTimePattern;
NSLocale locale = new NSLocale(cultureInfos.TwoLetterISOLanguageName);
- Control.Text = DateTime.Today.Add(Element.Time).ToString(timeformat, cultureInfos);
+ Control.Text = DateTime.Today.Add(Element.Time ?? TimeSpan.Zero).ToString(timeformat, cultureInfos);
_picker.Locale = locale;
}
else
{
- Control.Text = DateTime.Today.Add(Element.Time).ToString(Element.Format, cultureInfos);
+ Control.Text = DateTime.Today.Add(Element.Time ?? TimeSpan.Zero).ToString(Element.Format, cultureInfos);
}
if (Element.Format?.Contains('H', StringComparison.Ordinal) == true)
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml
index 13f7d25fc708..26c81fd2f840 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml
@@ -87,6 +87,14 @@
Margin="6, 0"
Style="{StaticResource IsFocusedTextStyle}"/>
-
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml.cs
index 322fe99f5903..179022c8a110 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/TimePickerPage.xaml.cs
@@ -13,12 +13,12 @@ public TimePickerPage()
UpdateTimePickerBackground();
}
- void OnUpdateBackgroundButtonClicked(object sender, System.EventArgs e)
+ void OnUpdateBackgroundButtonClicked(object sender, EventArgs e)
{
UpdateTimePickerBackground();
}
- void OnClearBackgroundButtonClicked(object sender, System.EventArgs e)
+ void OnClearBackgroundButtonClicked(object sender, EventArgs e)
{
BackgroundTimePicker.Background = null;
}
@@ -39,5 +39,15 @@ void UpdateTimePickerBackground()
}
};
}
+
+ void SetTimePickerToNull(object sender, EventArgs e)
+ {
+ NullTimePicker.Time = null;
+ }
+
+ void SetTimePickerToNow(object sender, EventArgs e)
+ {
+ NullTimePicker.Time = DateTime.Now.TimeOfDay;
+ }
}
}
\ No newline at end of file
diff --git a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 1319bd663045..032b6469a32e 100644
--- a/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -221,4 +221,6 @@ Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
\ No newline at end of file
+override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+*REMOVED*Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index a5cea6dbf069..8c66150c74bc 100644
--- a/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -424,3 +424,5 @@ override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.Comp
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.ToNSAttributedString(this Microsoft.Maui.Controls.FormattedString! formattedString, Microsoft.Maui.IFontManager! fontManager, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> Foundation.NSAttributedString!
*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.ToNSAttributedString(this Microsoft.Maui.Controls.Span! span, Microsoft.Maui.IFontManager! fontManager, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> Foundation.NSAttributedString!
+*REMOVED*Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index e8340e236e02..5b8e4a654db5 100644
--- a/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -423,4 +423,6 @@ override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.Com
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.ToNSAttributedString(this Microsoft.Maui.Controls.FormattedString! formattedString, Microsoft.Maui.IFontManager! fontManager, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> Foundation.NSAttributedString!
-*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.ToNSAttributedString(this Microsoft.Maui.Controls.Span! span, Microsoft.Maui.IFontManager! fontManager, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> Foundation.NSAttributedString!
\ No newline at end of file
+*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.ToNSAttributedString(this Microsoft.Maui.Controls.Span! span, Microsoft.Maui.IFontManager! fontManager, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> Foundation.NSAttributedString!
+*REMOVED*Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 70a3b13b8fdf..b8cc6cb0a38f 100644
--- a/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -216,4 +216,6 @@ Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
\ No newline at end of file
+override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+*REMOVED*Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index b7edb3062e7f..9ef42960f9a9 100644
--- a/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -224,4 +224,6 @@ override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.Com
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.ToRunAndColorsTuples(this Microsoft.Maui.Controls.FormattedString! formattedString, Microsoft.Maui.IFontManager! fontManager, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> System.Collections.Generic.IEnumerable!>!
-*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.UpdateInlines(this Microsoft.UI.Xaml.Controls.TextBlock! textBlock, Microsoft.Maui.IFontManager! fontManager, Microsoft.Maui.Controls.FormattedString! formattedString, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> void
\ No newline at end of file
+*REMOVED*static Microsoft.Maui.Controls.Platform.FormattedStringExtensions.UpdateInlines(this Microsoft.UI.Xaml.Controls.TextBlock! textBlock, Microsoft.Maui.IFontManager! fontManager, Microsoft.Maui.Controls.FormattedString! formattedString, double defaultLineHeight = 0, Microsoft.Maui.TextAlignment defaultHorizontalAlignment = Microsoft.Maui.TextAlignment.Start, Microsoft.Maui.Font? defaultFont = null, Microsoft.Maui.Graphics.Color? defaultColor = null, Microsoft.Maui.TextTransform defaultTextTransform = Microsoft.Maui.TextTransform.Default) -> void
+*REMOVED*Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
index efdc429d3c75..2e79dcf232bd 100644
--- a/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -215,4 +215,6 @@ Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
\ No newline at end of file
+override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+*REMOVED*Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index 9383125db97c..f9c1ba845497 100644
--- a/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Core/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -214,4 +214,6 @@ Microsoft.Maui.Controls.SearchBar.ReturnType.set -> void
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Type! sourceType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.CanConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Type? destinationType) -> bool
override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertFrom(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object! value) -> object?
-override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
\ No newline at end of file
+override Microsoft.Maui.Controls.ListStringTypeConverter.ConvertTo(System.ComponentModel.ITypeDescriptorContext? context, System.Globalization.CultureInfo? culture, object? value, System.Type! destinationType) -> object?
+*REMOVED*Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.Controls.TimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs b/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
index 5fa874db652f..6f6592039c46 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.Mapper.cs
@@ -1,5 +1,4 @@
-#nullable disable
-using System;
+using System;
using Microsoft.Maui.Controls.Compatibility;
namespace Microsoft.Maui.Controls
diff --git a/src/Controls/src/Core/TimePicker/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.cs
index f0ae684c9c62..7e50dcef69c1 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.cs
@@ -20,11 +20,11 @@ public partial class TimePicker : View, IFontElement, ITextElement, IElementConf
public static readonly BindableProperty CharacterSpacingProperty = TextElement.CharacterSpacingProperty;
/// Bindable property for .
- public static readonly BindableProperty TimeProperty = BindableProperty.Create(nameof(Time), typeof(TimeSpan), typeof(TimePicker), new TimeSpan(0), BindingMode.TwoWay,
+ public static readonly BindableProperty TimeProperty = BindableProperty.Create(nameof(Time), typeof(TimeSpan?), typeof(TimePicker), new TimeSpan(0), BindingMode.TwoWay,
validateValue: (bindable, value) =>
{
- var time = (TimeSpan)value;
- return time.TotalHours < 24 && time.TotalMilliseconds >= 0;
+ var time = (TimeSpan?)value;
+ return time is null || (time?.TotalHours < 24 && time?.TotalMilliseconds >= 0);
},
propertyChanged: TimePropertyChanged);
@@ -70,9 +70,9 @@ public double CharacterSpacing
}
///
- public TimeSpan Time
+ public TimeSpan? Time
{
- get { return (TimeSpan)GetValue(TimeProperty); }
+ get { return (TimeSpan?)GetValue(TimeProperty); }
set { SetValue(TimeProperty, value); }
}
@@ -157,7 +157,7 @@ void ITextElement.OnTextTransformChanged(TextTransform oldValue, TextTransform n
Font ITextStyle.Font => this.ToFont();
- TimeSpan ITimePicker.Time
+ TimeSpan? ITimePicker.Time
{
get => Time;
set => SetValue(TimeProperty, value, SetterSpecificity.FromHandler);
diff --git a/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs b/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
index de7567b47211..f00ca20ab6fd 100644
--- a/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
+++ b/src/Controls/tests/Core.UnitTests/NotifiedPropertiesTests.cs
@@ -145,7 +145,7 @@ public override string DebugName
new PropertyTestCase ("Detail", v => v.Detail, (v, o) => v.Detail = o, () => null, "Foo"),
new PropertyTestCase ("TextColor", v => v.TextColor, (v, o) => v.TextColor = o, () => null, new Color (0, 1, 0)),
new PropertyTestCase ("DetailColor", v => v.DetailColor, (v, o) => v.DetailColor = o, () => null, new Color (0, 1, 0)),
- new PropertyTestCase ("Time", v => v.Time, (v, o) => v.Time = o, () => default(TimeSpan), new TimeSpan (8, 0, 0)),
+ new PropertyTestCase ("Time", v => v.Time, (v, o) => v.Time = o, () => default(TimeSpan), new TimeSpan (8, 0, 0)),
new PropertyTestCase ("Format", v => v.Format, (v, o) => v.Format = o, () => "t", "T"),
new PropertyTestCase ("View", v => v.View, (v, o) => v.View = o, () => null, new View ()),
new PropertyTestCase ("Source", v => v.Source, (v, o) => v.Source = o, () => null, new UrlWebViewSource { Url = "Foo" }),
diff --git a/src/Controls/tests/Core.UnitTests/TimePickerUnitTest.cs b/src/Controls/tests/Core.UnitTests/TimePickerUnitTest.cs
index 8b899b1b9b6f..df2d0d331e8a 100644
--- a/src/Controls/tests/Core.UnitTests/TimePickerUnitTest.cs
+++ b/src/Controls/tests/Core.UnitTests/TimePickerUnitTest.cs
@@ -40,6 +40,17 @@ public void ZeroTimeIsValid()
};
}
+ [Fact]
+ public void NullTimeIsValid()
+ {
+ var timePicker = new TimePicker
+ {
+ Time = null
+ };
+
+ Assert.Null(timePicker.Time);
+ }
+
[Fact]
public void TestTimeSelected()
{
@@ -57,7 +68,9 @@ public void TestTimeSelected()
public static object[] TimeSpans = {
new object[] { new TimeSpan (), new TimeSpan(9, 0, 0) },
new object[] { new TimeSpan(9, 0, 0), new TimeSpan(17, 30, 0) },
- new object[] { new TimeSpan(23, 59, 59), new TimeSpan(0, 0, 0) }
+ new object[] { new TimeSpan(23, 59, 59), new TimeSpan(0, 0, 0) },
+ new object[] { new TimeSpan(23, 59, 59), null },
+ new object[] { null, new TimeSpan(23, 59, 59) },
};
public static IEnumerable TimeSpansData()
diff --git a/src/Core/src/Core/ITimePicker.cs b/src/Core/src/Core/ITimePicker.cs
index 7e4cdf81f4b2..c283151f0ff7 100644
--- a/src/Core/src/Core/ITimePicker.cs
+++ b/src/Core/src/Core/ITimePicker.cs
@@ -1,20 +1,19 @@
using System;
-namespace Microsoft.Maui
+namespace Microsoft.Maui;
+
+///
+/// Represents a that allows the user to select a time.
+///
+public interface ITimePicker : IView, ITextStyle
{
///
- /// Represents a View that allows the user to select a time.
+ /// The format of the time to display to the user.
///
- public interface ITimePicker : IView, ITextStyle
- {
- ///
- /// The format of the time to display to the user.
- ///
- string Format { get; }
+ string Format { get; }
- ///
- /// Gets the displayed time.
- ///
- TimeSpan Time { get; set; }
- }
+ ///
+ /// Gets or sets the selected time.
+ ///
+ TimeSpan? Time { get; set; }
}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
index f3a807167be8..2a2048bf28b8 100644
--- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
+++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs
@@ -87,25 +87,29 @@ public static void MapTextColor(ITimePickerHandler handler, ITimePicker timePick
void ShowPickerDialog()
{
- if (VirtualView == null)
+ if (VirtualView is null)
+ {
return;
+ }
- var time = VirtualView.Time;
- ShowPickerDialog(time.Hours, time.Minutes);
+ ShowPickerDialog(VirtualView.Time);
}
// This overload is here so we can pass in the current values from the dialog
// on an orientation change (so that orientation changes don't cause the user's date selection progress
// to be lost). Not useful until we have orientation changed events.
- void ShowPickerDialog(int hour, int minute)
+ void ShowPickerDialog(TimeSpan? time)
{
+ var hour = time?.Hours ?? 0;
+ var minute = time?.Minutes ?? 0;
+
_dialog = CreateTimePickerDialog(hour, minute);
_dialog.Show();
}
void HidePickerDialog()
{
- if (_dialog != null)
+ if (_dialog is not null)
{
_dialog.Hide();
}
diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
index ddb951d956fa..6fd1084bc6e3 100644
--- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
@@ -1,4 +1,3 @@
-#nullable enable
using Microsoft.UI.Xaml.Controls;
using WBrush = Microsoft.UI.Xaml.Media.Brush;
@@ -52,7 +51,7 @@ public static void MapBackground(ITimePickerHandler handler, ITimePicker timePic
void OnControlTimeChanged(object? sender, TimePickerValueChangedEventArgs e)
{
- if (VirtualView != null)
+ if (VirtualView is not null)
{
VirtualView.Time = e.NewTime;
VirtualView.InvalidateMeasure();
diff --git a/src/Core/src/Platform/Android/TimePickerExtensions.cs b/src/Core/src/Platform/Android/TimePickerExtensions.cs
index a82d9896bfa7..333c98845b5f 100644
--- a/src/Core/src/Platform/Android/TimePickerExtensions.cs
+++ b/src/Core/src/Platform/Android/TimePickerExtensions.cs
@@ -1,23 +1,22 @@
-namespace Microsoft.Maui.Platform
+namespace Microsoft.Maui.Platform;
+
+public static class TimePickerExtensions
{
- public static class TimePickerExtensions
+ public static void UpdateFormat(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
{
- public static void UpdateFormat(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
- {
- mauiTimePicker.SetTime(timePicker);
- }
+ mauiTimePicker.SetTime(timePicker);
+ }
- public static void UpdateTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
- {
- mauiTimePicker.SetTime(timePicker);
- }
+ public static void UpdateTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
+ {
+ mauiTimePicker.SetTime(timePicker);
+ }
- internal static void SetTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
- {
- var time = timePicker.Time;
- var format = timePicker.Format;
+ internal static void SetTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
+ {
+ var time = timePicker.Time;
+ var format = timePicker.Format;
- mauiTimePicker.Text = time.ToFormattedString(format);
- }
+ mauiTimePicker.Text = time?.ToFormattedString(format);
}
}
\ No newline at end of file
diff --git a/src/Core/src/Platform/TimeExtensions.cs b/src/Core/src/Platform/TimeExtensions.cs
index ad8a6df965ee..ca6afc57b401 100644
--- a/src/Core/src/Platform/TimeExtensions.cs
+++ b/src/Core/src/Platform/TimeExtensions.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using System;
+using System;
using System.Globalization;
namespace Microsoft.Maui.Platform
@@ -11,7 +10,7 @@ public static string ToFormattedString(this ITimePicker timePicker)
var time = timePicker.Time;
var format = timePicker.Format;
- return time.ToFormattedString(format);
+ return time?.ToFormattedString(format) ?? string.Empty;
}
public static string ToFormattedString(this TimeSpan time, string format, CultureInfo? cultureInfo = null)
diff --git a/src/Core/src/Platform/Windows/TimePickerExtensions.cs b/src/Core/src/Platform/Windows/TimePickerExtensions.cs
index 49a1cf6ce6ca..0ef54a98b518 100644
--- a/src/Core/src/Platform/Windows/TimePickerExtensions.cs
+++ b/src/Core/src/Platform/Windows/TimePickerExtensions.cs
@@ -2,87 +2,86 @@
using Microsoft.Maui.Graphics;
using Microsoft.UI.Xaml.Controls;
-namespace Microsoft.Maui.Platform
+namespace Microsoft.Maui.Platform;
+
+public static class TimePickerExtensions
{
- public static class TimePickerExtensions
+ public static void UpdateTime(this TimePicker nativeTimePicker, ITimePicker timePicker)
{
- public static void UpdateTime(this TimePicker nativeTimePicker, ITimePicker timePicker)
- {
- nativeTimePicker.Time = timePicker.Time;
+ nativeTimePicker.Time = timePicker.Time ?? TimeSpan.Zero;
- if (timePicker.Format?.Contains('H', StringComparison.Ordinal) == true)
- {
- nativeTimePicker.ClockIdentifier = "24HourClock";
- }
- else
- {
- nativeTimePicker.ClockIdentifier = "12HourClock";
- }
+ if (timePicker.Format?.Contains('H', StringComparison.Ordinal) == true)
+ {
+ nativeTimePicker.ClockIdentifier = "24HourClock";
}
-
- public static void UpdateCharacterSpacing(this TimePicker platformTimePicker, ITimePicker timePicker)
+ else
{
- platformTimePicker.CharacterSpacing = timePicker.CharacterSpacing.ToEm();
+ nativeTimePicker.ClockIdentifier = "12HourClock";
}
+ }
- public static void UpdateFont(this TimePicker platformTimePicker, ITimePicker timePicker, IFontManager fontManager) =>
- platformTimePicker.UpdateFont(timePicker.Font, fontManager);
+ public static void UpdateCharacterSpacing(this TimePicker platformTimePicker, ITimePicker timePicker)
+ {
+ platformTimePicker.CharacterSpacing = timePicker.CharacterSpacing.ToEm();
+ }
- public static void UpdateTextColor(this TimePicker platformTimePicker, ITimePicker timePicker)
- {
- Color textColor = timePicker.TextColor;
+ public static void UpdateFont(this TimePicker platformTimePicker, ITimePicker timePicker, IFontManager fontManager) =>
+ platformTimePicker.UpdateFont(timePicker.Font, fontManager);
- UI.Xaml.Media.Brush? platformBrush = textColor?.ToPlatform();
+ public static void UpdateTextColor(this TimePicker platformTimePicker, ITimePicker timePicker)
+ {
+ Color textColor = timePicker.TextColor;
- if (platformBrush == null)
- {
- platformTimePicker.Resources.RemoveKeys(TextColorResourceKeys);
- platformTimePicker.ClearValue(TimePicker.ForegroundProperty);
- }
- else
- {
- platformTimePicker.Resources.SetValueForAllKey(TextColorResourceKeys, platformBrush);
- platformTimePicker.Foreground = platformBrush;
- }
+ UI.Xaml.Media.Brush? platformBrush = textColor?.ToPlatform();
- platformTimePicker.RefreshThemeResources();
+ if (platformBrush == null)
+ {
+ platformTimePicker.Resources.RemoveKeys(TextColorResourceKeys);
+ platformTimePicker.ClearValue(TimePicker.ForegroundProperty);
}
-
- // ResourceKeys controlling the foreground color of the TimePicker.
- // https://docs.microsoft.com/en-us/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.timepicker?view=windows-app-sdk-1.1
- static readonly string[] TextColorResourceKeys =
+ else
{
- "TimePickerButtonForeground",
- "TimePickerButtonForegroundPointerOver",
- "TimePickerButtonForegroundPressed",
- "TimePickerButtonForegroundDisabled"
- };
+ platformTimePicker.Resources.SetValueForAllKey(TextColorResourceKeys, platformBrush);
+ platformTimePicker.Foreground = platformBrush;
+ }
- public static void UpdateBackground(this TimePicker platformTimePicker, ITimePicker timePicker)
- {
- var brush = timePicker?.Background?.ToPlatform();
+ platformTimePicker.RefreshThemeResources();
+ }
- if (brush is null)
- {
- platformTimePicker.Resources.RemoveKeys(BackgroundColorResourceKeys);
- platformTimePicker.ClearValue(TimePicker.BackgroundProperty);
- }
- else
- {
- platformTimePicker.Resources.SetValueForAllKey(BackgroundColorResourceKeys, brush);
- platformTimePicker.Background = brush;
- }
+ // ResourceKeys controlling the foreground color of the TimePicker.
+ // https://docs.microsoft.com/en-us/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.timepicker?view=windows-app-sdk-1.1
+ static readonly string[] TextColorResourceKeys =
+ {
+ "TimePickerButtonForeground",
+ "TimePickerButtonForegroundPointerOver",
+ "TimePickerButtonForegroundPressed",
+ "TimePickerButtonForegroundDisabled"
+ };
- platformTimePicker.RefreshThemeResources();
- }
+ public static void UpdateBackground(this TimePicker platformTimePicker, ITimePicker timePicker)
+ {
+ var brush = timePicker?.Background?.ToPlatform();
- static readonly string[] BackgroundColorResourceKeys =
+ if (brush is null)
{
- "TimePickerButtonBackground",
- "TimePickerButtonBackgroundPointerOver",
- "TimePickerButtonBackgroundPressed",
- "TimePickerButtonBackgroundDisabled",
- "TimePickerButtonBackgroundFocused",
- };
+ platformTimePicker.Resources.RemoveKeys(BackgroundColorResourceKeys);
+ platformTimePicker.ClearValue(TimePicker.BackgroundProperty);
+ }
+ else
+ {
+ platformTimePicker.Resources.SetValueForAllKey(BackgroundColorResourceKeys, brush);
+ platformTimePicker.Background = brush;
+ }
+
+ platformTimePicker.RefreshThemeResources();
}
+
+ static readonly string[] BackgroundColorResourceKeys =
+ {
+ "TimePickerButtonBackground",
+ "TimePickerButtonBackgroundPointerOver",
+ "TimePickerButtonBackgroundPressed",
+ "TimePickerButtonBackgroundDisabled",
+ "TimePickerButtonBackgroundFocused",
+ };
}
diff --git a/src/Core/src/Platform/iOS/DatePickerExtensions.cs b/src/Core/src/Platform/iOS/DatePickerExtensions.cs
index 1a0e6cbedecc..0e6cfcff2068 100644
--- a/src/Core/src/Platform/iOS/DatePickerExtensions.cs
+++ b/src/Core/src/Platform/iOS/DatePickerExtensions.cs
@@ -3,138 +3,137 @@
using Foundation;
using UIKit;
-namespace Microsoft.Maui.Platform
+namespace Microsoft.Maui.Platform;
+
+public static class DatePickerExtensions
{
- public static class DatePickerExtensions
+ public static void UpdateFormat(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
{
- public static void UpdateFormat(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
- {
- platformDatePicker.UpdateDate(datePicker, null);
- }
+ platformDatePicker.UpdateDate(datePicker, null);
+ }
- public static void UpdateFormat(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
- {
- platformDatePicker.UpdateDate(datePicker, picker);
- }
+ public static void UpdateFormat(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
+ {
+ platformDatePicker.UpdateDate(datePicker, picker);
+ }
- public static void UpdateFormat(this UIDatePicker picker, IDatePicker datePicker)
- {
- picker.UpdateDate(datePicker);
- }
+ public static void UpdateFormat(this UIDatePicker picker, IDatePicker datePicker)
+ {
+ picker.UpdateDate(datePicker);
+ }
- public static void UpdateDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
- {
- platformDatePicker.UpdateDate(datePicker, null);
- }
+ public static void UpdateDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
+ {
+ platformDatePicker.UpdateDate(datePicker, null);
+ }
- public static void UpdateTextColor(this MauiDatePicker platformDatePicker, IDatePicker datePicker) =>
- UpdateTextColor(platformDatePicker, datePicker, null);
+ public static void UpdateTextColor(this MauiDatePicker platformDatePicker, IDatePicker datePicker) =>
+ UpdateTextColor(platformDatePicker, datePicker, null);
- public static void UpdateTextColor(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIColor? defaultTextColor)
- {
- var textColor = datePicker.TextColor;
+ public static void UpdateTextColor(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIColor? defaultTextColor)
+ {
+ var textColor = datePicker.TextColor;
- if (textColor == null)
- {
- if (defaultTextColor != null)
- {
- platformDatePicker.TextColor = defaultTextColor;
- }
- }
- else
+ if (textColor == null)
+ {
+ if (defaultTextColor != null)
{
- platformDatePicker.TextColor = textColor.ToPlatform();
+ platformDatePicker.TextColor = defaultTextColor;
}
-
- // HACK This forces the color to update; there's probably a more elegant way to make this happen
- platformDatePicker.UpdateDate(datePicker);
}
-
- public static void UpdateDate(this UIDatePicker picker, IDatePicker datePicker)
+ else
{
- if (picker != null && picker.Date.ToDateTime().Date != datePicker.Date.Date)
- picker.SetDate(datePicker.Date.ToNSDate(), false);
+ platformDatePicker.TextColor = textColor.ToPlatform();
}
- public static void UpdateDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
- {
- if (picker != null && picker.Date.ToDateTime().Date != datePicker.Date.Date)
- picker.SetDate(datePicker.Date.ToNSDate(), false);
+ // HACK This forces the color to update; there's probably a more elegant way to make this happen
+ platformDatePicker.UpdateDate(datePicker);
+ }
+
+ public static void UpdateDate(this UIDatePicker picker, IDatePicker datePicker)
+ {
+ if (picker != null && picker.Date.ToDateTime().Date != datePicker.Date.Date)
+ picker.SetDate(datePicker.Date.ToNSDate(), false);
+ }
+
+ public static void UpdateDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
+ {
+ if (picker != null && picker.Date.ToDateTime().Date != datePicker.Date.Date)
+ picker.SetDate(datePicker.Date.ToNSDate(), false);
- string format = datePicker.Format ?? string.Empty;
+ string format = datePicker.Format ?? string.Empty;
- // Can't use VirtualView.Format because it won't display the correct format if the region and language are set differently
- if (picker != null && (string.IsNullOrWhiteSpace(format) || format.Equals("d", StringComparison.OrdinalIgnoreCase)))
+ // Can't use VirtualView.Format because it won't display the correct format if the region and language are set differently
+ if (picker != null && (string.IsNullOrWhiteSpace(format) || format.Equals("d", StringComparison.OrdinalIgnoreCase)))
+ {
+ NSDateFormatter dateFormatter = new NSDateFormatter
{
- NSDateFormatter dateFormatter = new NSDateFormatter
- {
- TimeZone = NSTimeZone.FromGMT(0)
- };
-
- if (format.Equals("D", StringComparison.Ordinal) == true)
- {
- dateFormatter.DateStyle = NSDateFormatterStyle.Long;
- var strDate = dateFormatter.StringFor(picker.Date);
- platformDatePicker.Text = strDate;
- }
- else
- {
- dateFormatter.DateStyle = NSDateFormatterStyle.Short;
- var strDate = dateFormatter.StringFor(picker.Date);
- platformDatePicker.Text = strDate;
- }
- }
- else if (format.Contains('/', StringComparison.Ordinal))
+ TimeZone = NSTimeZone.FromGMT(0)
+ };
+
+ if (format.Equals("D", StringComparison.Ordinal) == true)
{
- platformDatePicker.Text = datePicker.Date.ToString(format, CultureInfo.InvariantCulture);
+ dateFormatter.DateStyle = NSDateFormatterStyle.Long;
+ var strDate = dateFormatter.StringFor(picker.Date);
+ platformDatePicker.Text = strDate;
}
else
{
- platformDatePicker.Text = datePicker.Date.ToString(format);
+ dateFormatter.DateStyle = NSDateFormatterStyle.Short;
+ var strDate = dateFormatter.StringFor(picker.Date);
+ platformDatePicker.Text = strDate;
}
-
- platformDatePicker.UpdateCharacterSpacing(datePicker);
}
-
- public static void UpdateMinimumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
+ else if (format.Contains('/', StringComparison.Ordinal))
{
- platformDatePicker.UpdateMinimumDate(datePicker, null);
+ platformDatePicker.Text = datePicker.Date.ToString(format, CultureInfo.InvariantCulture);
}
-
- public static void UpdateMinimumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
+ else
{
- picker?.UpdateMinimumDate(datePicker);
+ platformDatePicker.Text = datePicker.Date.ToString(format);
}
- public static void UpdateMinimumDate(this UIDatePicker platformDatePicker, IDatePicker datePicker)
- {
- if (platformDatePicker != null)
- {
- platformDatePicker.MinimumDate = datePicker.MinimumDate.ToNSDate();
- }
- }
+ platformDatePicker.UpdateCharacterSpacing(datePicker);
+ }
- public static void UpdateMaximumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
- {
- platformDatePicker.UpdateMaximumDate(datePicker, null);
- }
+ public static void UpdateMinimumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
+ {
+ platformDatePicker.UpdateMinimumDate(datePicker, null);
+ }
- public static void UpdateMaximumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
- {
- picker?.UpdateMaximumDate(datePicker);
- }
+ public static void UpdateMinimumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
+ {
+ picker?.UpdateMinimumDate(datePicker);
+ }
- public static void UpdateMaximumDate(this UIDatePicker platformDatePicker, IDatePicker datePicker)
+ public static void UpdateMinimumDate(this UIDatePicker platformDatePicker, IDatePicker datePicker)
+ {
+ if (platformDatePicker != null)
{
- if (platformDatePicker != null)
- {
- platformDatePicker.MaximumDate = datePicker.MaximumDate.ToNSDate();
- }
+ platformDatePicker.MinimumDate = datePicker.MinimumDate.ToNSDate();
}
+ }
+
+ public static void UpdateMaximumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker)
+ {
+ platformDatePicker.UpdateMaximumDate(datePicker, null);
+ }
+
+ public static void UpdateMaximumDate(this MauiDatePicker platformDatePicker, IDatePicker datePicker, UIDatePicker? picker)
+ {
+ picker?.UpdateMaximumDate(datePicker);
+ }
- public static void UpdateTextAlignment(this MauiDatePicker nativeDatePicker, IDatePicker datePicker)
+ public static void UpdateMaximumDate(this UIDatePicker platformDatePicker, IDatePicker datePicker)
+ {
+ if (platformDatePicker != null)
{
- // TODO: Update TextAlignment based on the EffectiveFlowDirection property.
+ platformDatePicker.MaximumDate = datePicker.MaximumDate.ToNSDate();
}
}
+
+ public static void UpdateTextAlignment(this MauiDatePicker nativeDatePicker, IDatePicker datePicker)
+ {
+ // TODO: Update TextAlignment based on the EffectiveFlowDirection property.
+ }
}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/MauiTimePicker.cs b/src/Core/src/Platform/iOS/MauiTimePicker.cs
index 701065ab0e20..3203c1dc7c52 100644
--- a/src/Core/src/Platform/iOS/MauiTimePicker.cs
+++ b/src/Core/src/Platform/iOS/MauiTimePicker.cs
@@ -50,9 +50,10 @@ public MauiTimePicker()
public NSDate Date => Picker.Date;
- public void UpdateTime(TimeSpan time)
+ public void UpdateTime(TimeSpan? time)
{
- _picker.Date = new DateTime(1, 1, 1, time.Hours, time.Minutes, time.Seconds).ToNSDate();
+ _picker.Date = new DateTime(1, 1, 1, time?.Hours ?? 0,
+ time?.Minutes ?? 0, time?.Seconds ?? 0).ToNSDate();
}
#if !MACCATALYST
diff --git a/src/Core/src/Platform/iOS/TimePickerExtensions.cs b/src/Core/src/Platform/iOS/TimePickerExtensions.cs
index 1e6f76d9845a..276f601126ef 100644
--- a/src/Core/src/Platform/iOS/TimePickerExtensions.cs
+++ b/src/Core/src/Platform/iOS/TimePickerExtensions.cs
@@ -3,81 +3,88 @@
using Foundation;
using UIKit;
-namespace Microsoft.Maui.Platform
+namespace Microsoft.Maui.Platform;
+
+public static class TimePickerExtensions
{
- public static class TimePickerExtensions
+ public static void UpdateFormat(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
{
- public static void UpdateFormat(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
- {
- mauiTimePicker.UpdateTime(timePicker, null);
- }
+ mauiTimePicker.UpdateTime(timePicker, null);
+ }
- public static void UpdateFormat(this UIDatePicker picker, ITimePicker timePicker)
- {
- picker.UpdateTime(timePicker);
- }
+ public static void UpdateFormat(this UIDatePicker picker, ITimePicker timePicker)
+ {
+ picker.UpdateTime(timePicker);
+ }
- public static void UpdateFormat(this MauiTimePicker mauiTimePicker, ITimePicker timePicker, UIDatePicker? picker)
- {
- mauiTimePicker.UpdateTime(timePicker, picker);
- }
+ public static void UpdateFormat(this MauiTimePicker mauiTimePicker, ITimePicker timePicker, UIDatePicker? picker)
+ {
+ mauiTimePicker.UpdateTime(timePicker, picker);
+ }
- public static void UpdateTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
- {
- mauiTimePicker.UpdateTime(timePicker, null);
- }
+ public static void UpdateTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker)
+ {
+ mauiTimePicker.UpdateTime(timePicker, null);
+ }
- public static void UpdateTime(this UIDatePicker picker, ITimePicker timePicker)
+ public static void UpdateTime(this UIDatePicker picker, ITimePicker timePicker)
+ {
+ if (picker is not null)
{
- if (picker != null)
- picker.Date = new DateTime(1, 1, 1).Add(timePicker.Time).ToNSDate();
+ picker.Date = new DateTime(1, 1, 1).Add(timePicker?.Time ?? TimeSpan.Zero).ToNSDate();
}
+ }
- public static void UpdateTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker, UIDatePicker? picker)
- {
- picker?.UpdateTime(timePicker);
+ public static void UpdateTime(this MauiTimePicker mauiTimePicker, ITimePicker timePicker, UIDatePicker? picker)
+ {
+ picker?.UpdateTime(timePicker);
- var cultureInfo = Culture.CurrentCulture;
+ var cultureInfo = Culture.CurrentCulture;
- if (string.IsNullOrEmpty(timePicker.Format))
- {
- NSLocale locale = new NSLocale(cultureInfo.TwoLetterISOLanguageName);
+ if (string.IsNullOrEmpty(timePicker.Format))
+ {
+ NSLocale locale = new NSLocale(cultureInfo.TwoLetterISOLanguageName);
- if (picker != null)
- picker.Locale = locale;
+ if (picker is not null)
+ {
+ picker.Locale = locale;
}
+ }
- var time = timePicker.Time;
- var format = timePicker.Format;
+ var time = timePicker.Time;
+ var format = timePicker.Format;
- mauiTimePicker.Text = time.ToFormattedString(format, cultureInfo);
+ mauiTimePicker.Text = time?.ToFormattedString(format, cultureInfo);
- if (format != null)
+ if (format is not null)
+ {
+ if (format.Contains('H', StringComparison.Ordinal))
{
- if (format.Contains('H', StringComparison.Ordinal))
- {
- var ci = new CultureInfo("de-DE");
- NSLocale locale = new NSLocale(ci.TwoLetterISOLanguageName);
+ var ci = new CultureInfo("de-DE");
+ NSLocale locale = new NSLocale(ci.TwoLetterISOLanguageName);
- if (picker != null)
- picker.Locale = locale;
- }
- else if (format.Contains('h', StringComparison.Ordinal))
+ if (picker is not null)
{
- var ci = new CultureInfo("en-US");
- NSLocale locale = new NSLocale(ci.TwoLetterISOLanguageName);
-
- if (picker != null)
- picker.Locale = locale;
+ picker.Locale = locale;
}
}
+ else if (format.Contains('h', StringComparison.Ordinal))
+ {
+ var ci = new CultureInfo("en-US");
+ NSLocale locale = new NSLocale(ci.TwoLetterISOLanguageName);
- mauiTimePicker.UpdateCharacterSpacing(timePicker);
+ if (picker is not null)
+ {
+ picker.Locale = locale;
+ }
+ }
}
- public static void UpdateTextAlignment(this MauiTimePicker textField, ITimePicker timePicker)
- {
- // TODO: Update TextAlignment based on the EffectiveFlowDirection property.
- }
+ mauiTimePicker.UpdateCharacterSpacing(timePicker);
+ }
+
+ public static void UpdateTextAlignment(this MauiTimePicker textField, ITimePicker timePicker)
+ {
+ // TODO: Update TextAlignment based on the EffectiveFlowDirection property.
}
}
\ No newline at end of file
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 1beeea59c18a..93ca7e357927 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -140,3 +140,5 @@ Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
*REMOVED*static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry, Android.Graphics.Drawables.Drawable? clearButtonDrawable) -> void
*REMOVED*static Microsoft.Maui.Platform.EditTextExtensions.UpdateClearButtonVisibility(this Android.Widget.EditText! editText, Microsoft.Maui.IEntry! entry, System.Func? getClearButtonDrawable) -> void
override Microsoft.Maui.Platform.MauiTextView.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
index 19d7cea6dd55..6ed4bd3646d3 100644
--- a/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-ios/PublicAPI.Unshipped.txt
@@ -62,6 +62,8 @@ Microsoft.Maui.Platform.IAutoSizableCALayer.AutoSizeToSuperLayer() -> void
Microsoft.Maui.Platform.MauiHybridWebView
Microsoft.Maui.Platform.MauiHybridWebView.MauiHybridWebView(Microsoft.Maui.Handlers.HybridWebViewHandler! handler, CoreGraphics.CGRect frame, WebKit.WKWebViewConfiguration! configuration) -> void
Microsoft.Maui.Platform.MauiHybridWebView.SendRawMessage(string! rawMessage) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan time) -> void
+Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
Microsoft.Maui.Platform.MauiWKWebView.ContentProcessDidTerminate(WebKit.WKWebView! webView) -> void
Microsoft.Maui.Platform.UIWindowExtensions
Microsoft.Maui.TextAlignment.Justify = 3 -> Microsoft.Maui.TextAlignment
@@ -138,3 +140,5 @@ override Microsoft.Maui.Handlers.ImageButtonHandler.SetupContainer() -> void
override Microsoft.Maui.Handlers.PageHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
*REMOVED*override Microsoft.Maui.Platform.WrapperView.SetNeedsLayout() -> void
*REMOVED*override Microsoft.Maui.Platform.MauiView.SetNeedsLayout() -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
index f9585992e2dc..8bde8c84e807 100644
--- a/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-maccatalyst/PublicAPI.Unshipped.txt
@@ -63,6 +63,8 @@ Microsoft.Maui.Platform.IAutoSizableCALayer.AutoSizeToSuperLayer() -> void
Microsoft.Maui.Platform.MauiHybridWebView
Microsoft.Maui.Platform.MauiHybridWebView.MauiHybridWebView(Microsoft.Maui.Handlers.HybridWebViewHandler! handler, CoreGraphics.CGRect frame, WebKit.WKWebViewConfiguration! configuration) -> void
Microsoft.Maui.Platform.MauiHybridWebView.SendRawMessage(string! rawMessage) -> void
+*REMOVED*Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan time) -> void
+Microsoft.Maui.Platform.MauiTimePicker.UpdateTime(System.TimeSpan? time) -> void
Microsoft.Maui.Platform.MauiWKWebView.ContentProcessDidTerminate(WebKit.WKWebView! webView) -> void
Microsoft.Maui.Platform.UIWindowExtensions
Microsoft.Maui.TextAlignment.Justify = 3 -> Microsoft.Maui.TextAlignment
@@ -136,3 +138,5 @@ override Microsoft.Maui.Handlers.ImageButtonHandler.SetupContainer() -> void
override Microsoft.Maui.Handlers.PageHandler.SetVirtualView(Microsoft.Maui.IView! view) -> void
*REMOVED*override Microsoft.Maui.Platform.WrapperView.SetNeedsLayout() -> void
*REMOVED*override Microsoft.Maui.Platform.MauiView.SetNeedsLayout() -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
index 763558b9f579..0a1558c901bc 100644
--- a/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-tizen/PublicAPI.Unshipped.txt
@@ -89,4 +89,6 @@ static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Han
Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
Microsoft.Maui.Handlers.DataFlowDirection
Microsoft.Maui.Handlers.DataFlowDirection.FromPlatform = 1 -> Microsoft.Maui.Handlers.DataFlowDirection
-Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
\ No newline at end of file
+Microsoft.Maui.Handlers.DataFlowDirection.ToPlatform = 0 -> Microsoft.Maui.Handlers.DataFlowDirection
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
index c0e9889e091d..929df7085fe2 100644
--- a/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-windows/PublicAPI.Unshipped.txt
@@ -105,4 +105,6 @@ Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.Handlers.ISearchBarHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
static Microsoft.Maui.Platform.SearchBarExtensions.UpdateReturnType(this Microsoft.UI.Xaml.Controls.AutoSuggestBox! platformControl, Microsoft.Maui.ISearchBar! searchBar) -> void
*REMOVED*static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility horizontalScrollBarVisibility) -> void
-static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility visibility) -> void
\ No newline at end of file
+static Microsoft.Maui.Platform.ScrollViewerExtensions.UpdateScrollBarVisibility(this Microsoft.UI.Xaml.Controls.ScrollViewer! scrollViewer, Microsoft.Maui.ScrollOrientation orientation, Microsoft.Maui.ScrollBarVisibility visibility) -> void
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
index c71974ff852e..19981094e0a7 100644
--- a/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net/PublicAPI.Unshipped.txt
@@ -86,3 +86,5 @@ override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Gr
Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
index c71974ff852e..19981094e0a7 100644
--- a/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard/PublicAPI.Unshipped.txt
@@ -86,3 +86,5 @@ override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Gr
Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
index c71974ff852e..19981094e0a7 100644
--- a/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt
@@ -86,3 +86,5 @@ override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Gr
Microsoft.Maui.ISearchBar.SearchIconColor.get -> Microsoft.Maui.Graphics.Color!
static Microsoft.Maui.Handlers.SearchBarHandler.MapReturnType(Microsoft.Maui.IViewHandler! handler, Microsoft.Maui.ISearchBar! searchBar) -> void
Microsoft.Maui.ISearchBar.ReturnType.get -> Microsoft.Maui.ReturnType
+*REMOVED*Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan
+Microsoft.Maui.ITimePicker.Time.get -> System.TimeSpan?
diff --git a/src/Core/tests/DeviceTests/Stubs/TimePickerStub.cs b/src/Core/tests/DeviceTests/Stubs/TimePickerStub.cs
index 13716bd130e4..e9b5eb490fa7 100644
--- a/src/Core/tests/DeviceTests/Stubs/TimePickerStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/TimePickerStub.cs
@@ -1,15 +1,14 @@
using System;
-using Microsoft.Maui.Graphics;
namespace Microsoft.Maui.DeviceTests.Stubs
{
public partial class TimePickerStub : StubBase, ITimePicker
{
- TimeSpan _time;
+ TimeSpan? _time;
public string Format { get; set; }
- public TimeSpan Time
+ public TimeSpan? Time
{
get => _time;
set => SetProperty(ref _time, value);