Skip to content
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Copy link
Member

Choose a reason for hiding this comment

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

@copilot revert this change

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. Reverted in commit 59657fd.

Original file line number Diff line number Diff line change
Expand Up @@ -383,3 +383,4 @@ snapshots-diff/
temp
.packages
/src/Templates/.tempTemplateOutput
*.js.map
10 changes: 10 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue28986.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

namespace Maui.Controls.Sample.Issues;

[Issue(IssueTracker.Github, 28986, "Test SafeArea attached property for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 0)]
Expand All @@ -7,6 +11,12 @@ public Issue28986()
{
InitializeComponent();
UpdateCurrentSettingsLabel();

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}

private void OnGridSetNoneClicked(object sender, EventArgs e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

namespace Maui.Controls.Sample.Issues;

[Issue(IssueTracker.Github, 28986, "Test SafeArea Border for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 1)]
Expand All @@ -13,6 +17,12 @@ public Issue28986_Border()
BottomPicker.SelectedIndex = 3; // All

UpdateSafeAreaSettings();

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}

private void OnEdgePickerChanged(object sender, EventArgs e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

namespace Maui.Controls.Sample.Issues;

[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentPage for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 2)]
Expand All @@ -7,6 +11,12 @@ public Issue28986_ContentPage()
{
InitializeComponent();
UpdateCurrentSettingsLabel();

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}

private void OnGridSetNoneClicked(object sender, EventArgs e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

namespace Maui.Controls.Sample.Issues;

[Issue(IssueTracker.Github, 28986, "Test SafeArea ContentView for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 3)]
Expand All @@ -13,6 +17,12 @@ public Issue28986_ContentView()
BottomPicker.SelectedIndex = 3; // All

UpdateSafeAreaSettings();

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}

private void OnEdgePickerChanged(object sender, EventArgs e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

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)]
Expand All @@ -20,5 +24,11 @@ public Issue28986_FlyoutPage() : base()
}
}
};

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

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)]
Expand All @@ -6,5 +10,11 @@ public partial class Issue28986_NavigationPage : NavigationPage
public Issue28986_NavigationPage() : base(new Issue28986_ContentPage())
{
BarBackground = Colors.Blue;

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

namespace Maui.Controls.Sample.Issues;

[Issue(IssueTracker.Github, 28986, "Test SafeArea per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 5)]
Expand All @@ -18,6 +22,12 @@ public Issue28986_SafeAreaBorderOrientation()

// Update dimensions when the page appears
this.Appearing += OnPageAppearing;

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}

private void OnPageAppearing(object sender, EventArgs e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

namespace Maui.Controls.Sample.Issues;

[Issue(IssueTracker.Github, 28986, "Test SafeArea ScrollView for per-edge safe area control", PlatformAffected.Android | PlatformAffected.iOS, issueTestNumber: 4)]
Expand All @@ -7,6 +11,12 @@ public Issue28986_ScrollView()
{
InitializeComponent();
UpdateCurrentSettingsLabel();

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}

private void OnScrollViewSetNoneClicked(object sender, EventArgs e)
Expand Down
10 changes: 10 additions & 0 deletions src/Controls/tests/TestCases.HostApp/Issues/Issue28986_Shell.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#if ANDROID
using Android.Views;
#endif

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)]
Expand Down Expand Up @@ -33,5 +37,11 @@ public Issue28986_Shell() : base()
}
}
});

#if ANDROID
// Set SoftInput.AdjustNothing - we have full control over insets (iOS-like behavior)
var window = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity?.Window;
window?.SetSoftInputMode(SoftInput.AdjustNothing | SoftInput.StateUnspecified);
#endif
}
}
Loading