Move C# Markup Extensions from Forms to Toolkit #522

VincentH-Net · 2020-11-02T14:57:21Z

Description of Change

Move the full C# Markup functionality from the Xamarin Forms CSharpForMarkup Part 2 PR into the XCT

With full git history from Forms repo
Without experimental feature flags
With working example app, ported from Introducing C# Markup for Xamarin.Forms
100% Unit test coverage; all tests green.
Two tests signaling Forms issue 12683 will fail after that issue is fixed; how to fix the tests then is included in TODO comments
As a separate NuGet package Xamarin.CommunityToolkit.Markup (with corresponding namespace), targeting Forms 5; no dependencies on other XCT package(s)

This XCT PR depends on Forms PR 12623; until this is available in a NuGet feed, this XCT PR downloads and unzips the NuGet packages of the Forms PR on the restore build target

Bugs Fixed

Fixes Move C# Markup Extensions from Forms to Toolkit #499

API Changes

Add API's documented in PR 29.

PR Checklist

Has tests (if omitted, state reason in description)
Has samples (if omitted, state reason in description)
Rebased on top of main at time of PR
Changes adhere to coding standard

Updated documentation in PR 29

* - Add MarkupExtensions from https://github.com/VincentH-Net/CSharpForMarkup/blob/061566282706de22d040e5b7b32bc3c2e3e323e3/src/XamarinFormsMarkupExtensions.cs - Remove specific converters - Fix .NETStandard 1 build errors by refactoring IConvertible to Enum generic constraints - Add RegisterDefaultBindableProperties method - Reformat source to comply with Forms contibuting guidelines * - Move markup extensions to Xamarin.Forms.Markup namespace to prevent impact on existing code and to support clear separation of UI markup from UI logic - Split up source file for better maintainability * Cleanup: - Names of generic types and variables to reflect where clauses - Namespaces remove unused & sort - Add whitespace - Remove unused file * Fix for incorrect type name in exception message Remove RowCol helpers because compiler cannot infer its generic type parameters. Use Row and Col methods instead * Add targetNullValue and fallbackValue parameters to binding helpers. Equivalent to https://github.com/VincentH-Net/CSharpForMarkup/tree/bd7f99957653f5e813ec805e3dad88aa487b9526 * rename binding helpers sourcePropertyName parameter to path * Enable Style<T> on BindableObject instead of Element to resolve xamarin/Xamarin.Forms#8342 (comment) * Fix for Grid properties Row, Col, RowSpan, ColumnSpan not set when default value is specified VincentH-Net/CSharpForMarkup#7 * Support DefaultBindableProperties for BindableObject (was limited to Element) * .Font: - Support any IFontElement (was limited to Button, Label, Entry and Picker) - Fix for italic ignored when bold == true * Fix for .FontSize, .Bold, .Italic return Label instead of type derived from Label * Unit tests batch 1: for LabelExtensions, LayoutExtensions, ViewExtensions * Add DefaultBindableProperties for more BindableObject types * Remove .Menu() helper from ViewInFlexLayoutExtensions (bc no relation to FlexLayout) * Fix for .Row and .Col without span specified still sets span * Rename MarkupBaseTestFixture.TestPropertySet to TestPropertiesSet * Add unit tests for ViewInFlexLayoutExtensions, ViewInGridExtensions and VisualElementExtensions * Add default bindable property for all applicable bindable objects in core. * Add unit tests for DefaultBindableProperties * Support Bind, Assign and Invoke on BindableObject (was Element) Add inline doc to clarify purpose of Bind overloads * Add unit tests for BindableObjectExtensions * Fix for attributes not set in .Font Rename fontSize parameter to size Enable .FontSize, .Bold and .Italic on IFontElement (was Label) * Add unit tests for ElementExtensions * Add unit tests for ElementExtensions * Add assert of exception message content in GetDefaultBindablePropertyForUnsupportedType * Add unit tests for EnumsForGridRowsAndColumns * Add inline doc to clarify purpose of gesture recognizer binding overloads Rename private constant bindingContextPropertyName to bindingContextPath for clarity * Add unit tests for Style; cleanup namespaces in Style * Simplify BindableObjectExtensions implementation (functionality unchanged) * Add IGestureRecognizers to GestureElement and View, to avoid code duplication when accessing the existing GestureRecognizers property * - Add specific helpers for more built-in gesture recognizers - Add helpers to support initializing gesture recognizers - Eliminate duplicate code for View and GestureElement by using new IGestureRecognizers - Simplify implementation - Rename ViewGesturesExtensions to ElementGesturesExtensions * Extract BindingHelpers from BindableObjectExtensionsTests * Add unit tests for ElementGesturesExtensions * Add support for typed converter parameters Add asserts for conversion values in unit tests * Add unit tests for FuncConverter * Add missing calls to Bind overloads in unit test for supporting derived types in BindableObject extensions fluent API * Cleanup: remove unneeded Xamarin.Forms. prefix from static class references * Add unit tests for PlatformSpecificsExtensions * Reorder FuncConverter type params to optimize for most common usage and to remain backwards compatible with https://github.com/VincentH-Net/CSharpForMarkup * Extend Bind*Gesture helpers to support all possible binding parameters * Rename EnumsForGridRowsAndColumns to GridRowColEnums * Add BindCommand helper to bind to default Command + CommandParameter properties Add RegisterForCommand to register default Command + CommandParameter properties for custom bindable objects * - Change Bind*Gesture helper parameters to match BindCommand parameters, to enable binding to Command + CommandParameter in a single compact call (removed parameters did not make sense for a command). - Add inline doc to more ElementGesturesExtensions helpers where needed - Improve ElementGesturesExtensions source formattting for consistency and readability * Remove PlatformSpecificsExtensions (only 2 iOS-only helpers; replace with guidance in PR description on how to use any platform specific with .Invoke) * Fix inline doc spelling: it's -> its * Rename TextLeft -> TextStart, TextRight -> TextEnd to support RTL * Add Columns.Define(width, width ...) and Rows.Define(height, height ...) overloads for Grid * Rename Grid rows & columns extensions class to GridRowsColumns * Change gesture recognizer helpers implementation from reuse existing instance to always add new instance * Change Bind*Gesture helpers default to not bind the commandparameter (is the more common scenario) * Rename BoolNotConverter to NotConverter and make it a 2-way converter * Add culture support to FuncConverter * Rename helpers Left -> Start, Right -> End Add opt-in LeftToRight and RightToLeft helpers * Rename Col -> Column throughout * Rename H -> Horizontal and V -> Vertical throughout * Add Markup_Experimental flag for all API methods and update all unit tests to run with and without the flag * Re-add "Markup_Experimental" flag * Add default bindable properties / test exclusions for new BindableObject types in core * Add constructorHint to FuncConverter and Style for more clear experimental flag message * Add default bindable property for RadioButton - fixes test AllBindableElementsInCoreHaveDefaultBindablePropertyOrAreExcluded failure

