-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Fix appBarLayout so it extends correctly full screen #32060
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
365098a
Fix appBarLayout so it extends correctly full screen
PureWeen bf909d8
- update screen shots
PureWeen 572dc23
- update notch images
PureWeen 5815853
- generate iOS images
PureWeen 7bbbdd4
- fix based on review comments
PureWeen f26896e
- fix insetting on MaterialToolBar so its content doesn't go into the…
PureWeen 74bd62b
- fix insets
PureWeen 65be10d
- fix screen shots
PureWeen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file added
BIN
+31.5 KB
...es.Android.Tests/snapshots/android-notch-36/Border_PaddingWithContent_Label.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+48.7 KB
...Tests/snapshots/android-notch-36/Border_PolygonShapeWithStrokeLineCap_Round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+31.8 KB
...ests/snapshots/android-notch-36/Border_PolygonShapeWithStrokeLineJoin_Bevel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+38 KB
...rols/tests/TestCases.Android.Tests/snapshots/android-notch-36/Border_Shadow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+32.1 KB
...d.Tests/snapshots/android-notch-36/Border_StrokeColorWithDashArrayAndOffset.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+65.2 KB
...ts/snapshots/android-notch-36/Border_StrokeColorWithPaddingAndContent_Image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+32.2 KB
...Tests/snapshots/android-notch-36/Border_StrokeColorWithStrokeLineJoin_Round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+38.8 KB
...snapshots/android-notch-36/Border_StrokeColorWithStrokeShape_RoundRectangle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+31.5 KB
...roid.Tests/snapshots/android-notch-36/Border_StrokeColorWithStrokeThickness.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+32.5 KB
...droid.Tests/snapshots/android-notch-36/Border_StrokeDashArrayWithDashOffset.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+37 KB
.../android-notch-36/Border_StrokeDashArrayWithDashOffsetAndStrokeLineCapRound.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+55.3 KB
...roid-notch-36/Border_StrokeDashArrayWithEllipseShapeAndStrokeLineCap_Square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+32.4 KB
...roid.Tests/snapshots/android-notch-36/Border_StrokeDashArrayWithStrokeColor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+37 KB
...ts/snapshots/android-notch-36/Border_StrokeDashArrayWithStrokeLineCap_Round.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+32.4 KB
...s/snapshots/android-notch-36/Border_StrokeDashArrayWithStrokeLineCap_Square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+48.5 KB
...droid.Tests/snapshots/android-notch-36/Border_StrokeShapeWithDashArray_Path.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+42.9 KB
...Tests/snapshots/android-notch-36/Border_StrokeShapeWithStrokeLineJoin_Bevel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+54.4 KB
...ts/snapshots/android-notch-36/Border_StrokeShapeWithStrokeThickness_Ellipse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+32.4 KB
...ndroid.Tests/snapshots/android-notch-36/Border_StrokeThicknessWithDashArray.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+31.8 KB
...s/snapshots/android-notch-36/Border_StrokeThicknessWithStrokeLineJoin_Bevel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-8 Bytes
(100%)
...oid.Tests/snapshots/android-notch-36/CheckBox_ChangeColor_VerifyVisualState.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-8 Bytes
(100%)
.../snapshots/android-notch-36/CheckBox_SetIsCheckedAndColor_VerifyVisualState.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+78.9 KB
...s/snapshots/android-notch-36/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+75.5 KB
...apshots/android-notch-36/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+75.8 KB
....Tests/snapshots/android-notch-36/ToolbarExtendsAllTheWayLeftAndRight_Shell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+38.2 KB
...droid.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_AllProportional.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
...droid.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_BackgroundColor.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
...Android.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_FlowDirection.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
...id.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_HeightProportional.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
....Android.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_LayoutBounds.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
....Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_PositionProportional.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
...id.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_Reset_LayoutBounds.png
Oops, something went wrong.
Binary file added
BIN
+38.7 KB
...roid.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_SizeProportional.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
...droid-notch-36/VerifyAbsoluteLayout_SizeProportionalAndPositionProportional.png
Oops, something went wrong.
Binary file added
BIN
+37.6 KB
...hots/android-notch-36/VerifyAbsoluteLayout_SizeProportionalWithMaximumValue.png
Oops, something went wrong.
Binary file added
BIN
+28.8 KB
...es.Android.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_Visibility.png
Oops, something went wrong.
Binary file added
BIN
+37.7 KB
...ndroid.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_WidthAndHeight.png
Oops, something went wrong.
Binary file added
BIN
+38.7 KB
...oid.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_WidthProportional.png
Oops, something went wrong.
Binary file added
BIN
+38.7 KB
...ndroid-notch-36/VerifyAbsoluteLayout_WidthProportionalAndHeightProportional.png
Oops, something went wrong.
Binary file added
BIN
+37.8 KB
...Android.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_XProportional.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
...apshots/android-notch-36/VerifyAbsoluteLayout_XProportionalAndYProportional.png
Oops, something went wrong.
Binary file added
BIN
+38.2 KB
...Android.Tests/snapshots/android-notch-36/VerifyAbsoluteLayout_YProportional.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...ases.Android.Tests/snapshots/android/CollectionViewSelectionModeOnDarkTheme.png
Oops, something went wrong.
Binary file modified
BIN
+0 Bytes
(100%)
...ses.Android.Tests/snapshots/android/CollectionViewSelectionModeOnLightTheme.png
Oops, something went wrong.
Binary file added
BIN
+110 KB
...roid.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png
Oops, something went wrong.
Binary file added
BIN
+107 KB
....Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png
Oops, something went wrong.
Binary file added
BIN
+116 KB
...s.Android.Tests/snapshots/android/ToolbarExtendsAllTheWayLeftAndRight_Shell.png
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
src/Controls/tests/TestCases.HostApp/Issues/Issue28986_FlyoutPage.cs
This file contains hidden or 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,24 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 28986, "Test SafeArea Flyout Page for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 8)] | ||
| public partial class Issue28986_FlyoutPage : FlyoutPage | ||
| { | ||
| public Issue28986_FlyoutPage() : base() | ||
| { | ||
| var page = new Issue28986_ContentPage() { Title = "SafeArea Flyout Test" }; | ||
| page.ToolbarItems.Add(new ToolbarItem { Text = "Item 1" }); | ||
| Shell.SetBackgroundColor(page, Colors.Blue); | ||
| Detail = new NavigationPage(page); | ||
| Flyout = new ContentPage() | ||
| { | ||
| Title = "Flyout", | ||
| Content = new StackLayout | ||
| { | ||
| Children = | ||
| { | ||
| new Label { Text = "This is the flyout content" } | ||
| } | ||
| } | ||
| }; | ||
| } | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/Controls/tests/TestCases.HostApp/Issues/Issue28986_NavigationPage.cs
This file contains hidden or 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,10 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 28986, "Test SafeArea Navigation Page for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 7)] | ||
| public partial class Issue28986_NavigationPage : NavigationPage | ||
| { | ||
| public Issue28986_NavigationPage() : base(new Issue28986_ContentPage()) | ||
| { | ||
| BarBackground = Colors.Blue; | ||
| } | ||
| } |
37 changes: 37 additions & 0 deletions
37
src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Shell.cs
This file contains hidden or 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,37 @@ | ||
| namespace Maui.Controls.Sample.Issues; | ||
|
|
||
| [Issue(IssueTracker.Github, 28986, "Test SafeArea Shell Page for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 6)] | ||
| public partial class Issue28986_Shell : Shell | ||
| { | ||
| public Issue28986_Shell() : base() | ||
| { | ||
| var page = new Issue28986_ContentPage(); | ||
| page.ToolbarItems.Add(new ToolbarItem { Text = "Item 1" }); | ||
| page.Title = "SafeArea Shell Test"; | ||
| Shell.SetBackgroundColor(page, Colors.Blue); | ||
| Items.Add(new FlyoutItem() | ||
| { | ||
| Items = | ||
| { | ||
| new ShellContent() | ||
| { | ||
| Content = page, | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| Items.Add(new FlyoutItem() | ||
| { | ||
| Items = | ||
| { | ||
| new ShellContent() | ||
| { | ||
| Content = new ContentPage() | ||
| { | ||
| Title = "Page 2" | ||
| }, | ||
| } | ||
| } | ||
| }); | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_FlyoutPage.cs
This file contains hidden or 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,27 @@ | ||
| #if IOS || ANDROID | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
|
||
| public class Issue28986_FlyoutPage : _IssuesUITest | ||
| { | ||
| public override string Issue => "Test SafeArea Flyout Page for per-edge safe area control"; | ||
|
|
||
| public Issue28986_FlyoutPage(TestDevice device) : base(device) | ||
| { | ||
| } | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.SafeAreaEdges)] | ||
| public void ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage() | ||
| { | ||
| // 1. Test loads - verify essential elements are present | ||
| App.WaitForElement("ContentGrid"); | ||
| App.SetOrientationLandscape(); | ||
| App.WaitForElement("ContentGrid"); | ||
| VerifyScreenshot(); | ||
| } | ||
| } | ||
| #endif |
27 changes: 27 additions & 0 deletions
27
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_NavigationPage.cs
This file contains hidden or 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,27 @@ | ||
| #if IOS || ANDROID | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
|
||
| public class Issue28986_NavigationPage : _IssuesUITest | ||
| { | ||
| public override string Issue => "Test SafeArea Navigation Page for per-edge safe area control"; | ||
|
|
||
| public Issue28986_NavigationPage(TestDevice device) : base(device) | ||
| { | ||
| } | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.SafeAreaEdges)] | ||
| public void ToolbarExtendsAllTheWayLeftAndRight_NavigationPage() | ||
| { | ||
| // 1. Test loads - verify essential elements are present | ||
| App.WaitForElement("ContentGrid"); | ||
| App.SetOrientationLandscape(); | ||
| App.WaitForElement("ContentGrid"); | ||
| VerifyScreenshot(); | ||
| } | ||
| } | ||
| #endif | ||
27 changes: 27 additions & 0 deletions
27
src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28986_Shell.cs
This file contains hidden or 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,27 @@ | ||
| #if IOS || ANDROID | ||
| using NUnit.Framework; | ||
| using UITest.Appium; | ||
| using UITest.Core; | ||
|
|
||
| namespace Microsoft.Maui.TestCases.Tests.Issues; | ||
|
|
||
| public class Issue28986_Shell : _IssuesUITest | ||
| { | ||
| public override string Issue => "Test SafeArea Shell Page for per-edge safe area control"; | ||
|
|
||
| public Issue28986_Shell(TestDevice device) : base(device) | ||
| { | ||
| } | ||
|
|
||
| [Test] | ||
| [Category(UITestCategories.SafeAreaEdges)] | ||
| public void ToolbarExtendsAllTheWayLeftAndRight_Shell() | ||
| { | ||
| // 1. Test loads - verify essential elements are present | ||
| App.WaitForElement("ContentGrid"); | ||
| App.SetOrientationLandscape(); | ||
| App.WaitForElement("ContentGrid"); | ||
| VerifyScreenshot(); | ||
PureWeen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
| #endif | ||
This file contains hidden or 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
Binary file added
BIN
+102 KB
...ases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_FlyoutPage.png
Oops, something went wrong.
Binary file added
BIN
+102 KB
....iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_NavigationPage.png
Oops, something went wrong.
Binary file added
BIN
+102 KB
...TestCases.iOS.Tests/snapshots/ios/ToolbarExtendsAllTheWayLeftAndRight_Shell.png
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.