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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
14 additions and
6 deletions
-
api/Avalonia.Android.nupkg.xml
-
src/Android/Avalonia.Android/AvaloniaMainActivity.cs
-
src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
|
|
|
@ -7,6 +7,18 @@ |
|
|
|
<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.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> |
|
|
|
<DiagnosticId>CP0008</DiagnosticId> |
|
|
|
<Target>T:Avalonia.Android.AvaloniaActivity</Target> |
|
|
|
|
|
|
|
@ -44,7 +44,4 @@ public class AvaloniaMainActivity : AvaloniaActivity |
|
|
|
activatableLifetime.CurrentMainActivity = null; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
protected virtual AppBuilder CreateAppBuilder() => AppBuilder.Configure<Application>().UseAndroid(); |
|
|
|
protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder; |
|
|
|
} |
|
|
|
|
|
|
|
@ -8,7 +8,6 @@ using Android.Runtime; |
|
|
|
using Android.Views; |
|
|
|
using AndroidX.AppCompat.App; |
|
|
|
using Avalonia.Android.Platform.Input; |
|
|
|
using Avalonia.Android.Platform.Specific; |
|
|
|
using Avalonia.Android.Platform.Specific.Helpers; |
|
|
|
using Avalonia.Android.Platform.Storage; |
|
|
|
using Avalonia.Controls; |
|
|
|
@ -254,7 +253,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform |
|
|
|
|
|
|
|
public void SetTransparencyLevelHint(IReadOnlyList<WindowTransparencyLevel> transparencyLevels) |
|
|
|
{ |
|
|
|
if (_view.Context is not AvaloniaMainActivity activity) |
|
|
|
if (_view.Context is not AvaloniaActivity activity) |
|
|
|
return; |
|
|
|
|
|
|
|
foreach (var level in transparencyLevels) |
|
|
|
@ -366,7 +365,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
private static void SetBlurBehind(AvaloniaMainActivity activity, int radius) |
|
|
|
private static void SetBlurBehind(AvaloniaActivity activity, int radius) |
|
|
|
{ |
|
|
|
if (radius == 0) |
|
|
|
activity.Window?.ClearFlags(WindowManagerFlags.BlurBehind); |
|
|
|
|