diff options
| author | kingces95 <kingces95@users.noreply.github.com> | 2017-03-07 14:56:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-07 14:56:24 -0500 |
| commit | e6d5186c8acbf37b877c7ca3c77a378352a3743d (patch) | |
| tree | d61ca8ea619f7844e9e0a973dbd7bac794e39147 /Xamarin.Forms.Platform.WinRT.Tablet | |
| parent | 2b92142ab2a501de71d3572efc0e5deb2b7bae9a (diff) | |
| download | xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.gz xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.tar.bz2 xamarin-forms-e6d5186c8acbf37b877c7ca3c77a378352a3743d.zip | |
Remove InternalsVisibleTo from Core to XF.Platforms.* (#782)
* Remove InternalsVisibleTo from Core to XF.Platforms.*
* Changes per Jason's code review
* Move LockableObservableListWrapper to internals namespace
* Changes per Stephane's code review
* update docs
* Touch code to get CI to run tests
* Rebase; Update documentation
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT.Tablet')
| -rw-r--r-- | Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs | 11 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.WinRT.Tablet/WindowsResourcesProvider.cs | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs b/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs index 2f639099..3072ad08 100644 --- a/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs +++ b/Xamarin.Forms.Platform.WinRT.Tablet/Forms.cs @@ -8,6 +8,7 @@ using Windows.Foundation.Metadata; using Windows.UI.Core; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; +using Xamarin.Forms.Internals; #if WINDOWS_UWP using Xamarin.Forms.Platform.UWP; @@ -34,13 +35,13 @@ namespace Xamarin.Forms return; var accent = (SolidColorBrush)Windows.UI.Xaml.Application.Current.Resources["SystemColorControlAccentBrush"]; - Color.Accent = Color.FromRgba(accent.Color.R, accent.Color.G, accent.Color.B, accent.Color.A); + Color.SetAccent(Color.FromRgba(accent.Color.R, accent.Color.G, accent.Color.B, accent.Color.A)); Log.Listeners.Add(new DelegateLogListener((c, m) => Debug.WriteLine(LogFormat, c, m))); Windows.UI.Xaml.Application.Current.Resources.MergedDictionaries.Add(GetTabletResources()); - Device.Idiom = TargetIdiom.Tablet; + Device.SetIdiom(TargetIdiom.Tablet); Device.PlatformServices = new WindowsPlatformServices(Window.Current.Dispatcher); Device.Info = new WindowsDeviceInfo(); @@ -48,13 +49,13 @@ namespace Xamarin.Forms switch (DetectPlatform()) { case Windows.Foundation.Metadata.Platform.Windows: - Device.Idiom = TargetIdiom.Desktop; + Device.SetIdiom(TargetIdiom.Desktop); break; case Windows.Foundation.Metadata.Platform.WindowsPhone: - Device.Idiom = TargetIdiom.Phone; + Device.SetIdiom(TargetIdiom.Phone); break; default: - Device.Idiom = TargetIdiom.Tablet; + Device.SetIdiom(TargetIdiom.Tablet); break; } #endif diff --git a/Xamarin.Forms.Platform.WinRT.Tablet/WindowsResourcesProvider.cs b/Xamarin.Forms.Platform.WinRT.Tablet/WindowsResourcesProvider.cs index c4485679..7d6ea8ba 100644 --- a/Xamarin.Forms.Platform.WinRT.Tablet/WindowsResourcesProvider.cs +++ b/Xamarin.Forms.Platform.WinRT.Tablet/WindowsResourcesProvider.cs @@ -1,6 +1,7 @@ using Windows.UI.Text; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; +using Xamarin.Forms.Internals; using WStyle = Windows.UI.Xaml.Style; #if WINDOWS_UWP |