style and fixes from merge conflicts

dotnet · Jan 22, 2024 · dd739f8 · dd739f8
1 parent c4a1d8b
commit dd739f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17022.xaml.cs b/src/Controls/samples/Controls.Sample.UITests/Issues/Issue17022.xaml.cs
@@ -3,16 +3,15 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Controls.PlatformConfiguration;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using NavigationPage = Microsoft.Maui.Controls.NavigationPage;
+using FlyoutPage = Microsoft.Maui.Controls.FlyoutPage;
 
 namespace Maui.Controls.Sample.Issues;
 
 [XamlCompilation(XamlCompilationOptions.Compile)]
 [Issue(IssueTracker.Github, 17022, "UINavigationBar is Translucent", PlatformAffected.iOS)]
 public partial class Issue17022 : ContentPage
 {
-	Color _initialBarBackgroundColor;
-	bool _initialTranslucent;
-
 	public Issue17022()
 	{
 		InitializeComponent();

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellNavBarAppearanceTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellNavBarAppearanceTracker.cs
@@ -63,7 +63,6 @@ public void Dispose()
 		public virtual void SetHasShadow(UINavigationController controller, bool hasShadow)
 		{
 			var navigationBar = controller.NavigationBar;
-
 			if (_shadowOpacity == float.MinValue)
 			{
 				// Don't do anything if user hasn't changed the shadow to true