Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
26 changes: 13 additions & 13 deletions eng/AndroidX.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,55 @@
<ItemGroup>
<PackageReference
Update="Xamarin.AndroidX.AppCompat.AppCompatResources"
Version="1.7.0.5"
Version="1.7.0.6"
/>
<PackageReference
Update="Xamarin.AndroidX.Browser"
Version="1.8.0.8"
Version="1.8.0.9"
/>
<PackageReference
Update="Xamarin.AndroidX.SwipeRefreshLayout"
Version="1.1.0.24"
Version="1.1.0.27"
/>
<PackageReference
Update="Xamarin.AndroidX.Lifecycle.LiveData"
Version="2.8.7.2"
Version="2.8.7.3"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.UI"
Version="2.8.5.1"
Version="2.8.9.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Fragment"
Version="2.8.5.1"
Version="2.8.9.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Runtime"
Version="2.8.5.1"
Version="2.8.9.1"
/>
<PackageReference
Update="Xamarin.AndroidX.Navigation.Common"
Version="2.8.5.1"
Version="2.8.9.1"
/>
<PackageReference
Update="Xamarin.AndroidX.MediaRouter"
Version="1.7.0.8"
Version="1.7.0.9"
/>
<PackageReference
Update="Xamarin.AndroidX.Palette"
Version="1.0.0.31"
Version="1.0.0.32"
/>
<PackageReference
Update="Xamarin.AndroidX.RecyclerView"
Version="1.3.2.10"
Version="1.4.0.1"
/>
<PackageReference
Update="Xamarin.Build.Download"
Version="0.11.4"
/>
<PackageReference
Update="Xamarin.Google.Android.Material"
Version="1.12.0.2"
Version="1.12.0.3"
/>
<PackageReference
Update="Xamarin.AndroidX.Migration"
Expand All @@ -59,7 +59,7 @@
/>
<PackageReference
Update="Xamarin.AndroidX.Window.WindowJava"
Version="1.3.0.5"
Version="1.3.0.6"
/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,11 @@
<MicrosoftBuildUtilitiesCorePackageVersion>17.9.5</MicrosoftBuildUtilitiesCorePackageVersion>
<!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
<!-- must be kept in sync with the binding library version to it here: -->
<_XamarinAndroidGlideVersion>4.16.0.11</_XamarinAndroidGlideVersion>
<_XamarinAndroidXSecurityVersion>1.1.0.2-alpha06</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.16.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<_XamarinAndroidGlideVersion>4.16.0.12</_XamarinAndroidGlideVersion>
<_XamarinAndroidXSecurityVersion>1.1.0.3-alpha07</_XamarinAndroidXSecurityVersion>
<_XamarinGoogleCryptoTinkAndroidVersion>1.17.0.1</_XamarinGoogleCryptoTinkAndroidVersion>
<!-- Android Maps -->
<XamarinGooglePlayServicesMaps>119.0.0.4</XamarinGooglePlayServicesMaps>
<XamarinGooglePlayServicesMaps>119.2.0.1</XamarinGooglePlayServicesMaps>
<!--
SKIASHARP & HARFBUZZSHARP - the various things must be kept in sync with maui graphics:
- NuGet versions below
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.23" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Firebase.AppIndexing" Version="120.0.0.24" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="119.0.0.4" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.3" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="119.2.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) " >
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.3" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
Expand Down
6 changes: 3 additions & 3 deletions src/Controls/Foldable/src/Controls.Foldable.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>
<ItemGroup Condition=" '$(UseMaui)' != 'true' and '$(TargetPlatformIdentifier)' == 'android' ">
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.3" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.5" />
<PackageReference Include="Xamarin.AndroidX.Window.WindowJava" Version="1.3.0.6" />
</ItemGroup>

<Import Project="$(MauiSrcDirectory)Workload\Shared\LibraryPacks.targets" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public ControlsAccessibilityDelegate(AccessibilityDelegateCompat? originalDelega
Handler = viewHandler;
}

