From 4131c6ba2c80ff5e507c4a2a2d0f7ecfdba9d477 Mon Sep 17 00:00:00 2001 From: Mark Allibone Date: Sat, 1 Sep 2018 08:00:22 +0200 Subject: [PATCH] Solve compile warnings in samples --- Samples/BugSweeper/BugSweeperPage.xaml.cs | 2 +- Samples/BugSweeper/Tile.cs | 8 ++++---- Samples/Xuzzle/XuzzleSquare.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Samples/BugSweeper/BugSweeperPage.xaml.cs b/Samples/BugSweeper/BugSweeperPage.xaml.cs index 527abe5..58bc23f 100755 --- a/Samples/BugSweeper/BugSweeperPage.xaml.cs +++ b/Samples/BugSweeper/BugSweeperPage.xaml.cs @@ -164,7 +164,7 @@ namespace BugSweeper { #if FIX_WINPHONE_BUTTON - if (Device.OS == TargetPlatform.WinPhone && !((Button)sender).IsEnabled) + if (Device.RuntimePlatform == Device.UWP && !((Button)sender).IsEnabled) return; #endif diff --git a/Samples/BugSweeper/Tile.cs b/Samples/BugSweeper/Tile.cs index b21e39c..0d54efb 100755 --- a/Samples/BugSweeper/Tile.cs +++ b/Samples/BugSweeper/Tile.cs @@ -36,7 +36,7 @@ namespace BugSweeper this.Col = col; this.BackgroundColor = Color.Yellow; - this.OutlineColor = Color.Blue; + this.BorderColor = Color.Blue; this.Padding = 2; label = new Label { @@ -64,7 +64,7 @@ namespace BugSweeper #if FIX_WINDOWS_DOUBLE_TAPS - if (Device.OS != TargetPlatform.Windows && Device.OS != TargetPlatform.WinPhone) { + if (Device.RuntimePlatform != Device.UWP) { #endif @@ -101,7 +101,7 @@ namespace BugSweeper #if FIX_WINDOWS_PHONE_NULL_CONTENT - if (Device.OS == TargetPlatform.WinPhone || Device.OS == TargetPlatform.Windows) { + if (Device.RuntimePlatform == Device.UWP) { this.Content = new Label { Text = " " }; } @@ -156,7 +156,7 @@ namespace BugSweeper #if FIX_WINDOWS_DOUBLE_TAPS - if (Device.OS == TargetPlatform.Windows || Device.OS == TargetPlatform.WinPhone) { + if (Device.RuntimePlatform == Device.UWP) { if (lastTapSingle && DateTime.Now - lastTapTime < TimeSpan.FromMilliseconds (500)) { OnDoubleTap (sender, args); lastTapSingle = false; diff --git a/Samples/Xuzzle/XuzzleSquare.cs b/Samples/Xuzzle/XuzzleSquare.cs index 203db53..a53fac0 100644 --- a/Samples/Xuzzle/XuzzleSquare.cs +++ b/Samples/Xuzzle/XuzzleSquare.cs @@ -32,7 +32,7 @@ namespace Xuzzle this.Padding = new Thickness(3); this.Content = new Frame { - OutlineColor = Color.Accent, + BorderColor = Color.Accent, Padding = new Thickness(5, 10, 5, 0), Content = new StackLayout {