Fix android build on v11

Difegue · Aug 2, 2023 · 1a71f69 · 1a71f69
1 parent f570d82
commit 1a71f69
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 41 deletions.
diff --git a/LCDonald.Android/LCDonald.Android.csproj b/LCDonald.Android/LCDonald.Android.csproj
@@ -34,6 +34,7 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia.Android" Version="11.0.2" />
+	 <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/LCDonald.Android/MainActivity.cs b/LCDonald.Android/MainActivity.cs
@@ -1,10 +1,30 @@
 using Android.App;
 using Android.Content.PM;
+using Avalonia;
 using Avalonia.Android;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using LCDonald.Core.Controller;
 
 namespace LCDonald.Android;
 
-[Activity(Label = "LCDonald.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
-public class MainActivity : AvaloniaMainActivity
+[Activity(
+    Label = "LCDonald.Android", 
+    Theme = "@style/MyTheme.NoActionBar", 
+    Icon = "@drawable/icon",
+    MainLauncher = true,
+    ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
+public class MainActivity : AvaloniaMainActivity<App>
 {
+
+    protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
+    {
+        Ioc.Default.ConfigureServices(
+             new ServiceCollection()
+             .AddSingleton<IInteropService, AndroidInteropService>()
+             .BuildServiceProvider());
+
+        return base.CustomizeAppBuilder(builder);
+    }
+
 }
diff --git a/LCDonald.Android/SplashActivity.cs b/LCDonald.Android/SplashActivity.cs
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ cd LCDonald.Desktop && dotnet restore && dotnet publish .\LCDonald.Desktop.cspro
 # macOS
 cd LCDonald.Desktop && dotnet restore && dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64 -property:Configuration=Release
 
-# Android (Release is busted for now)
-cd LCDonald.Android && dotnet build .\LCDonald.Android.csproj -c debug 
+# Android 
+cd LCDonald.Android && dotnet build .\LCDonald.Android.csproj -c release 
 
 ```