From aa9ab1e1addb27b91b43b73c8387b97617c52629 Mon Sep 17 00:00:00 2001 From: David <github.site@torick.net> Date: Wed, 2 Jun 2021 14:00:28 -0400 Subject: [PATCH] chore: Config diff --- build/PackageDiffIgnore.xml | 37 ++++++++++++++++++- .../CalendarDatePicker.Properties.cs | 4 +- .../CalendarViewBaseItemChrome.cs | 14 ------- .../CalendarView/CalendarViewDayItem.uno.cs | 23 ++++++++++++ .../CalendarView/CalendarView_Partial.cs | 2 +- 5 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewDayItem.uno.cs diff --git a/build/PackageDiffIgnore.xml b/build/PackageDiffIgnore.xml index bc9b37f494f1..95d336e548cc 100644 --- a/build/PackageDiffIgnore.xml +++ b/build/PackageDiffIgnore.xml @@ -3681,15 +3681,50 @@ <Member fullName="System.Void Windows.ApplicationModel.LeavingBackgroundEventArgs..ctor()" reason="Not part of the UWP API" /> + <Member + fullName="System.Void Windows.UI.Xaml.Controls.CalendarViewDayItemChangingEventArgs..ctor()" + reason="Not part of the UWP API" /> + <Member + fullName="System.Void Windows.UI.Xaml.Controls.CalendarViewSelectedDatesChangedEventArgs..ctor()" + reason="Not part of the UWP API" /> + <Member + fullName="Removed method System.Void Windows.UI.Xaml.Automation.Provider.IRawElementProviderSimple..ctor()" + reason="Not part of the UWP API" /> + <Member + fullName="System.Void Windows.UI.Xaml.FrameworkElement.OnIsEnabledChanged(System.Boolean oldValue, System.Boolean newValue)" + reason="Internal method which is not part of the UWP API" /> + <Member + fullName="System.Void Windows.UI.Xaml.Controls.NativeListViewBase.OnIsEnabledChanged(System.Boolean oldValue, System.Boolean newValue)" + reason="Internal method which is not part of the UWP API" /> + <Member + fullName="System.Void Windows.UI.Xaml.Controls.NativePagedView.OnIsEnabledChanged(System.Boolean oldValue, System.Boolean newValue)" + reason="Internal method which is not part of the UWP API" /> + <Member + fullName="System.Void Uno.UI.Controls.Legacy.GridView.OnIsEnabledChanged(System.Boolean oldValue, System.Boolean newValue)" + reason="Internal method which is not part of the UWP API" /> + <Member + fullName="System.Void Uno.UI.Controls.Legacy.ListView.OnIsEnabledChanged(System.Boolean oldValue, System.Boolean newValue)" + reason="Internal method which is not part of the UWP API" /> + <Member + fullName="System.Void Uno.UI.Controls.Legacy.HorizontalGridView.OnIsEnabledChanged(System.Boolean oldValue, System.Boolean newValue)" + reason="Internal method which is not part of the UWP API" /> + <Member + fullName="System.Void Uno.UI.Controls.Legacy.HorizontalListView.OnIsEnabledChanged(System.Boolean oldValue, System.Boolean newValue)" + reason="Internal method which is not part of the UWP API" /> </Methods> <Fields> <Member fullName="Windows.UI.Xaml.DependencyProperty Microsoft.UI.Xaml.Controls.XamlControlsResources::UseCompactResourcesProperty" reason="This should be a property, not a field" /> + <Member + fullName="System.Int32 Windows.UI.Xaml.Automation.Peers.PatternInterface::value__" + reason="This enum is an uint in UWP, not an int" /> </Fields> <Properties> </Properties> - </IgnoreSet> <!-- + </IgnoreSet> + + <!-- Supported nodes (please keep at the bottom of this file): <Types> </Types> diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarDatePicker.Properties.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarDatePicker.Properties.cs index 9a0a989b634e..d6e74270a018 100644 --- a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarDatePicker.Properties.cs +++ b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarDatePicker.Properties.cs @@ -54,14 +54,14 @@ public string DayOfWeekFormat } public static DependencyProperty DescriptionProperty { get; } = DependencyProperty.Register( - "Description", typeof(string), typeof(CalendarDatePicker), new PropertyMetadata(default(string))); + "Description", typeof(object), typeof(CalendarDatePicker), new PropertyMetadata(default(object))); #if __IOS__ || __MACOS__ public new // .Description already exists on NSObject (both macOS & iOS) #else public #endif - string Description + object Description { get => (string)GetValue(DescriptionProperty); set => SetValue(DescriptionProperty, value); diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.cs index e0c3972387d5..c155d9c62a39 100644 --- a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.cs +++ b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewBaseItemChrome.cs @@ -672,20 +672,6 @@ private protected CalendarView GetOwner() return m_wrOwner.Target; } - // We are not supporting rendering of those density bars yet - [global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")] - public void SetDensityColors(IEnumerable<Color> colors) - { - global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Xaml.Controls.CalendarViewDayItem", "void CalendarViewDayItem.SetDensityColors(IEnumerable<Color> colors)"); - - // UNO TODO - // As the code for density bars has not been tested yet, we prefer to just do nothing with provided colors! - - //var c = new ValueTypeCollection<Color>(); - //c.SetView(colors.ToList()); - //SetDensityColors(c); - } - internal void SetDensityColors( IIterable<Color> pColors) { diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewDayItem.uno.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewDayItem.uno.cs new file mode 100644 index 000000000000..0393246d2592 --- /dev/null +++ b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarViewDayItem.uno.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace Windows.UI.Xaml.Controls +{ + partial class CalendarViewDayItem + { + // We are not supporting rendering of those density bars yet + [global::Uno.NotImplemented("__ANDROID__", "__IOS__", "NET461", "__WASM__", "__SKIA__", "__NETSTD_REFERENCE__", "__MACOS__")] + public void SetDensityColors(IEnumerable<Color> colors) + { + global::Windows.Foundation.Metadata.ApiInformation.TryRaiseNotImplemented("Windows.UI.Xaml.Controls.CalendarViewDayItem", "void CalendarViewDayItem.SetDensityColors(IEnumerable<Color> colors)"); + + // UNO TODO + // As the code for density bars has not been tested yet, we prefer to just do nothing with provided colors! + + //var c = new ValueTypeCollection<Color>(); + //c.SetView(colors.ToList()); + //base.SetDensityColors(c); + } + } +} diff --git a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs index 1acaa22f95e0..197c7012455e 100644 --- a/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs +++ b/src/Uno.UI/UI/Xaml/Controls/CalendarView/CalendarView_Partial.cs @@ -1710,7 +1710,7 @@ private void ScrollToDateWithAnimation( return; } - internal void SetDisplayDate( DateTime date) + public void SetDisplayDate(DateTime date) { // if m_dateSourceChanged is true, this means we might changed m_minDate or m_maxDate // so we should not call CoerceDate until next measure pass, by then the m_minDate and