* Implement OnAppTheme * Implement AppThemeColor * Added tests * Finishing up * Implement UWP * Xcode 11 and additional test * Update Forms.cs * Update ViewRenderer.cs * Update ViewRenderer.cs * Remove IAppThemeProvider * Implemented RequestedThemeChanged * Update WindowsBasePlatformServices.cs * Bindable props and Android invalidate * Update DefaultBindableProperties.cs * Updates at runtime * Review feedback part 1 * Implement VisualElement.OnRequestedThemeChanged * UWP Dispatcher * Add experimental flag * ControlGallery restructure * Update ViewRenderer.cs * Update WindowsBasePlatformServices.cs * iOS pre-13 fix

* Various fixes * Back to basics

* Added Shapes to Core and Core Gallery samples Implemented basic Shapes on iOS * Added basic shapes Android implementation * Fixed UWP namespace conflicts * Fixed WPF namespace conflicts * Implemented basic shapes on UWP * Fixed UWP Ellipse and Rectangle size issue * Fixed Tizen Build * Changes to fix the build errors * Exclude shapes renderers from Tizen compilation * Implemented LineCap and LineJoin in Android and iOS * Implemented LineCap and LineJoin on UWP * Fixed build error * Updated Polygon sample * Fixed UWP Build error (namespace conflicts) * Fixed namespaces collision build error * Added "Shapes_Experimental" flag * Update UWP ShapeRenderer size logic * Updated iOS and Android ShapeRenderer size logic * Fixed UWP Build error * Added WPF implementation * Fixed Tizen Build error * Added Shapes macOS implementation * Fixed broken unit tests * Use the same Shapes classes between UWP and WPF backends * Fixed flipper macOS shape issue * Changed Shape class to be abstract * Added Polygon and Polyline unit tests * Added more Shapes Unit Tests * Moved Shapes to Xamarin.Forms.Shapes in Android, iOS and macOS * Moved Shapes to Xamarin.Forms.Shapes namespace in Windows (UWP and WPF) fixes #2452 (partially) fixes #9178