public override void OnInitializeAccessibilityNodeInfo(PlatformView host, AccessibilityNodeInfoCompat info)
public override void OnInitializeAccessibilityNodeInfo(PlatformView? host, AccessibilityNodeInfoCompat? info)
{
base.OnInitializeAccessibilityNodeInfo(host, info);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ Microsoft.Maui.Controls.HybridWebView.SendRawMessage(string! rawMessage) -> void
Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs
Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.HybridWebViewRawMessageReceivedEventArgs(string? message) -> void
Microsoft.Maui.Controls.HybridWebViewRawMessageReceivedEventArgs.Message.get -> string?
override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
*REMOVED*override Microsoft.Maui.Controls.Platform.ControlsAccessibilityDelegate.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs
Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs.RenderProcessGoneDetail.get -> Android.Webkit.RenderProcessGoneDetail?
Microsoft.Maui.Controls.PlatformWebViewProcessTerminatedEventArgs.Sender.get -> Android.Views.View?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ await CreateHandlerAndAddToWindow(page, () =>
#pragma warning disable CS0618 // Type or member is obsolete
var drawables = TextViewCompat.GetCompoundDrawablesRelative(platformButton);
#pragma warning restore CS0618 // Type or member is obsolete
Assert.NotNull(drawables[matchingDrawableIndex]);
Assert.NotNull(drawables?[matchingDrawableIndex]);
});
}

Expand Down
14 changes: 7 additions & 7 deletions src/Core/src/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
<AndroidGradleProject Include="../AndroidNative/build.gradle" ModuleName="maui" />
<PackageReference Include="Xamarin.Android.Glide" Version="$(_XamarinAndroidGlideVersion)" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.2" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.2" />
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.26" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.8.5.1" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.8.7.3" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.12.0.8" />
<PackageReference Include="Xamarin.AndroidX.SwipeRefreshLayout" Version="1.1.0.27" />
<PackageReference Include="Xamarin.AndroidX.Navigation.UI" Version="2.8.9.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" Version="2.8.9.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" Version="2.8.9.1" />
<PackageReference Include="Xamarin.AndroidX.Navigation.Common" Version="2.8.9.1" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-tizen'))">
<PackageReference Include="Tizen.UIExtensions.NUI" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,47 +31,47 @@ public AccessibilityDelegateCompatWrapper(AccessibilityDelegateCompat? originalD
_originalDelegate = originalDelegate ?? BlankDelegate;
}

public override void OnInitializeAccessibilityNodeInfo(PlatformView host, AccessibilityNodeInfoCompat info)
public override void OnInitializeAccessibilityNodeInfo(PlatformView? host, AccessibilityNodeInfoCompat? info)
{
_originalDelegate.OnInitializeAccessibilityNodeInfo(host, info);
}

public override void SendAccessibilityEvent(PlatformView host, int eventType)
public override void SendAccessibilityEvent(PlatformView? host, int eventType)
{
_originalDelegate.SendAccessibilityEvent(host, eventType);
}

public override void SendAccessibilityEventUnchecked(PlatformView host, AccessibilityEvent e)
public override void SendAccessibilityEventUnchecked(PlatformView? host, AccessibilityEvent? e)
{
_originalDelegate.SendAccessibilityEventUnchecked(host, e);
}

public override bool DispatchPopulateAccessibilityEvent(PlatformView host, AccessibilityEvent e)
public override bool DispatchPopulateAccessibilityEvent(PlatformView? host, AccessibilityEvent? e)
{
return _originalDelegate.DispatchPopulateAccessibilityEvent(host, e);
}

public override void OnPopulateAccessibilityEvent(PlatformView host, AccessibilityEvent e)
public override void OnPopulateAccessibilityEvent(PlatformView? host, AccessibilityEvent? e)
{
_originalDelegate.OnPopulateAccessibilityEvent(host, e);
}

public override void OnInitializeAccessibilityEvent(PlatformView host, AccessibilityEvent e)
public override void OnInitializeAccessibilityEvent(PlatformView? host, AccessibilityEvent? e)
{
_originalDelegate.OnInitializeAccessibilityEvent(host, e);
}

public override bool OnRequestSendAccessibilityEvent(Android.Views.ViewGroup host, PlatformView child, AccessibilityEvent e)
public override bool OnRequestSendAccessibilityEvent(Android.Views.ViewGroup? host, PlatformView? child, AccessibilityEvent? e)
{
return _originalDelegate.OnRequestSendAccessibilityEvent(host, child, e);
}

public override bool PerformAccessibilityAction(PlatformView host, int action, Bundle? args)
public override bool PerformAccessibilityAction(PlatformView? host, int action, Bundle? args)
{
return _originalDelegate.PerformAccessibilityAction(host, action, args);
}

