This repository has been archived by the owner on May 1, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into automation-name-helptext
- Loading branch information
Showing
70 changed files
with
2,383 additions
and
201 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4493.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| using Xamarin.Forms.CustomAttributes; | ||
| using Xamarin.Forms.Internals; | ||
|
|
||
| namespace Xamarin.Forms.Controls.Issues | ||
| { | ||
| [Preserve(AllMembers = true)] | ||
| [Issue(IssueTracker.Github, 4933, "Grid size incorrect when using with Image", PlatformAffected.All)] | ||
| public class Issue4493 : TestContentPage // or TestMasterDetailPage, etc ... | ||
| { | ||
| protected override void Init() | ||
| { | ||
| // Initialize ui here instead of ctor | ||
| BackgroundColor = Color.Gray; | ||
| var contentGrid = new Grid | ||
| { | ||
| AutomationId = "IssuePageGrid", | ||
| HorizontalOptions = LayoutOptions.FillAndExpand, | ||
| VerticalOptions = LayoutOptions.Center, | ||
| BackgroundColor = Color.Maroon, | ||
| RowSpacing = 0, | ||
| RowDefinitions = new RowDefinitionCollection() | ||
| { | ||
| new RowDefinition(){Height = GridLength.Auto}, | ||
| new RowDefinition(){Height = 20} | ||
| } | ||
| }; | ||
| contentGrid.AddChild(new Image() { Source = "photo.jpg", AutomationId = "IssuePageImage" }, 0, 0); | ||
| contentGrid.AddChild(new Label() { Text = "test message", BackgroundColor = Color.Blue }, 0, 1); | ||
| Content = contentGrid; | ||
| } | ||
| } | ||
| } |
49 changes: 49 additions & 0 deletions
49
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5252.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| using System.Linq; | ||
| using Xamarin.Forms.CustomAttributes; | ||
| using Xamarin.Forms.Internals; | ||
|
|
||
| namespace Xamarin.Forms.Controls.Issues | ||
| { | ||
| [Preserve(AllMembers = true)] | ||
| [Issue(IssueTracker.Github, 5252, "iOS: The Editor and Entry placeholder default color should be the same", PlatformAffected.iOS)] | ||
|
|
||
| class Issue5252 : TestContentPage | ||
| { | ||
| protected override void Init() | ||
| { | ||
| var sl = new StackLayout(); | ||
| sl.Children.Add(new Label() | ||
| { | ||
| Text = "iOS: The Editor and Entry placeholder default color should be the same for consistency" | ||
| }); | ||
|
|
||
| var entry = new Entry() | ||
| { | ||
| Placeholder = "Entry placeholder", | ||
| }; | ||
| sl.Children.Add(entry); | ||
|
|
||
| var editor = new Editor() | ||
| { | ||
| Placeholder = "Editor placeholder", | ||
| }; | ||
| sl.Children.Add(editor); | ||
|
|
||
| sl.Children.Add(new Button() | ||
| { | ||
| Text = "Toggle placeholder color", | ||
| Command = new Command(() => | ||
| { | ||
| entry.PlaceholderColor = entry.PlaceholderColor.IsDefault ? Color.Red : (Color)Entry.PlaceholderColorProperty.DefaultValue; | ||
| editor.PlaceholderColor = editor.PlaceholderColor.IsDefault ? Color.Red : (Color)Editor.PlaceholderColorProperty.DefaultValue; | ||
| }) | ||
| }); | ||
|
|
||
|
|
||
| Content = new ScrollView() | ||
| { | ||
| Content = sl | ||
| }; | ||
| } | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5461.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Collections.ObjectModel; | ||
| using System.Text; | ||
| using Xamarin.Forms.CustomAttributes; | ||
| using Xamarin.Forms.Internals; | ||
|
|
||
|
|
||
| #if UITEST | ||
| using Xamarin.UITest; | ||
| using NUnit.Framework; | ||
| using Xamarin.Forms.Core.UITests; | ||
| #endif | ||
|
|
||
| namespace Xamarin.Forms.Controls.Issues | ||
| { | ||
| [Preserve(AllMembers = true)] | ||
| [Issue(IssueTracker.Github, 5461, "[Android] ScrollView crashes when setting ScrollbarFadingEnabled to false in Custom Renderer", | ||
| PlatformAffected.Android)] | ||
| #if UITEST | ||
| [NUnit.Framework.Category(UITestCategories.ScrollView)] | ||
| #endif | ||
| public class Issue5461 : TestContentPage | ||
| { | ||
| const string Success = "If you can see this, the test has passed"; | ||
| protected override void Init() | ||
| { | ||
| ScrollView scrollView = new ScrollbarFadingEnabledFalseScrollView() | ||
| { | ||
| Content = new StackLayout() | ||
| { | ||
| Children = | ||
| { | ||
| new Label() | ||
| { | ||
| Text = Success | ||
| } | ||
| }, | ||
| HeightRequest = 2000 | ||
| } | ||
| }; | ||
|
|
||
| Content = scrollView; | ||
| } | ||
|
|
||
| public class ScrollbarFadingEnabledFalseScrollView : ScrollView { } | ||
|
|
||
|
|
||
| #if UITEST && __ANDROID__ | ||
| [Test] | ||
| public void ScrollViewWithScrollbarFadingEnabledFalseDoesntCrash() | ||
| { | ||
| RunningApp.WaitForElement(Success); | ||
| } | ||
| #endif | ||
| } | ||
| } |
Oops, something went wrong.