Skip to content

Commit bbca522

Browse files
authored
NavBarColor and NavBarTextColor (#911)
* NavBarColor and NavBarTextColor * - ios nav bar * - remove files * - cg fix * - fix bar background color
1 parent 0afc6d1 commit bbca522

File tree

84 files changed

+637
-1189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+637
-1189
lines changed

.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net6.0-ios')) != true AND $(TargetFramework.StartsWith('net6.0-maccatalyst')) != true ">
3-
<Compile Remove="**\*.iOS.cs" />
4-
<None Include="**\*.iOS.cs" />
5-
<Compile Remove="**\iOS\*.cs" />
6-
<None Include="**\iOS\*.cs" />
3+
<Compile Remove="**\**\*.iOS.cs" />
4+
<None Include="**\**\*.iOS.cs" />
5+
<Compile Remove="**\iOS\**\*.cs" />
6+
<None Include="**\iOS\**\*.cs" />
77
</ItemGroup>
88
<ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true ">
99
<Compile Remove="**\*.Mac.cs" />
@@ -18,10 +18,10 @@
1818
<None Include="**\MaciOS\*.cs" />
1919
</ItemGroup>
2020
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net6.0-android')) != true ">
21-
<Compile Remove="**\*.Android.cs" />
22-
<None Include="**\*.Android.cs" />
23-
<Compile Remove="**\Android\*.cs" />
24-
<None Include="**\Android\*.cs" />
21+
<Compile Remove="**\**\*.Android.cs" />
22+
<None Include="**\**\*.Android.cs" />
23+
<Compile Remove="**\Android\**\*.cs" />
24+
<None Include="**\Android\**\*.cs" />
2525
</ItemGroup>
2626
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) != true ">
2727
<Compile Remove="**\*.Standard.cs" />

src/Compatibility/ControlGallery/src/Android/_1909CustomRenderer.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
77
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
88
using Microsoft.Maui.Controls.Compatibility;
9+
using Microsoft.Maui.Controls.Compatibility.Platform.Android;
910

1011
[assembly: ExportRenderer(typeof(Issue1909.FlatButton), typeof(FlatButtonRenderer))]
1112
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
@@ -30,7 +31,7 @@ protected override void OnElementChanged(Microsoft.Maui.Controls.Compatibility.P
3031
var nativeButton = (global::Android.Widget.Button)Control;
3132
nativeButton.SetShadowLayer(0, 0, 0, global::Android.Graphics.Color.Transparent);
3233

33-
Microsoft.Maui.Controls.Compatibility.Platform.Android.ViewExtensions.SetElevation(nativeButton, 0);
34+
ElevationHelper.SetElevation(nativeButton, 0);
3435
}
3536
}
3637
}

src/Compatibility/Core/src/Android/AppCompat/CarouselPageRenderer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Android.Views;
55
using AndroidX.Fragment.App;
66
using AndroidX.ViewPager.Widget;
7+
using Microsoft.Maui.Controls.Platform;
78
using Microsoft.Maui.Graphics;
89

910
namespace Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat

src/Compatibility/Core/src/Android/AppCompat/CheckBoxRendererBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using AndroidX.Core.Widget;
1010
using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
1111
using Microsoft.Maui.Controls.Internals;
12+
using Microsoft.Maui.Controls.Platform;
1213
using Microsoft.Maui.Graphics;
1314
using AAttribute = Android.Resource.Attribute;
1415
using AColor = Android.Graphics.Color;

src/Compatibility/Core/src/Android/AppCompat/FlyoutPageContainer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Android.Views;
55
using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
66
using Microsoft.Maui.Controls.Internals;
7+
using Microsoft.Maui.Controls.Platform;
78
using Microsoft.Maui.Graphics;
89
using APlatform = Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat.Platform;
910
using Fragment = AndroidX.Fragment.App.Fragment;

src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010

1111
namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
1212
{
13+
using global::Android.Graphics.Drawables;
1314
using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
1415
using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
16+
using Microsoft.Maui.Controls.Platform;
1517
using Microsoft.Maui.Graphics;
1618

1719
public class FlyoutPageRenderer : DrawerLayout, IVisualElementRenderer, DrawerLayout.IDrawerListener, IManageFragments, ILifeCycleState
@@ -421,11 +423,12 @@ void UpdateBackgroundColor(Page view)
421423

422424
void UpdateBackgroundImage(Page view)
423425
{
424-
_ = this.ApplyDrawableAsync(view, Page.BackgroundImageSourceProperty, Context, drawable =>
426+
this.ApplyDrawableAsync(view, Page.BackgroundImageSourceProperty, Context,
427+
(Drawable drawable) =>
425428
{
426429
if (drawable != null)
427430
this.SetBackground(drawable);
428-
});
431+
}).FireAndForget(e=> Internals.Log.Warning(nameof(FlyoutPageRenderer), $"{e}"));
429432
}
430433

431434
void UpdateDetail()

src/Compatibility/Core/src/Android/AppCompat/FragmentContainer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Android.Runtime;
55
using Android.Views;
66
using AndroidX.Fragment.App;
7+
using Microsoft.Maui.Controls.Platform;
78
using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.AppCompat;
89
using AView = Android.Views.View;
910

src/Compatibility/Core/src/Android/AppCompat/ImageButtonRenderer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using AndroidX.AppCompat.Widget;
88
using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
99
using Microsoft.Maui.Controls.Internals;
10+
using Microsoft.Maui.Controls.Platform;
1011
using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
1112
using Microsoft.Maui.Graphics;
1213
using AColor = Android.Graphics.Color;

src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using AndroidX.AppCompat.Graphics.Drawable;
1818
using AndroidX.DrawerLayout.Widget;
1919
using Microsoft.Maui.Controls.Internals;
20+
using Microsoft.Maui.Controls.Platform;
2021
using Microsoft.Maui.Graphics;
2122
using static Android.Views.View;
2223
using static Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.AppCompat.NavigationPage;

src/Compatibility/Core/src/Android/AppCompat/Platform.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Android.Views;
99
using Android.Views.Animations;
1010
using Microsoft.Maui.Controls.Internals;
11+
using Microsoft.Maui.Controls.Platform;
1112
using Microsoft.Maui.Graphics;
1213
using AView = Android.Views.View;
1314

0 commit comments

Comments
 (0)