public override AccessibilityNodeProviderCompat? GetAccessibilityNodeProvider(PlatformView host)
public override AccessibilityNodeProviderCompat? GetAccessibilityNodeProvider(PlatformView? host)
{
return _originalDelegate.GetAccessibilityNodeProvider(host);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public MauiAccessibilityDelegateCompat(AccessibilityDelegateCompat? originalDele
{
}

public override void OnInitializeAccessibilityNodeInfo(PlatformView host, AccessibilityNodeInfoCompat info)
public override void OnInitializeAccessibilityNodeInfo(PlatformView? host, AccessibilityNodeInfoCompat? info)
{
base.OnInitializeAccessibilityNodeInfo(host, info);

Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Android/MauiMaterialButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected override void OnLayout(bool changed, int left, int top, int right, int
#pragma warning disable CS0618 // Type or member is obsolete
var icons = TextViewCompat.GetCompoundDrawablesRelative(this);
#pragma warning restore CS0618 // Type or member is obsolete
if (icons[1] is { } icon)
if (icons?[1] is { } icon)
{
#pragma warning disable CS0618 // Type or member is obsolete
TextViewCompat.SetCompoundDrawablesRelative(this, null, null, null, icon);
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/Android/MauiScrollView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ void SmoothScrollTo(int x, int y, Action finished)
}

#pragma warning disable CA1822 // DO NOT REMOVE! Needed because dotnet format will else try to make this static and break things
void IOnScrollChangeListener.OnScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY)
void IOnScrollChangeListener.OnScrollChange(NestedScrollView? v, int scrollX, int scrollY, int oldScrollX, int oldScrollY)
#pragma warning restore CA1822
{
OnScrollChanged(scrollX, scrollY, oldScrollX, oldScrollY);
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/PublicAPI/net-android/PublicAPI.Shipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,7 @@ override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitialize
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup! host, Android.Views.View! child, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View! host, int action, Android.OS.Bundle? args) -> bool
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View! host, int action, Android.OS.Bundle! args) -> bool
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View! host, int eventType) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
override Microsoft.Maui.Platform.BorderDrawable.Dispose(bool disposing) -> void
Expand Down
22 changes: 21 additions & 1 deletion src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,24 @@ override Microsoft.Maui.PlatformWrapperView.OnLayout(bool changed, int left, int
virtual Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas! canvas, int viewWidth, int viewHeight) -> void
*REMOVED*~override Microsoft.Maui.Platform.WrapperView.DrawShadow(Android.Graphics.Canvas canvas, int viewWidth, int viewHeight) -> void
*REMOVED*abstract Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas! p0, int p1, int p2) -> void
override Microsoft.Maui.Platform.MauiTextView.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
override Microsoft.Maui.Platform.MauiTextView.OnMeasure(int widthMeasureSpec, int heightMeasureSpec) -> void
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View! host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup! host, Android.Views.View! child, Android.Views.Accessibility.AccessibilityEvent! e) -> bool
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View! host, int action, Android.OS.Bundle! args) -> bool
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View! host, int eventType) -> void
*REMOVED*override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View! host, Android.Views.Accessibility.AccessibilityEvent! e) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.DispatchPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.GetAccessibilityNodeProvider(Android.Views.View? host) -> AndroidX.Core.View.Accessibility.AccessibilityNodeProviderCompat?
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnPopulateAccessibilityEvent(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.OnRequestSendAccessibilityEvent(Android.Views.ViewGroup? host, Android.Views.View? child, Android.Views.Accessibility.AccessibilityEvent? e) -> bool
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.PerformAccessibilityAction(Android.Views.View? host, int action, Android.OS.Bundle? args) -> bool
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEvent(Android.Views.View? host, int eventType) -> void
override Microsoft.Maui.Platform.AccessibilityDelegateCompatWrapper.SendAccessibilityEventUnchecked(Android.Views.View? host, Android.Views.Accessibility.AccessibilityEvent? e) -> void
*REMOVED*override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View! host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat! info) -> void
override Microsoft.Maui.Platform.MauiAccessibilityDelegateCompat.OnInitializeAccessibilityNodeInfo(Android.Views.View? host, AndroidX.Core.View.Accessibility.AccessibilityNodeInfoCompat? info) -> void
Loading
Loading