* Added Path definition in Core (Shapes) Implemented Path in Android and iOS * Fixed Android build errors * Fixed UWP Build * Fixed WPF Build * Implemented PathRenderer on UWP * Added unit tests * Fixed namespaces conflicts in Platform projects * Changes to fix the build errors * Implemented Path Transformations in Android and iOS * Fixed Build error in WPF and UWP * Implemented Path Transformations in UWP * Fixed iOS Build error * Changes to fix the Build (Path namespace conflict) * More changes to fix the build error * Fixed Windows Build errors * Fixed Path size issue on UWP * Added Shapes_Experimental flag * Updated path sample * Updated Android ShapeRenderer size logic * Added Shape Aspect sample in Core Gallery * Added more Shapes samples * Updated UWP PathRenderer size logic * Updated droid and iOS pathRenderer size logic (same behavior in all the platforms) * Updated UWP ShapeRenderer * Implemented Path in WPF Backend * Fixed build error * Initial Clip implementation in WPF and UWP (work in progress) * Added Path implementation on macOS * Added Clip implementation in Android, iOS and macOS * Fixed broken unit tests * Notify the change of Geometry if any of the child properties changed * Added new sample clipping different views * Fixed flipped shape issue on macOS * Added support to Clip using EllipseGeometry, LineGeometry and RectangleGeometry in UWP * Changed Shape class to be abstract * Moved Shapes to Xamarin.Forms.Shapes in Android, iOS and macOS * Moved Shapes to Xamarin.Forms.Shapes namespace in Windows (UWP and WPF) * Fixed wrong property in LineGeometry * Fixed build error * Added Clip Performance sample in Core Gallery * Update Matrix.cs * Update RectangleGeometry.cs * Update Xamarin.Forms.Platform.macOS.csproj * Some duplicate classes * Update PointCollectionTests.cs * Update ImageButtonRenderer.cs * Update Xamarin.Forms.Platform.iOS.csproj * Update Xamarin.Forms.Platform.iOS.csproj * Fixed tabs error Co-authored-by: Samantha Houts <[email protected]> fixes #2452 (partially) fixes #9178

…s (was only Layouts)

…o use named parameters across all FontElement extensions)

- Improve Bind markup helpers: add multibinding, make more strongly typed, remove converterParameter where unused - wip Add unit tests for multiconverter and multibind

wip Complete MultiBind unit tests

…ect> instead of a DataTemplate

…tion

…change namespace to Xamarin.CommunityToolkit.Markup, add TODO comments for inaccessible IPaddingElement

…lkit.Markup.UnitTests, remove experimental flag testing. add TODO comments for inacccessible API's

Get unit tests working and succeeding except for issue in Forms

Cleanup mocks and remove all unused code from them Remove all unnecessary namespace usings

…rate\Xamarin.Forms into main

… fix notimplemented exception in MockPlatformServices

revert adding warning codes in project files

…ase package

VincentH-Net · 2020-11-05T12:26:03Z

@jfversluis can you help me get the Xamarin.CommunityToolkit.Markup.UnitTests.csproj results visible? Thx!

The unit tests run in CI e.g. see log but they are not listed in the test overview and also not present in the test results tab in Azure Devops

There should be 1310 tests total (255 markup tests)

VincentH-Net · 2020-11-05T12:29:42Z

@jfversluis is it possible to enable code coverage in CI?
Markup is at 100%

jfversluis · 2020-11-05T12:37:41Z

Looks like I can see them just fine?

