Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[housekeeping] Automated PR to fix formatting errors #1142

Merged
merged 1 commit into from
Jun 2, 2021
+13 −12
Merged

[housekeeping] Automated PR to fix formatting errors #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/Controls/samples/Controls.Sample/Pages/MainPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,9 @@ void SetupMauiLayout()
verticalStack.Add(new Entry { Keyboard = Keyboard.Email, Placeholder = "Email Entry" });
verticalStack.Add(new Entry { Placeholder = "This is a blue text box", BackgroundColor = Colors.CornflowerBlue });

verticalStack.Add(new GraphicsView { Drawable = new TestDrawable(), HeightRequest = 50, WidthRequest = 200 }); ;

verticalStack.Add(new GraphicsView { Drawable = new TestDrawable(), HeightRequest = 50, WidthRequest = 200 });
;

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Their still an extra ; needs fixed here should not be two?

verticalStack.Add(new ProgressBar { Progress = 0.5 });
verticalStack.Add(new ProgressBar { Progress = 0.5, BackgroundColor = Colors.LightCoral });
verticalStack.Add(new ProgressBar { Progress = 0.5, ProgressColor = Colors.Purple });
Expand Down Expand Up @@ -563,7 +564,7 @@ void AddTextResizeDemo(Microsoft.Maui.ILayout layout)
layout.Add(widthAndHeightTestLabel);
layout.Add(explicitWidthTestLabel);
}

void SetupVisibilityTest()
{
var layout = new VerticalStackLayout() { BackgroundColor = Colors.BurlyWood };
Expand Down Expand Up @@ -607,9 +608,9 @@ void SetupVisibilityTest()
layout.Add(alwaysVisible);

Content = layout;
}
class TestDrawable : IDrawable
}

class TestDrawable : IDrawable
{
public void Draw(ICanvas canvas, RectangleF dirtyRect)
{
Expand All @@ -618,6 +619,6 @@ public void Draw(ICanvas canvas, RectangleF dirtyRect)
canvas.FillRoundedRectangle(0, 0, 200, 50, 10);
canvas.RestoreState();
}
}
}
}
}
4 changes: 2 additions & 2 deletions src/Core/src/Handlers/Picker/PickerHandler.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
using System.Linq;
using Android.App;
using Android.Content.Res;
using Android.Graphics.Drawables;
using Android.Text;
using Android.Text.Style;
using Android.Graphics.Drawables;
using AResource = Android.Resource;
using Microsoft.Maui.Graphics;
using AResource = Android.Resource;

namespace Microsoft.Maui.Handlers
{
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/PickerExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ internal static void UpdateAttributedPlaceholder(this MauiPicker nativePicker, N
{
nativePicker.AttributedPlaceholder = nsAttributedString;
}

internal static void UpdatePicker(this MauiPicker nativePicker, IPicker picker)
{
var selectedIndex = picker.SelectedIndex;
Expand Down
4 changes: 2 additions & 2 deletions src/Core/tests/DeviceTests/AssertionExtensions.iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ public static UIColor GetForegroundColor(this NSAttributedString text)
var kerning = Assert.IsType<UIColor>(value);

return kerning;
}
}

public static void AssertEqual(this CATransform3D expected, CATransform3D actual, int precision = 4)
{
Assert.Equal((double)expected.m11, (double)actual.m11, precision);
Expand Down