Address Review

samples/ControlCatalog.Android/MainActivity.cs

@@ -5,8 +5,8 @@ using Avalonia.Android;
 
 namespace ControlCatalog.Android
 {
-    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
-    public class MainActivity : AvaloniaActivity
+    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
+    public class MainActivity : AvaloniaMainActivity
     {
     }
 }

samples/MobileSandbox.Android/MainActivity.cs

@@ -5,8 +5,8 @@ using Avalonia.Android;
 
 namespace MobileSandbox.Android
 {
-    [Activity(Label = "MobileSandbox.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleInstance, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
-    public class MainActivity : AvaloniaActivity<App>
+    [Activity(Label = "MobileSandbox.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
+    public class MainActivity : AvaloniaMainActivity
     {
     }
 }

samples/MobileSandbox.Android/SplashActivity.cs

@@ -1,11 +1,11 @@
 using Android.App;
 using Android.Content;
-using Android.OS;
+using Avalonia.Android;
 
 namespace MobileSandbox.Android
 {
     [Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
-    public class SplashActivity : Activity
+    public class SplashActivity : AvaloniaSplashActivity<App>
     {
         protected override void OnResume()
         {

src/Android/Avalonia.Android/AvaloniaActivity.cs → src/Android/Avalonia.Android/AvaloniaMainActivity.cs

@@ -9,20 +9,19 @@ using AndroidX.Lifecycle;
 
 namespace Avalonia.Android
 {
-    public abstract class AvaloniaActivity : AppCompatActivity
+    public abstract class AvaloniaMainActivity : AppCompatActivity
     {
+        internal static object ViewContent;
+
         internal Action<int, Result, Intent> ActivityResult;
         internal AvaloniaView View;
-        internal AvaloniaViewModel _viewModel;
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
-            _viewModel = new ViewModelProvider(this).Get(Java.Lang.Class.FromType(typeof(AvaloniaViewModel))) as AvaloniaViewModel;
-
             View = new AvaloniaView(this);
-            if (_viewModel.Content != null)
+            if (ViewContent != null)
             {
-                View.Content = _viewModel.Content;
+                View.Content = ViewContent;
             }
 
             View.Prepare();
@@ -41,11 +40,11 @@ namespace Avalonia.Android
         {
             get
             {
-                return _viewModel.Content;
+                return ViewContent;
             }
             set
             {
-                _viewModel.Content = value;
+                ViewContent = value;
                 if (View != null)
                     View.Content = value;
             }

src/Android/Avalonia.Android/AvaloniaViewModel.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Avalonia.Android
-{
-    internal class AvaloniaViewModel : AndroidX.Lifecycle.ViewModel
-    {
-        public object Content { get; set; }
-    }
-}

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

@@ -52,7 +52,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
                 _view.Resources.DisplayMetrics.HeightPixels).ToSize(RenderScaling);
 
             NativeControlHost = new AndroidNativeControlHostImpl(avaloniaView);
-            StorageProvider = new AndroidStorageProvider((AvaloniaActivity)avaloniaView.Context);
+            StorageProvider = new AndroidStorageProvider((AvaloniaMainActivity)avaloniaView.Context);
         }
 
         public virtual Point GetAvaloniaPointFromEvent(MotionEvent e, int pointerIndex) =>

src/Android/Avalonia.Android/Platform/Storage/AndroidStorageProvider.cs

@@ -14,10 +14,10 @@ namespace Avalonia.Android.Platform.Storage;
 
 internal class AndroidStorageProvider : IStorageProvider
 {
-    private readonly AvaloniaActivity _activity;
+    private readonly AvaloniaMainActivity _activity;
     private int _lastRequestCode = 20000;
 
-    public AndroidStorageProvider(AvaloniaActivity activity)
+    public AndroidStorageProvider(AvaloniaMainActivity activity)
     {
         _activity = activity;
     }