From ad7da29ff5c4347da3ca0d8c6e1970a0fc64abdf Mon Sep 17 00:00:00 2001 From: Gustavo Oliveira Date: Tue, 24 Aug 2021 15:28:50 +1000 Subject: [PATCH 1/3] Removed SetAppThemeColor --- samples/XCT.Sample/{Pages/Base => }/BasePage.cs | 1 - 1 file changed, 1 deletion(-) rename samples/XCT.Sample/{Pages/Base => }/BasePage.cs (92%) diff --git a/samples/XCT.Sample/Pages/Base/BasePage.cs b/samples/XCT.Sample/BasePage.cs similarity index 92% rename from samples/XCT.Sample/Pages/Base/BasePage.cs rename to samples/XCT.Sample/BasePage.cs index 046b74066..fc558e1ec 100644 --- a/samples/XCT.Sample/Pages/Base/BasePage.cs +++ b/samples/XCT.Sample/BasePage.cs @@ -33,7 +33,6 @@ Forms.Page PreparePage(SectionModel model) var page = (BasePage)Activator.CreateInstance(model.Type); page.Title = model.Title; page.DetailColor = model.Color; - page.SetAppThemeColor(BackgroundColorProperty, Color.White, Color.Black); return page; } } From e04cabc70f01a6ab11a4ac2bc8ed5f614a014173 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Wed, 10 Nov 2021 17:20:54 -0800 Subject: [PATCH 2/3] Move `BasePage` to `Pages` folder --- samples/XCT.Sample/{ => Pages/Base}/BasePage.cs | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename samples/XCT.Sample/{ => Pages/Base}/BasePage.cs (100%) diff --git a/samples/XCT.Sample/BasePage.cs b/samples/XCT.Sample/Pages/Base/BasePage.cs similarity index 100% rename from samples/XCT.Sample/BasePage.cs rename to samples/XCT.Sample/Pages/Base/BasePage.cs From 185492a89cd1d653d8e1d1925869a81dd20fe0ae Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Wed, 10 Nov 2021 17:21:12 -0800 Subject: [PATCH 3/3] Handle Null Dereferences introduced in .NET 6 --- .../Views/DrawingView/Service/DrawingViewService.macos.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/DrawingView/Service/DrawingViewService.macos.cs b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/DrawingView/Service/DrawingViewService.macos.cs index 478446c62..c4ca9f7ba 100644 --- a/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/DrawingView/Service/DrawingViewService.macos.cs +++ b/src/CommunityToolkit/Xamarin.CommunityToolkit/Views/DrawingView/Service/DrawingViewService.macos.cs @@ -26,7 +26,7 @@ public static Stream GetImageStream(IList? lines, return Stream.Null; } - return image.AsTiff().AsStream(); + return image?.AsTiff()?.AsStream() ?? Stream.Null; } /// @@ -55,7 +55,7 @@ public static Stream GetImageStream(IList? points, return Stream.Null; } - return image.AsTiff().AsStream(); + return image?.AsTiff()?.AsStream() ?? Stream.Null; } static NSImage? GetImageInternal(IList points, @@ -89,7 +89,7 @@ public static Stream GetImageStream(IList? points, context.AddLines(points.Select(p => new CGPoint(p.X - minPointX, p.Y - minPointY)).ToArray()); context.StrokePath(); - using var cgImage = context.ToImage(); + using var cgImage = context.ToImage() ?? throw new InvalidOperationException("Image Cannot be null"); NSImage image = new(cgImage, imageSize); return image; @@ -130,7 +130,7 @@ public static Stream GetImageStream(IList? points, context.StrokePath(); - using var cgImage = context.ToImage(); + using var cgImage = context.ToImage() ?? throw new InvalidOperationException("Image Cannot Be Null"); NSImage image = new(cgImage, imageSize); return image;