Note that for the screen in AzDO it filters automatically for only failed tests. If you disable that, they show up.

I'll have a look at the coverage.

VincentH-Net · 2020-11-05T12:42:23Z

@jfversluis

Looks like I can see them just fine?

Nope, those are only the Xamarin.CommunityToolkit.UnitTests.csproj tests.
The tests in Xamarin.CommunityToolkit.Markup.UnitTests.csproj are not included; try filtering on Passed and "Markup".

Once they are included you should see an additional 255 tests

jfversluis · 2020-11-05T12:53:06Z

You mean these?

VincentH-Net · 2020-11-05T13:04:33Z

You mean these?

@jfversluis yes! User error - I saw the top tests listed like this:

So I assumed my tests would also include the full namespace and I filtered on "Markup"
But for some reason my tests are shown like this:

(probably some NUnit default - I saw you use XUnit)

So that's why I never saw a result. 1055 is the correct total nr of tests

jfversluis · 2020-11-05T13:05:32Z

Yeah I agree, would be great if we can align that and get a bit better naming/categorising, etc. but something for later :)

jfversluis · 2020-11-05T13:10:10Z

If you pull in the change from #524 coverage is enabled too

VincentH-Net · 2020-11-05T15:40:08Z

If you pull in the change from #524 coverage is enabled too

@jfversluis merged; works. Thanks! Results:

Not counting tests, C# Markup is just 13% of total XCT blocks. XCT is bigger than I thought 👍

jfversluis · 2020-11-16T19:24:37Z

Can we switch this one to pre4 that should have all the bits? Then it's good to go afaic :)

remove custom Forms NuGet download targets update unit tests for Forms fix fix xamarin/Xamarin.Forms#12689

…lkit into main

Markup sample to Markup 1.0.0-pre4 and Forms 5.0.0.1709-pre4

VincentH-Net · 2020-11-17T10:23:19Z

Can we switch this one to pre4 that should have all the bits? Then it's good to go afaic :)

@jfversluis Done. Markup package version 1.0.0-pre4. All tests green; sample updated and tested; all works on Android, UWP and iOS.

