Browse Source

[v12] Android - Remove redundant appbuilder methods in android, use AvaloniaActivity in toplevel classes (#20715)

* remove redundant appbuilder methods in android, use AvaloniaActivity in toplevel classes

* update api suppression file
pull/20719/head
Emmanuel Hansen 1 month ago
committed by GitHub
parent
commit
73d9a38102
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 12
      api/Avalonia.Android.nupkg.xml
  2. 3
      src/Android/Avalonia.Android/AvaloniaMainActivity.cs
  3. 5
      src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs

12
api/Avalonia.Android.nupkg.xml

@ -7,6 +7,18 @@
<Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left> <Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
<Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right> <Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
</Suppression> </Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Avalonia.Android.AvaloniaMainActivity.CreateAppBuilder</Target>
<Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
<Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
</Suppression>
<Suppression>
<DiagnosticId>CP0002</DiagnosticId>
<Target>M:Avalonia.Android.AvaloniaMainActivity.CustomizeAppBuilder(Avalonia.AppBuilder)</Target>
<Left>baseline/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Left>
<Right>current/Avalonia.Android/lib/net10.0-android36.0/Avalonia.Android.dll</Right>
</Suppression>
<Suppression> <Suppression>
<DiagnosticId>CP0008</DiagnosticId> <DiagnosticId>CP0008</DiagnosticId>
<Target>T:Avalonia.Android.AvaloniaActivity</Target> <Target>T:Avalonia.Android.AvaloniaActivity</Target>

3
src/Android/Avalonia.Android/AvaloniaMainActivity.cs

@ -44,7 +44,4 @@ public class AvaloniaMainActivity : AvaloniaActivity
activatableLifetime.CurrentMainActivity = null; activatableLifetime.CurrentMainActivity = null;
} }
} }
protected virtual AppBuilder CreateAppBuilder() => AppBuilder.Configure<Application>().UseAndroid();
protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder;
} }

5
src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs

@ -8,7 +8,6 @@ using Android.Runtime;
using Android.Views; using Android.Views;
using AndroidX.AppCompat.App; using AndroidX.AppCompat.App;
using Avalonia.Android.Platform.Input; using Avalonia.Android.Platform.Input;
using Avalonia.Android.Platform.Specific;
using Avalonia.Android.Platform.Specific.Helpers; using Avalonia.Android.Platform.Specific.Helpers;
using Avalonia.Android.Platform.Storage; using Avalonia.Android.Platform.Storage;
using Avalonia.Controls; using Avalonia.Controls;
@ -254,7 +253,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
public void SetTransparencyLevelHint(IReadOnlyList<WindowTransparencyLevel> transparencyLevels) public void SetTransparencyLevelHint(IReadOnlyList<WindowTransparencyLevel> transparencyLevels)
{ {
if (_view.Context is not AvaloniaMainActivity activity) if (_view.Context is not AvaloniaActivity activity)
return; return;
foreach (var level in transparencyLevels) foreach (var level in transparencyLevels)
@ -366,7 +365,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
return false; return false;
} }
private static void SetBlurBehind(AvaloniaMainActivity activity, int radius) private static void SetBlurBehind(AvaloniaActivity activity, int radius)
{ {
if (radius == 0) if (radius == 0)
activity.Window?.ClearFlags(WindowManagerFlags.BlurBehind); activity.Window?.ClearFlags(WindowManagerFlags.BlurBehind);

Loading…
Cancel
Save