Wpf and macOS #138

VladislavAntonyuk · 2018-06-01T01:11:35Z

No description provided.

msftclas · 2018-06-01T01:11:45Z

All CLA requirements met.

VladislavAntonyuk · 2018-06-01T01:58:18Z

@mattleibow Please review

mattleibow · 2018-06-01T15:03:35Z

Is there a reason you are using a pre-release of forms? I would like to avoid this if possible.

mattleibow · 2018-06-01T15:03:44Z

build

mattleibow · 2018-06-01T15:06:31Z

src/SignaturePad.Forms.Shared/SignaturePadCanvasView.cs


 namespace SignaturePad.Forms
 {
-	[RenderWith (typeof (SignaturePadCanvasRenderer))]


How does this break the renderer?

The page is not rendered at all, and throw the exeption unable to cast to Xamarin.Forms.IRegistable

But this problem should go away now since we have a WPF renderer?

Yes, I have returned it

VladislavAntonyuk · 2018-06-01T15:15:07Z

I'll recheck with latest stable Xamarin forms

mattleibow

This looks good so far, but a few changes to make the code a bit cleaner.

is it possible to use the floating point types? eg PointF, SizeF and RectangleF. This will reduce the need for the #if NET471
add some magic extension methods to hide the logic and keep the main code clean.
a new define WINDOWS_DESKTOP or even `WINDOWS_WPF (just in case we go Windows.Forms)
use a stable version of Forms if we can.

mattleibow · 2018-06-01T15:13:48Z

src/SignaturePad.Forms.Droid/SignaturePad.Forms.Droid.csproj

-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.4.0" PrivateAssets="All" />
-    <PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.5.4" PrivateAssets="All" />
+    <PackageReference Include="Xamarin.Forms" Version="3.1.0.469394-pre1" />


Is it possible to use a stable version of forms here?

yes, I am in progress

mattleibow · 2018-06-01T15:14:58Z

src/SignaturePad.Forms.Platform.Shared/ColorExtensions.cs

 using Android.Widget;
 using Xamarin.Forms.Platform.Android;
 using NativeColor = Android.Graphics.Color;
+#elif NET471


I think it may be better to declare a WINDOWS_DESKTOP define and use that - if we ever change the .net version, then we will have to update code all over the place.

NETFRAMEWORK variable goes by default. I use it

mattleibow · 2018-06-01T15:15:35Z

src/SignaturePad.Forms.Platform.Shared/SignaturePadCanvasRenderer.cs

+#elif NET471
+using Xamarin.Forms.Platform.WPF;
+using NativeSignaturePadCanvasView = Xamarin.Controls.SignaturePadCanvasView;
+using NativePoint = System.Drawing.Point;


Is there a reason why we can't use PointF?

Also, I just noticed that you are using System.Drawing.Xxx is it possible to use the WPF types instead? System.Windows.Point, System.Windows.Size and System.Windows.Rect.

I had a look at the code, and they are using the WPF Point, Size and Rect - which are double based.

it must be styluspoint as default for wpf, my mistake

mattleibow · 2018-06-01T15:16:00Z

src/SignaturePad.Forms.Platform.Shared/SignaturePadCanvasRenderer.cs

 			if (ctrl != null)
 			{
+#if NET471
+				ctrl.LoadPoints (e.Points.Select (p => new NativePoint ((int)p.X, (int)p.Y)).ToArray ());


If it is possible to use PointF and SizeF, then nothing has to change here.

stylus point works ok with float so it is redundant and removed

mattleibow · 2018-06-01T15:16:41Z

src/SignaturePad.Forms.Shared/SignaturePadCanvasView.cs


 namespace SignaturePad.Forms
 {
-	[RenderWith (typeof (SignaturePadCanvasRenderer))]


But this problem should go away now since we have a WPF renderer?

mattleibow · 2018-06-01T15:27:52Z

src/SignaturePad.InkPresenter.Shared/InkPresenter.cs

+			}
+
+			paths.Add (new InkStroke (newpath, strokePoints, color, width));
+#else


Can we use extension methods here as well? See the other platforms: https://github.com/xamarin/SignaturePad/blob/master/src/SignaturePad.Shared/Extensions.cs

All smoke and mirrors, but I would like to keep these files clean of #if so it is easier to modify and understand.

mattleibow · 2018-06-01T15:28:36Z

src/SignaturePad.Shared/SignaturePadCanvasView.cs


+#if NET471
+			var size = this.RenderSize;
+#else


This could also be an extension method: https://github.com/xamarin/SignaturePad/blob/master/src/SignaturePad.Shared/Extensions.cs

mattleibow · 2018-06-01T15:29:29Z

src/SignaturePad.Shared/SignaturePadCanvasView.cs

+			{
+				signatureBounds = new NativeRect (0, 0, (float)viewSize.Width, (float)viewSize.Height);
+			}
+#else


Is there a reason for this copy?

ah, I see. floats, ints and types... hopefully we can use the XxxF

I've just updated review, and remove all redundant # where it possible

viewSize Width is double so we can't avoid casting

mattleibow · 2018-06-01T15:32:10Z

src/SignaturePad.Shared/SignaturePadView.cs

 		private static readonly NativeColor SignaturePadLightColor = Windows.UI.Colors.White;
+#elif NET471
+		private static readonly NativeColor SignaturePadDarkColor = new NativeColor () { A = System.Drawing.Color.Black.A, B = System.Drawing.Color.Black.B, G = System.Drawing.Color.Black.G, R = System.Drawing.Color.Black.R };
+		private static readonly NativeColor SignaturePadLightColor = new NativeColor () { A = System.Drawing.Color.White.A, B = System.Drawing.Color.White.B, G = System.Drawing.Color.White.G, R = System.Drawing.Color.White.R };


For this, there is the https://docs.microsoft.com/en-us/dotnet/api/system.windows.media.colors?view=netframework-4.7.1

mattleibow · 2018-06-01T15:35:08Z

src/SignaturePad.WPF/InkPresenter.cs

+
+namespace Xamarin.Controls
+{
+	partial class InkPresenter : System.Windows.Ink.StrokeCollection


Maybe rather than a new type, is it possible to just add a using?
using InkPresenter = System.Windows.Ink.StrokeCollection

removed as redundant

mattleibow · 2018-06-01T15:39:23Z

@VladislavAntonyuk looks good so far, looking forward to merging this for the world.

mattleibow · 2018-06-03T05:29:00Z

Build

VladislavAntonyuk · 2018-06-03T09:05:46Z

Could not load file or assembly 'netstandard, Version=2.0.0.0 Please add it on your CI

VladislavAntonyuk · 2018-06-07T05:11:07Z

@mattleibow do you have any objections not to merge it?

mattleibow · 2018-06-07T23:16:00Z

No, but I have been travelling and not had a chance to do a more detailed review and have a look at it running. I will be back in the office next week, so I hope to merge then.

G tk

VladislavAntonyuk · 2020-03-28T12:01:25Z

@adampenn I have push new changes. Make sure you have install gtk, uwp 18362, android sdk 29. I suggest you to use build.ps1 or build.sh to generate nuget package

* Create main.yml * Update main.yml

VladislavAntonyuk · 2020-03-28T14:41:01Z

I setup CI, you can download artifacts there (see readme in my fork).

adampenn · 2020-03-30T18:14:36Z

nuget/Xamarin.Controls.SignaturePad.nuspec

-    <file src="output/uwp/Themes/Generic.xbf" target="lib/uap10.0/SignaturePad/Themes/Generic.xbf" />
-    <file src="output/uwp/SignaturePad.xr.xml" target="lib/uap10.0/SignaturePad/SignaturePad.xr.xml" />
+    <file src="output/uwp/SignaturePad/Themes/Generic.xaml" target="lib/uap10.0/SignaturePad/Themes/Generic.xaml" />
+    <file src="output/uwp/SignaturePad/SignaturePad.xr.xml" target="lib/uap10.0/SignaturePad/SignaturePad.xr.xml" />


These two files dont seem to be ending up in the output directory

build output for uwp

I apologize, I was not clear, I see them there but I do not see them in the nuget package. I see it in the signaturePad nuget package but not the signaturepad.forms package

Makes me think its just not getting copied to one of the packages

I would appreciate, if you create a PR, so I will check I setup permissions right.

Bumps Win2D.uwp from 1.24.0 to 1.25.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

…#6) Bumps [Microsoft.NETCore.UniversalWindowsPlatform](https://github.com/Microsoft/dotnet) from 6.2.10 to 6.2.11. - [Release notes](https://github.com/Microsoft/dotnet/releases) - [Commits](https://github.com/Microsoft/dotnet/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

…#11) Bumps [Microsoft.NETCore.UniversalWindowsPlatform](https://github.com/Microsoft/dotnet) from 6.2.11 to 6.2.12. - [Release notes](https://github.com/Microsoft/dotnet/releases) - [Commits](https://github.com/Microsoft/dotnet/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bumps Win2D.uwp from 1.25.0 to 1.26.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bumps Win2D.uwp from 1.25.0 to 1.26.0. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vladislav Antonyuk <33021114+VladislavAntonyuk@users.noreply.github.com>

VladislavAntonyuk added 2 commits June 1, 2018 03:18

wpf support

c4182a5

wpf project

331906f

VladislavAntonyuk added 2 commits June 1, 2018 04:35

Support foe xamarin forms

205f61f

add missed packages

7a7c2d9

VladislavAntonyuk added 2 commits June 1, 2018 16:08

build cake fix and samples

c0b0317

samples wpf

ed58feb

Fix rendererwith which blockes wpf renderer

dea7b84

mattleibow reviewed Jun 1, 2018

View reviewed changes

mattleibow suggested changes Jun 1, 2018

View reviewed changes

VladislavAntonyuk added 10 commits June 1, 2018 19:57

CR fix

0e2402c

use net 461

fb5b99e

Some more improves

58160cb

Remove InkPresenter, use StrokeCollection

85414d3

Init signaturepad

f1282ce

Return renderer. remove redundant inits

6e9323d

Use native where possible

3f219bb

remove redundant code

d3b4fa8

Fix stackoverflowexception

6a20b27

Fix problem when strokes and points were not binded

83263cc

VladislavAntonyuk mentioned this pull request Jun 1, 2018

Support for desktop #137

Open

Merge pull request #2 from VladislavAntonyuk/GTk

d48b550

G tk

fix build

dc23c6b

VladislavAntonyuk force-pushed the WPF branch from 09e6a7a to dc23c6b Compare March 28, 2020 12:02

VladislavAntonyuk and others added 8 commits March 28, 2020 14:12

fix samples

e3aa5b8

fix certificate expired, update packages from preview to stable

4777c75

setup appveyor script

a6d41af

fix script

71286c9

use IPhoneSimulator Platform

25ca50d

restore nuget packages

34509cf

Create main.yml (#3)

2c877ba

* Create main.yml * Update main.yml

Update Readme

f7bd822

VladislavAntonyuk force-pushed the WPF branch from e8a5525 to f7bd822 Compare March 28, 2020 14:22

Install software for appveyor

36fc9b1

fix appveyor

c17506d

adampenn reviewed Mar 30, 2020

View reviewed changes

adampenn and others added 2 commits March 31, 2020 17:56

Added two files that were missing to output for SignaturePad.Forms (#4)

ccf91d3

install boots from sh

e5ba0d1

VladislavAntonyuk force-pushed the WPF branch from 2c25b7d to e5ba0d1 Compare May 30, 2020 16:27

VladislavAntonyuk and others added 2 commits May 31, 2020 16:16

remove macos from appveyor

9d13078

Bump Win2D.uwp from 1.24.0 to 1.25.0 (#5)

c13586d

Bumps Win2D.uwp from 1.24.0 to 1.25.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

VladislavAntonyuk mentioned this pull request Oct 19, 2020

[Enhancement] GesturePad xamarin/XamarinCommunityToolkit#467

Closed

2 tasks

dependabot-preview bot and others added 7 commits November 21, 2020 01:02

Update AndroidManifest.xml

7f9c271

Update AndroidManifest.xml

61b7e83

Upgrade to GitHub-native Dependabot (#13)

aef663b

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Bump Win2D.uwp from 1.25.0 to 1.26.0 (#12)

a3db48d

Bumps Win2D.uwp from 1.25.0 to 1.26.0. Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

Wpf and macOS #138

Are you sure you want to change the base?

Wpf and macOS #138

Uh oh!

Conversation

VladislavAntonyuk commented Jun 1, 2018

Uh oh!

msftclas commented Jun 1, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VladislavAntonyuk commented Jun 1, 2018

Uh oh!

mattleibow commented Jun 1, 2018

Uh oh!

mattleibow commented Jun 1, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VladislavAntonyuk commented Jun 1, 2018

Uh oh!

mattleibow left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mattleibow commented Jun 1, 2018

Uh oh!

mattleibow commented Jun 3, 2018

Uh oh!

VladislavAntonyuk commented Jun 3, 2018

Uh oh!

msftclas commented Jun 1, 2018 •

edited

Loading

mattleibow left a comment •

edited

Loading

VladislavAntonyuk commented Mar 28, 2020 •

edited

Loading