Minor visual issue in the sample on iOS : the like button does not display - possibly a forms 5 issue; it uses FontImageSource.GlyphProperty with characters "\u2764" and "\u2661". Will look into that later but for now this can be released, assuming that the Markup package and build settings for public release are OK (I copied those from the main XCT package but can't verify them for myself)

jfversluis · 2020-11-17T11:04:20Z

The version of the package will be overriden at the time of release, but we'll figure that out also in light of #529

VincentH-Net and others added 30 commits February 27, 2020 15:03

AppTheme fix NRE (#10327)

6041c1e

* Various fixes * Back to basics

Add fluent DynamicResource markup helpers

8efeb48

Add support for all IPaddingElement Elements to Padding markup helper…

4c1361d

…s (was only Layouts)

Make family first parameter of Font markup helper (reduces the need t…

5a0fda7

…o use named parameters across all FontElement extensions)

Add Stars(double) markup helper for Grids

768f989

Add RelativeLayout markup helpers

1dbad19

wip Add RelativeLayoutTests

71112b8

Add RelativeLayout markup helpers done

237495b

Add BindableLayout markup helpers

a13b0d6

wip Add MultiBind and MultiConverter support to markup helpers

775c792

- Add multiconverter markup helpers

bdd2749

- Improve Bind markup helpers: add multibinding, make more strongly typed, remove converterParameter where unused - wip Add unit tests for multiconverter and multibind

wip Add unit tests for multibind

9547a98

Move MultiBind helpers + tests to separate files

1d91464

wip Complete MultiBind unit tests

wip Add unit tests for MultiBind markup helpers

e58f254

Add unit tests for MultiBind and MultiConvert markup helpers

f4bd242

Add overloads for Bindable Layout markup helpers that take a Func<obj…

3f953fb

…ect> instead of a DataTemplate

move C# Markup out of forms with internalsvisibleto, eliminate reflec…

989f652

…tion

Markup API: build against Forms 5 NuGet, remove experimental checks, …

e8dbc78

…change namespace to Xamarin.CommunityToolkit.Markup, add TODO comments for inaccessible IPaddingElement

Build against Forms 5 NuGet, change namespace to Xamarin.CommunityToo…

758e17c

…lkit.Markup.UnitTests, remove experimental flag testing. add TODO comments for inacccessible API's

Add PR link to TODO comment

8933cd4

Update to Forms NuGets that have public IPaddingElement

6af8949

Get unit tests working and succeeding except for issue in Forms

Bring unit tests to 100% code coverage

e55f028

Cleanup mocks and remove all unused code from them Remove all unnecessary namespace usings

Merge branch 'markup-to-xct' of C:\Users\Admin\Source\Repos\MarkupMig…

7490df5

…rate\Xamarin.Forms into main

prefix Markup top-level folders with Xamarin.CommunityToolkit.

94d4cd4

add Xamarin.CommunityToolkit.Markup.sln, eliminate Markup subfolders,…

a103467

… fix notimplemented exception in MockPlatformServices

include stylecop.json in Markup project

ad24a72

VincentH-Net added 4 commits November 4, 2020 19:25

fix Forms version warning

d5815a2

revert adding warning codes in project files

ci run all tests in single task

8c5f0c3

align markup csproj to XCT csproj for same type of debug info in rele…

232b0bb

…ase package

update forms version in markup sample

5342a5f

VincentH-Net mentioned this pull request Nov 5, 2020

Add documentation for C# Markup MicrosoftDocs/xamarin-communitytoolkit#29

Merged

4 tasks

VincentH-Net marked this pull request as ready for review November 5, 2020 12:30

merge main to enable code coverage in ci

61f24c1

jfversluis added this to the v1.0 milestone Nov 5, 2020

jfversluis added the a/Markup label Nov 5, 2020

Merge branch 'main' into main

2f59c0c

jfversluis added the api-change 🚨 label Nov 5, 2020

Merge branch 'main' into main

f7c75a2

jsuarezruiz mentioned this pull request Nov 6, 2020

Remove markup extensions xamarin/Xamarin.Forms#12730

Merged

2 tasks

VincentH-Net added 3 commits November 17, 2020 08:35

update to Forms 5.0.0.1709-pre4

2162bd4

remove custom Forms NuGet download targets update unit tests for Forms fix fix xamarin/Xamarin.Forms#12689

Merge branch 'main' of https://github.com/xamarin/XamarinCommunityToo…

e017f6b

…lkit into main

Markup package version to 1.0.0-pre4

3fdb935

Markup sample to Markup 1.0.0-pre4 and Forms 5.0.0.1709-pre4

jfversluis approved these changes Nov 17, 2020

View reviewed changes

jfversluis merged commit c030809 into xamarin:main Nov 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Move C# Markup Extensions from Forms to Toolkit #522

Move C# Markup Extensions from Forms to Toolkit #522

Uh oh!

VincentH-Net commented Nov 2, 2020 •

edited

Loading

Uh oh!

VincentH-Net commented Nov 5, 2020 •

edited

Loading

Uh oh!

VincentH-Net commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

VincentH-Net commented Nov 5, 2020 •

edited

Loading

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

VincentH-Net commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

VincentH-Net commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 16, 2020

Uh oh!

VincentH-Net commented Nov 17, 2020

Uh oh!

jfversluis commented Nov 17, 2020

Uh oh!

Uh oh!

Move C# Markup Extensions from Forms to Toolkit #522

Move C# Markup Extensions from Forms to Toolkit #522

Uh oh!

Conversation

VincentH-Net commented Nov 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of Change

Bugs Fixed

API Changes

PR Checklist

Uh oh!

VincentH-Net commented Nov 5, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

VincentH-Net commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

VincentH-Net commented Nov 5, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

VincentH-Net commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 5, 2020

Uh oh!

VincentH-Net commented Nov 5, 2020

Uh oh!

jfversluis commented Nov 16, 2020

Uh oh!

VincentH-Net commented Nov 17, 2020

Uh oh!

jfversluis commented Nov 17, 2020

Uh oh!

Uh oh!

VincentH-Net commented Nov 2, 2020 •

edited

Loading

VincentH-Net commented Nov 5, 2020 •

edited

Loading

VincentH-Net commented Nov 5, 2020 •

edited

Loading