From b2ad3e53a8ae03536cf9071b0bd5d0207ee2f10c Mon Sep 17 00:00:00 2001 From: Paul DiPietro Date: Mon, 11 Apr 2016 09:50:28 -0700 Subject: Enable CS0618 warnings as errors (#72) CS0618 occurs when using an obsolete property or method. https://msdn.microsoft.com/en-us/library/x5ye6x1e.aspx --- ICSharpCode.Decompiler/Ast/AstBuilder.cs | 2 + .../Ast/TypesHierarchyHelpers.cs | 8 +++ .../ICSharpCode.Decompiler.csproj | 4 +- .../AddingMultipleItemsListView.cs | 4 ++ .../Bugzilla27581.cs | 2 + .../Bugzilla27642.cs | 6 ++ .../Bugzilla28575.cs | 2 + .../Bugzilla29247.cs | 2 + .../Bugzilla29453.cs | 4 ++ .../Bugzilla31029.cs | 2 + .../Bugzilla31114.cs | 2 + .../Bugzilla31255.cs | 2 + .../Bugzilla32040.cs | 2 + .../Bugzilla32691.cs | 2 + .../Bugzilla32898.cs | 2 + .../Bugzilla34561.cs | 2 + .../Bugzilla35294.cs | 2 + .../ComplexListView.cs | 6 ++ .../Issue1026.cs | 5 ++ .../Issue1075.cs | 2 + .../Issue1267.cs | 4 ++ .../Issue1384.cs | 11 ++++ .../Issue1590.cs | 6 ++ .../Issue1593.cs | 11 +++- .../Issue1598.cs | 2 + .../Issue1613.cs | 13 +++++ .../Issue1769.cs | 4 ++ .../Issue181.cs | 5 ++ .../Issue2259.cs | 2 + .../Issue229.cs | 5 ++ .../Issue2563.cs | 5 ++ .../Issue2597.cs | 2 + .../Issue2634.cs | 65 ++++++++++++++++++++++ .../Issue2951.xaml.cs | 2 + .../Issue2961.cs | 10 ++++ .../Issue2976.cs | 8 +++ .../ScrollViewOutOfBounds.cs | 4 ++ .../StackLayoutIssue.cs | 7 +++ .../CoreGalleryPages/LabelCoreGalleryPage.cs | 17 ++++++ .../GalleryPages/GroupedListContactsGallery.cs | 2 + .../GalleryPages/LabelGallery.cs | 36 ++++++++++++ .../GalleryPages/ListViewDemoPage.cs | 10 ++++ .../GalleryPages/NavigationBarGallery.cs | 2 + .../Xamarin.Forms.Controls.csproj | 6 +- .../Xamarin.Forms.Core.Android.UITests.csproj | 6 +- .../Xamarin.Forms.Core.Windows.UITests.csproj | 4 +- Xamarin.Forms.Core.iOS.UITests/BaseTestFixture.cs | 4 ++ .../Xamarin.Forms.Core.iOS.UITests.csproj | 6 +- Xamarin.Forms.Maps.Android/FormsMaps.cs | 2 + Xamarin.Forms.Maps.Android/MapRenderer.cs | 7 +++ .../Xamarin.Forms.Maps.Android.csproj | 6 +- .../AppCompat/ButtonRenderer.cs | 2 + .../AppCompat/FormsAppCompatActivity.cs | 2 + .../AppCompat/Platform.cs | 4 ++ .../Cells/BaseCellView.cs | 14 +++++ .../Cells/EntryCellView.cs | 2 + Xamarin.Forms.Platform.Android/ColorExtensions.cs | 2 + Xamarin.Forms.Platform.Android/Platform.cs | 18 +++++- .../Renderers/ButtonRenderer.cs | 4 ++ .../Renderers/CarouselPageRenderer.cs | 4 ++ .../Renderers/FormattedStringExtensions.cs | 2 + .../Renderers/FrameRenderer.cs | 2 + .../Renderers/LabelRenderer.cs | 4 ++ .../Renderers/ListViewAdapter.cs | 2 + .../Renderers/MasterDetailRenderer.cs | 2 + .../Renderers/TableViewModelRenderer.cs | 2 + .../Renderers/WebViewRenderer.cs | 4 ++ Xamarin.Forms.Platform.Android/ResourceManager.cs | 2 + Xamarin.Forms.Platform.Android/ViewExtensions.cs | 11 +++- .../Xamarin.Forms.Platform.Android.csproj | 6 +- .../Xamarin.Forms.Platform.UAP.csproj | 16 +++--- Xamarin.Forms.Platform.WP8/LabelRenderer.cs | 5 +- Xamarin.Forms.Platform.WP8/Platform.cs | 8 +++ .../VisualElementRenderer.cs | 2 + .../Xamarin.Forms.Platform.WP8.csproj | 18 +++--- Xamarin.Forms.Platform.WinRT/LabelRenderer.cs | 4 ++ .../VisualElementExtensions.cs | 2 + Xamarin.Forms.Platform.WinRT/WebViewRenderer.cs | 2 + .../Renderers/FormattedStringExtensions.cs | 2 + .../Renderers/NavigationRenderer.cs | 4 ++ .../Xamarin.Forms.Platform.iOS.Classic.csproj | 8 +-- .../Xamarin.Forms.Platform.iOS.csproj | 8 +-- Xamarin.Forms.Xaml.UnitTests/FontConverterTests.cs | 2 + .../Issues/Bz24910.xaml.cs | 2 + .../Issues/Bz29300.xaml.cs | 4 ++ .../Issues/Issue2742.xaml.cs | 2 + Xamarin.Forms.Xaml.UnitTests/Issues/TestCases.cs | 2 + Xamarin.Forms.Xaml.UnitTests/LoaderTests.cs | 2 + .../TypeConverterTestsLegacy.cs | 4 ++ .../Xamarin.Forms.Xaml.UnitTests.csproj | 6 +- 90 files changed, 475 insertions(+), 54 deletions(-) diff --git a/ICSharpCode.Decompiler/Ast/AstBuilder.cs b/ICSharpCode.Decompiler/Ast/AstBuilder.cs index faab2725..9826388f 100644 --- a/ICSharpCode.Decompiler/Ast/AstBuilder.cs +++ b/ICSharpCode.Decompiler/Ast/AstBuilder.cs @@ -1661,7 +1661,9 @@ namespace ICSharpCode.Decompiler.Ast if (member.DeclaringType.BaseType != null) { var baseTypeRef = member.DeclaringType.BaseType; while (baseTypeRef != null) { +#pragma warning disable 618 var baseType = baseTypeRef.ResolveOrThrow(); +#pragma warning restore 618 if (baseType.HasProperties && AnyIsHiddenBy(baseType.Properties, member, m => !m.IsIndexer())) return true; if (baseType.HasEvents && AnyIsHiddenBy(baseType.Events, member)) diff --git a/ICSharpCode.Decompiler/Ast/TypesHierarchyHelpers.cs b/ICSharpCode.Decompiler/Ast/TypesHierarchyHelpers.cs index e4131904..19e7ff24 100644 --- a/ICSharpCode.Decompiler/Ast/TypesHierarchyHelpers.cs +++ b/ICSharpCode.Decompiler/Ast/TypesHierarchyHelpers.cs @@ -370,10 +370,14 @@ namespace ICSharpCode.Decompiler.Ast var baseType = type.Item.BaseType; var genericBaseType = baseType as GenericInstanceType; if (genericBaseType != null) { +#pragma warning disable 618 type = new GenericContext(genericBaseType.ResolveOrThrow(), +#pragma warning restore 618 genericBaseType.GenericArguments.Select(t => type.ResolveWithContext(t))); } else +#pragma warning disable 618 type = new GenericContext(baseType.ResolveOrThrow()); +#pragma warning restore 618 yield return type; } } @@ -441,7 +445,9 @@ namespace ICSharpCode.Decompiler.Ast var resolvedElementType = ResolveWithContext(typeSpecification.ElementType); return ReplaceElementType(typeSpecification, resolvedElementType); } +#pragma warning disable 618 return type.ResolveOrThrow(); +#pragma warning restore 618 } TypeReference ReplaceElementType(TypeSpecification ts, TypeReference newElementType) @@ -460,7 +466,9 @@ namespace ICSharpCode.Decompiler.Ast return new ByReferenceType(newElementType); } // TODO: should we throw an exception instead calling Resolve method? +#pragma warning disable 618 return ts.ResolveOrThrow(); +#pragma warning restore 618 } public GenericContext ApplyTo(T2 item) where T2 : class diff --git a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj index b00bed97..7bfc0abe 100644 --- a/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj +++ b/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj @@ -44,11 +44,11 @@ true - 0618;0219;0414 + 0219;0414 true - 0618;0219;0414 + 0219;0414 diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs index 1dbd3ada..e3879f74 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs @@ -363,7 +363,9 @@ namespace Xamarin.Forms.Controls public CustomViewCell () { var jobId = new Label { +#pragma warning disable 618 Font = Font.SystemFontOfSize(20), +#pragma warning restore 618 WidthRequest = 105, VerticalOptions = LayoutOptions.Center, @@ -381,7 +383,9 @@ namespace Xamarin.Forms.Controls var hours = new Label { WidthRequest = 45, VerticalOptions = LayoutOptions.Center, +#pragma warning disable 618 XAlign = TextAlignment.End, +#pragma warning restore 618 HorizontalOptions = LayoutOptions.EndAndExpand, }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs index 511e9860..5f87b93b 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs @@ -15,7 +15,9 @@ namespace Xamarin.Forms.Controls VerticalOptions = LayoutOptions.FillAndExpand, Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = "Tap input field, then try to scroll" }, new WebView { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs index ec2c203e..71acf625 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs @@ -93,7 +93,9 @@ namespace Xamarin.Forms.Controls for (var i = 0; i < 100; i++) sb.Append ("View 1a with ScrollView +++ "); +#pragma warning disable 618 var label = new Label { Text = sb.ToString (), HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, XAlign = TextAlignment.Center, }; +#pragma warning restore 618 scrollView.Content = label; @@ -118,7 +120,9 @@ namespace Xamarin.Forms.Controls for (var i = 0; i < 50; i++) sb.Append ("View 1b with ScrollView and recreation of content +++++ "); +#pragma warning disable 618 var label = new Label { Text = sb.ToString (), HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, XAlign = TextAlignment.Center, }; +#pragma warning restore 618 scrollView.Content = label; @@ -132,7 +136,9 @@ namespace Xamarin.Forms.Controls public View2 () { BackgroundColor = Color.Teal; +#pragma warning disable 618 Content = new Label { Text = "View 2", HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, XAlign = TextAlignment.Center, }; +#pragma warning restore 618 } } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs index 665dec2d..04f6fe61 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs @@ -21,7 +21,9 @@ namespace Xamarin.Forms.Controls listview.Header = new Label () { Text = _header, TextColor = Color.Red, +#pragma warning disable 618 XAlign = TextAlignment.Center +#pragma warning restore 618 }; var b = new Button () { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs index 74828e71..2cef1cf9 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs @@ -19,7 +19,9 @@ namespace Xamarin.Forms.Controls VerticalOptions = LayoutOptions.Center, Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = "Welcome to Xamarin Forms!" }, new Button { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs index ce6e5e12..f3962da3 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs @@ -18,7 +18,9 @@ namespace Xamarin.Forms.Controls var page1Layout = new StackLayout { Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = "Page 1" } } @@ -27,7 +29,9 @@ namespace Xamarin.Forms.Controls var page2Layout = new StackLayout { Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = "Page 2" } } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs index 9f9594a2..1d73f9a5 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs @@ -29,7 +29,9 @@ namespace Xamarin.Forms.Controls Content = new StackLayout { Children = { btn, +#pragma warning disable 618 new Label {Text = "GeneratedImage", Font=Font.BoldSystemFontOfSize(NamedSize.Medium)}, +#pragma warning restore 618 generatedImage }, Padding = new Thickness (0, 20, 0, 0), diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs index e7f5be4d..8f56fdbb 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs @@ -240,7 +240,9 @@ namespace Xamarin.Forms.Controls _secondaryLabel = new Label() { HeightRequest = 40, FontSize = 16, TranslationY = -5, LineBreakMode = LineBreakMode.TailTruncation }; _secondaryLabel.SetBinding(Label.TextProperty, "SecondaryLabelText"); +#pragma warning disable 618 _distanceLabel = new Label() { XAlign = TextAlignment.End, HorizontalOptions = LayoutOptions.EndAndExpand, FontSize = 11, LineBreakMode = LineBreakMode.NoWrap }; +#pragma warning restore 618 _distanceLabel.SetBinding(Label.TextProperty, "OtherLabelText"); _statusCircle = new Label() diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs index 378077e0..65c36f2b 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs @@ -19,7 +19,9 @@ namespace Xamarin.Forms.Controls var stack = new StackLayout () { VerticalOptions = LayoutOptions.Center }; stack.Children.Add (new Label () { VerticalOptions = +#pragma warning disable 618 LayoutOptions.Center, XAlign = TextAlignment.Center, Text = "Page 1" +#pragma warning restore 618 }); Content = stack; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs index a6d9c830..d935cd49 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs @@ -25,7 +25,9 @@ namespace Xamarin.Forms.Controls }; var entryCell = new EntryCell { Text = "yaddayadda" }; +#pragma warning disable 618 entryCell.XAlign = TextAlignment.End; +#pragma warning restore 618 entryCell.Label = "Click Here"; entryCell.Tapped += (s, e) => { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs index 7277f606..9b6250d4 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs @@ -22,7 +22,9 @@ namespace Xamarin.Forms.Controls protected override void Init () { +#pragma warning disable 618 var label = new Label () { XAlign = TextAlignment.Center }; +#pragma warning restore 618 var image = new Image (); image.PropertyChanged += (sender, e) => { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs index ceb91e2b..61771506 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs @@ -23,7 +23,9 @@ namespace Xamarin.Forms.Controls stack.Children.Add (new Label () { VerticalOptions = LayoutOptions.Center, +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = "Page 1" }); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs index 3bce1e75..525179a5 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs @@ -62,7 +62,9 @@ namespace Xamarin.Forms.Controls void NewMenuItem_Clicked (object sender, EventArgs e) { +#pragma warning disable 618 ParentView.Navigation.PushAsync (new NextPage (), false); +#pragma warning restore 618 } } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs index 036b7a91..d4b7ea8a 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs @@ -19,7 +19,9 @@ namespace Xamarin.Forms.Controls Label header = new Label { Text = "Should not see blue", +#pragma warning disable 618 Font = Font.BoldSystemFontOfSize(40), +#pragma warning restore 618 HorizontalOptions = LayoutOptions.Center, TextColor = Color.Black }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs index 2e2fa690..83b1f65a 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs @@ -56,10 +56,14 @@ namespace Xamarin.Forms.Controls if (s_mImgRenewal == null) s_mImgRenewal = ImageSource.FromFile ("bank.png"); +#pragma warning disable 618 var label1 = new Label { Text = "Label 1", Font = Font.SystemFontOfSize (NamedSize.Small, FontAttributes.Bold) }; +#pragma warning restore 618 label1.SetBinding (Label.TextProperty, new Binding (".")); +#pragma warning disable 618 var label2 = new Label { Text = "Label 2", Font = Font.SystemFontOfSize (NamedSize.Small) }; +#pragma warning restore 618 // was ListButton? var button = new Button { @@ -71,7 +75,9 @@ namespace Xamarin.Forms.Controls button.Clicked += (sender, e) => { var b = (Button) sender; var t = b.CommandParameter; +#pragma warning disable 618 ((ContentPage) ((ListView) ((StackLayout) b.ParentView).ParentView).ParentView).DisplayAlert ("Clicked", +#pragma warning restore 618 t + " button was clicked", "OK"); Debug.WriteLine ("clicked" + t); }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs index 58c2b646..84d55530 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs @@ -77,8 +77,13 @@ namespace Xamarin.Forms.Controls new Label { Text = "by subscribing, you accept the general conditions.", TextColor = Color.White, +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Micro), +#pragma warning restore 618 WidthRequest = 262, HorizontalOptions = LayoutOptions.Center, }, diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs index 54a8eb9a..4ad4a2b3 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs @@ -16,7 +16,9 @@ namespace Xamarin.Forms.Controls Label header = new Label { Text = "Picker", +#pragma warning disable 618 Font = Font.BoldSystemFontOfSize(50), +#pragma warning restore 618 HorizontalOptions = LayoutOptions.Center }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs index f194670d..7e31c126 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs @@ -23,10 +23,14 @@ namespace Xamarin.Forms.Controls grid.Children.Add (label = new Label (),0,1); label.SetBinding (Label.TextProperty, "LastName"); +#pragma warning disable 618 grid.Children.Add (label = new Label {XAlign = TextAlignment.End},1,0); +#pragma warning restore 618 label.SetBinding (Label.TextProperty, "Zip"); +#pragma warning disable 618 grid.Children.Add (label = new Label {XAlign = TextAlignment.End},1,1); +#pragma warning restore 618 label.SetBinding (Label.TextProperty, "City"); View = grid; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs index 0bf8aeab..04003d8f 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs @@ -14,10 +14,17 @@ namespace Xamarin.Forms.Controls grid.Children.Add (new Image {Source = "photo.jpg", Aspect = Aspect.AspectFit}); grid.Children.Add (new Label { Opacity =.75, +#pragma warning disable 618 YAlign = TextAlignment.Start, +#pragma warning restore 618 + +#pragma warning disable 618 XAlign = TextAlignment.End, +#pragma warning restore 618 Text ="top and flush right", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Large), +#pragma warning restore 618 VerticalOptions=LayoutOptions.Start, HorizontalOptions=LayoutOptions.End, HeightRequest=30, @@ -25,9 +32,13 @@ namespace Xamarin.Forms.Controls }); grid.Children.Add (new Label { Opacity =.75, +#pragma warning disable 618 YAlign = TextAlignment.End, +#pragma warning restore 618 Text ="bottom and flush left", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Large), +#pragma warning restore 618 VerticalOptions=LayoutOptions.End, HeightRequest=40, TextColor = Color.White, diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs index 2e1c70c7..16a81af2 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs @@ -88,10 +88,14 @@ namespace Xamarin.Forms.Controls.TestCasesPages { public ModuleMediaListItemTemplate() { +#pragma warning disable 618 var title = new Label { YAlign = TextAlignment.Center }; +#pragma warning restore 618 title.SetBinding(Label.TextProperty, new Binding("Title", BindingMode.OneWay)); +#pragma warning disable 618 var description = new Label { YAlign = TextAlignment.Center }; +#pragma warning restore 618 description.SetBinding(Label.TextProperty, new Binding("Description", BindingMode.OneWay)); View = new StackLayout @@ -108,7 +112,9 @@ namespace Xamarin.Forms.Controls.TestCasesPages { public ModuleMediaListHeaderTemplate() { +#pragma warning disable 618 var title = new Label { TextColor = Color.White, YAlign = TextAlignment.Center }; +#pragma warning restore 618 title.SetBinding(Label.TextProperty, new Binding("SectionName", BindingMode.OneWay)); View = new StackLayout diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs index 238ab936..ccaccea9 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs @@ -14,7 +14,9 @@ namespace Xamarin.Forms.Controls { var title = new Label { Text = "Select League", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Large), +#pragma warning restore 618 TextColor = Color.White }; @@ -22,7 +24,9 @@ namespace Xamarin.Forms.Controls var seasonLabel = new Label { Text = "Season", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Small), +#pragma warning restore 618 TextColor = Color.White }; @@ -45,7 +49,9 @@ namespace Xamarin.Forms.Controls var sportLabel = new Label { Text = "Sport", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Small), +#pragma warning restore 618 TextColor = Color.White }; @@ -96,8 +102,9 @@ namespace Xamarin.Forms.Controls BackgroundColor = Color.Gray, ItemTemplate = new DataTemplate (() => { var leagueName = new Label { - Font = - Font.SystemFontOfSize (NamedSize.Large), +#pragma warning disable 618 + Font = Font.SystemFontOfSize (NamedSize.Large), +#pragma warning restore 618 BackgroundColor = Color.Transparent, TextColor = Color.White, VerticalOptions = LayoutOptions.CenterAndExpand, diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs index bb448743..000afaea 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs @@ -69,7 +69,9 @@ namespace Xamarin.Forms.Controls new Label () { Text = title, VerticalOptions = LayoutOptions.CenterAndExpand, +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Large, +#pragma warning restore 618 FontAttributes.Bold) } } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs index 1eaf95e4..05c42021 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs @@ -28,9 +28,17 @@ namespace Xamarin.Forms.Controls.TestCasesPages var name = new Label { Text = "Foo", +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 Font = Font.SystemFontOfSize(30, FontAttributes.Bold), +#pragma warning restore 618 TextColor = Color.White, }; @@ -45,8 +53,13 @@ namespace Xamarin.Forms.Controls.TestCasesPages var addressLabel = new Label { Text = "Loading address…", +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center, +#pragma warning restore 618 }; var map = new Map { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs index 3eabf8e2..6e647125 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs @@ -38,7 +38,9 @@ namespace Xamarin.Forms.Controls Label header = new Label { Text = "Switch", +#pragma warning disable 618 Font = Font.BoldSystemFontOfSize(50), +#pragma warning restore 618 HorizontalOptions = LayoutOptions.Center }; @@ -52,7 +54,9 @@ namespace Xamarin.Forms.Controls _label = new Label { Text = "Switch is now False", +#pragma warning disable 618 Font = Font.SystemFontOfSize(NamedSize.Large), +#pragma warning restore 618 HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.CenterAndExpand }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs index e290c4a6..cd785a7b 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs @@ -21,8 +21,13 @@ namespace Xamarin.Forms.Controls Text = "I should have red text", TextColor = Color.Red, BackgroundColor = new Color (0.5, 0.5, 0.5), +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center +#pragma warning restore 618 } }; } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs index 125f1a60..eaca951e 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs @@ -40,7 +40,9 @@ namespace Xamarin.Forms.Controls new Person ("Abigail", new DateTime (1975, 1, 15), Color.Aqua), new Person ("Bob", new DateTime (1976, 2, 20), Color.Black), new Person ("Cathy", new DateTime (1977, 3, 10), Color.Blue), +#pragma warning disable 618 new Person ("David", new DateTime (1978, 4, 25), Color.Fuschia), +#pragma warning restore 618 }; var buttonAdd = new Button { diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs index d0c36ac2..3aeeeff9 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs @@ -15,8 +15,13 @@ namespace Xamarin.Forms.Controls var label = new Label { Text = "I should have a toolbar item", +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center +#pragma warning restore 618 }; var refreshBtn = new ToolbarItem ("Refresh", null, () => label.Text = "Clicking it works"); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs index 538d1553..81a5cf6c 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs @@ -24,8 +24,13 @@ namespace Xamarin.Forms.Controls Title = "Page " + i, Content = new Label { Text = "Page " + i, +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center +#pragma warning restore 618 } }, random.NextDouble () > 0.5); } diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs index 7d925018..b9f1b926 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs @@ -31,7 +31,9 @@ namespace Xamarin.Forms.Controls _label = new Label { Text = "Stepper value is 0", +#pragma warning disable 618 Font = Font.SystemFontOfSize(NamedSize.Large), +#pragma warning restore 618 HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.CenterAndExpand }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs index 992b342f..8d858c85 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs @@ -81,7 +81,9 @@ namespace Xamarin.Forms.Controls var slFirstName = new StackLayout { Orientation = StackOrientation.Vertical }; var lblFirstNameLabel = new Label { Text = "First Name", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold), +#pragma warning restore 618 TextColor = textColor }; _firstNameEntry = new Entry { @@ -96,7 +98,9 @@ namespace Xamarin.Forms.Controls var slMiddleName = new StackLayout { Orientation = StackOrientation.Vertical }; var lblMiddleNameLabel = new Label { Text = "Middle Name", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold), +#pragma warning restore 618 TextColor = textColor }; var entMiddleName = new Entry { @@ -111,7 +115,9 @@ namespace Xamarin.Forms.Controls var slLastName = new StackLayout { Orientation = StackOrientation.Vertical }; var lblLastNameLabel = new Label { Text = "Last Name", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold), +#pragma warning restore 618 TextColor = textColor }; var entLastName = new Entry { @@ -126,9 +132,13 @@ namespace Xamarin.Forms.Controls var slDob = new StackLayout { Orientation = StackOrientation.Vertical }; var lblDobLabel = new Label { Text = "Date of Birth", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold), +#pragma warning restore 618 TextColor = textColor, +#pragma warning disable 618 XAlign = TextAlignment.Start +#pragma warning restore 618 }; var entDob = new Entry { TextColor = dataColor, @@ -142,9 +152,13 @@ namespace Xamarin.Forms.Controls var slGender = new StackLayout { Orientation = StackOrientation.Vertical }; var lblGenderLabel = new Label { Text = "Gender", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold), +#pragma warning restore 618 TextColor = textColor, +#pragma warning disable 618 XAlign = TextAlignment.Start +#pragma warning restore 618 }; slGender.Children.Add (lblGenderLabel); @@ -154,9 +168,13 @@ namespace Xamarin.Forms.Controls var slHomePhone = new StackLayout { Orientation = StackOrientation.Vertical }; var lblHomePhoneLabel = new Label { Text = "Home Phone", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold), +#pragma warning restore 618 TextColor = textColor, +#pragma warning disable 618 XAlign = TextAlignment.Start +#pragma warning restore 618 }; var entHomePhone = new Entry { TextColor = dataColor, @@ -173,9 +191,13 @@ namespace Xamarin.Forms.Controls var slMobilePhone = new StackLayout { Orientation = StackOrientation.Vertical }; var lblMobilePhoneLabel = new Label { Text = "Mobile Phone", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold), +#pragma warning restore 618 TextColor = textColor, +#pragma warning disable 618 XAlign = TextAlignment.Start +#pragma warning restore 618 }; var entMobilePhone = new Entry { TextColor = dataColor, @@ -257,23 +279,44 @@ namespace Xamarin.Forms.Controls Font dataFont = Font.SystemFontOfSize (NamedSize.Medium); var nameData = new Label { TextColor = txtColor, +#pragma warning disable 618 Font = dataFont, +#pragma warning restore 618 + +#pragma warning disable 618 XAlign = TextAlignment.Start, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center, +#pragma warning restore 618 VerticalOptions = LayoutOptions.Center }; nameData.SetBinding (Label.TextProperty, "Name"); var genderData = new Label { TextColor = txtColor, +#pragma warning disable 618 Font = dataFont, +#pragma warning restore 618 + +#pragma warning disable 618 XAlign = TextAlignment.Start, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center, +#pragma warning restore 618 VerticalOptions = LayoutOptions.Center }; genderData.SetBinding (Label.TextProperty, "Gender"); var slNameGender = new StackLayout { Orientation = StackOrientation.Horizontal }; +#pragma warning disable 618 var lblGender1 = new Label { Text = " (", Font = dataFont }; +#pragma warning restore 618 + +#pragma warning disable 618 var lblGender2 = new Label { Text = ")", Font = dataFont }; +#pragma warning restore 618 slNameGender.Children.Add (nameData); slNameGender.Children.Add (lblGender1); slNameGender.Children.Add (genderData); @@ -283,13 +326,23 @@ namespace Xamarin.Forms.Controls var lblDob = new Label { TextColor = txtColor, Text = "DOB: ", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold) +#pragma warning restore 618 }; var dobData = new Label { TextColor = txtColor, +#pragma warning disable 618 Font = dataFont, +#pragma warning restore 618 + +#pragma warning disable 618 XAlign = TextAlignment.Start, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center, +#pragma warning restore 618 VerticalOptions = LayoutOptions.Center }; dobData.SetBinding (Label.TextProperty, "DateOfBirth"); @@ -297,19 +350,31 @@ namespace Xamarin.Forms.Controls slDobPhone.Children.Add (lblDob); slDobPhone.Children.Add (dobData); +#pragma warning disable 618 var lblSpacer = new Label { Text = " ", Font = dataFont }; +#pragma warning restore 618 slDobPhone.Children.Add (lblSpacer); var lblPhone = new Label { TextColor = txtColor, Text = "PHONE: ", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Medium, FontAttributes.Bold) +#pragma warning restore 618 }; var phoneData = new Label { TextColor = txtColor, +#pragma warning disable 618 Font = dataFont, +#pragma warning restore 618 + +#pragma warning disable 618 XAlign = TextAlignment.Start, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center, +#pragma warning restore 618 VerticalOptions = LayoutOptions.Center }; phoneData.SetBinding (Label.TextProperty, "PrimaryPhone"); diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs index fb4b75ea..6aa21221 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs @@ -118,7 +118,9 @@ namespace Xamarin.Forms.Controls [Preserve (AllMembers = true)] public class ButtonExtensions { +#pragma warning disable 618 public static readonly BindableProperty IsPrimaryProperty = BindableProperty.CreateAttached ( +#pragma warning restore 618 bindable => GetIsPrimary (bindable), false, BindingMode.TwoWay, diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs index 24665ea7..237d5d5e 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs @@ -192,8 +192,13 @@ namespace Xamarin.Forms.Controls new Label { AutomationId = "lblHome", Text = "Sample Home page", +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center +#pragma warning restore 618 } } }; @@ -221,8 +226,13 @@ namespace Xamarin.Forms.Controls new Label { AutomationId = "lblAbout", Text = "Sample About page", +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center +#pragma warning restore 618 } } }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs index c5da93f5..a506907a 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs @@ -75,7 +75,9 @@ namespace Xamarin.Forms.Controls Padding = new Thickness (0, Device.OnPlatform(20,0,0), 0, 0), Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = Device.OnPlatform("Custom renderer UITableView","Custom renderer ListView","Custom renderer todo") }, fasterListView @@ -143,7 +145,9 @@ namespace Xamarin.Forms.Controls Padding = new Thickness (5, Device.OnPlatform(20,0,0), 5, 0), Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = "Xamarin.Forms built-in ListView" }, listView @@ -183,7 +187,9 @@ namespace Xamarin.Forms.Controls Padding = new Thickness (0, Device.OnPlatform(20,0,0), 0, 0), Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = "Xamarin.Forms native Cell" }, listView @@ -285,7 +291,9 @@ namespace Xamarin.Forms.Controls Padding = new Thickness (0, Device.OnPlatform(20,0,0), 0, 0), Children = { new Label { +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 Text = Device.OnPlatform("Custom UITableView+UICell","Custom ListView+Cell","Custom renderer todo") }, nativeListView2 diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs index e0abcc36..c0dd913b 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs @@ -10,7 +10,9 @@ namespace Xamarin.Forms.Controls { var header = new Label { Text = "ScrollView", +#pragma warning disable 618 Font = Font.SystemFontOfSize (50, FontAttributes.Bold), +#pragma warning restore 618 HorizontalOptions = LayoutOptions.Center }; @@ -43,7 +45,9 @@ namespace Xamarin.Forms.Controls "only at runtime, you should probably put it in " + "a StackLayout just to be sure your stuff doesn't " + "go running off the bottom of the screen.", +#pragma warning disable 618 Font = Font.SystemFontOfSize (NamedSize.Large) +#pragma warning restore 618 } }; diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs index 56931857..992a95aa 100644 --- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs +++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs @@ -23,12 +23,19 @@ namespace Xamarin.Forms.Controls var winPrizeLabel = new Label { Text = "Win a Xamarin Prize", +#pragma warning disable 618 XAlign = TextAlignment.Center, +#pragma warning restore 618 + +#pragma warning disable 618 YAlign = TextAlignment.Center, +#pragma warning restore 618 VerticalOptions = LayoutOptions.FillAndExpand }; +#pragma warning disable 618 Device.OnPlatform (iOS: () => winPrizeLabel.Font = Font.OfSize ("HelveticaNeue-UltraLight", NamedSize.Large)); +#pragma warning restore 618 StackLayout form = MakeForm (); diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs b/Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs index 9043c701..d29878b0 100644 --- a/Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs +++ b/Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs @@ -18,12 +18,29 @@ namespace Xamarin.Forms.Controls { base.Build (stackLayout); +#pragma warning disable 618 var namedSizeMediumBoldContainer = new ViewContainer