Merge branch 'master' into features/NetAnalyzers/CA1802

samples/ControlCatalog.Android/MainActivity.cs

@@ -5,16 +5,8 @@ using Avalonia.Android;
 
 namespace ControlCatalog.Android
 {
-    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleInstance, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
-    public class MainActivity : AvaloniaActivity<App>
+    [Activity(Label = "ControlCatalog.Android", Theme = "@style/MyTheme.NoActionBar", Icon = "@drawable/icon", LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize)]
+    public class MainActivity : AvaloniaMainActivity
     {
-        protected override AppBuilder CustomizeAppBuilder(AppBuilder builder)
-        {
-            return base.CustomizeAppBuilder(builder)
-                .AfterSetup(_ =>
-                {
-                    Pages.EmbedSample.Implementation = new EmbedSampleAndroid();
-                });
-        }
     }
 }

samples/ControlCatalog.Android/SplashActivity.cs

@@ -1,12 +1,23 @@
 using Android.App;
 using Android.Content;
+using Android.Content.PM;
 using Android.OS;
+using Avalonia.Android;
 
 namespace ControlCatalog.Android
 {
     [Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
-    public class SplashActivity : Activity
+    public class SplashActivity : AvaloniaSplashActivity<App>
     {
+        protected override Avalonia.AppBuilder CustomizeAppBuilder(Avalonia.AppBuilder builder)
+        {
+            return base.CustomizeAppBuilder(builder)
+                 .AfterSetup(_ =>
+                 {
+                     Pages.EmbedSample.Implementation = new EmbedSampleAndroid();
+                 });
+        }
+
         protected override void OnCreate(Bundle? savedInstanceState)
         {
             base.OnCreate(savedInstanceState);

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

@@ -1,105 +0,0 @@
-using Android.OS;
-using AndroidX.AppCompat.App;
-using Android.Content.Res;
-using AndroidX.Lifecycle;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Controls;
-using Android.Runtime;
-using Android.App;
-using Android.Content;
-using System;
-
-namespace Avalonia.Android
-{
-    public abstract class AvaloniaActivity : AppCompatActivity
-    {
-        internal class SingleViewLifetime : ISingleViewApplicationLifetime
-        {
-            public AvaloniaView View { get; internal set; }
-
-            public Control MainView
-            {
-                get => (Control)View.Content;
-                set => View.Content = value;
-            }
-        }
-
-        internal Action<int, Result, Intent> ActivityResult;
-        internal AvaloniaView View;
-        internal AvaloniaViewModel _viewModel;
-
-        protected abstract AppBuilder CreateAppBuilder();
-
-        protected override void OnCreate(Bundle savedInstanceState)
-        {
-            var builder = CreateAppBuilder();
-
-
-            var lifetime = new SingleViewLifetime();
-
-            builder.AfterSetup(x =>
-            {
-                _viewModel = new ViewModelProvider(this).Get(Java.Lang.Class.FromType(typeof(AvaloniaViewModel))) as AvaloniaViewModel;
-
-                View = new AvaloniaView(this);
-                if (_viewModel.Content != null)
-                {
-                    View.Content = _viewModel.Content;
-                }
-
-                SetContentView(View);
-                lifetime.View = View;
-
-                View.Prepare();
-            });
-
-            builder.SetupWithLifetime(lifetime);
-
-            base.OnCreate(savedInstanceState);
-        }
-        public object Content
-        {
-            get
-            {
-                return _viewModel.Content;
-            }
-            set
-            {
-                _viewModel.Content = value;
-                if (View != null)
-                    View.Content = value;
-            }
-        }
-
-        public override void OnConfigurationChanged(Configuration newConfig)
-        {
-            base.OnConfigurationChanged(newConfig);
-        }
-
-        protected override void OnDestroy()
-        {
-            View.Content = null;
-
-            base.OnDestroy();
-        }
-
-        protected override void OnActivityResult(int requestCode, [GeneratedEnum] Result resultCode, Intent data)
-        {
-            base.OnActivityResult(requestCode, resultCode, data);
-
-            ActivityResult?.Invoke(requestCode, resultCode, data);
-        }
-    }
-
-    public abstract class AvaloniaActivity<TApp> : AvaloniaActivity where TApp : Application, new()
-    {
-        protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder.UseAndroid();
-
-        protected override AppBuilder CreateAppBuilder()
-        {
-            var builder = AppBuilder.Configure<TApp>();
-
-            return CustomizeAppBuilder(builder);
-        }
-    }
-}

src/Android/Avalonia.Android/AvaloniaMainActivity.cs

@@ -0,0 +1,72 @@
+using System;
+using Android.App;
+using Android.Content;
+using Android.Content.Res;
+using Android.OS;
+using Android.Runtime;
+using AndroidX.AppCompat.App;
+using AndroidX.Lifecycle;
+
+namespace Avalonia.Android
+{
+    public abstract class AvaloniaMainActivity : AppCompatActivity
+    {
+        internal static object ViewContent;
+
+        internal Action<int, Result, Intent> ActivityResult;
+        internal AvaloniaView View;
+
+        protected override void OnCreate(Bundle savedInstanceState)
+        {
+            View = new AvaloniaView(this);
+            if (ViewContent != null)
+            {
+                View.Content = ViewContent;
+            }
+
+            View.Prepare();
+
+            if (Avalonia.Application.Current.ApplicationLifetime is SingleViewLifetime lifetime)
+            {
+                lifetime.View = View;
+            }
+
+            base.OnCreate(savedInstanceState);
+
+            SetContentView(View);
+        }
+
+        public object Content
+        {
+            get
+            {
+                return ViewContent;
+            }
+            set
+            {
+                ViewContent = value;
+                if (View != null)
+                    View.Content = value;
+            }
+        }
+
+        public override void OnConfigurationChanged(Configuration newConfig)
+        {
+            base.OnConfigurationChanged(newConfig);
+        }
+
+        protected override void OnDestroy()
+        {
+            View.Content = null;
+
+            base.OnDestroy();
+        }
+
+        protected override void OnActivityResult(int requestCode, [GeneratedEnum] Result resultCode, Intent data)
+        {
+            base.OnActivityResult(requestCode, resultCode, data);
+
+            ActivityResult?.Invoke(requestCode, resultCode, data);
+        }
+    }
+}

src/Android/Avalonia.Android/AvaloniaSplashActivity.cs

@@ -0,0 +1,34 @@
+using Android.OS;
+using AndroidX.AppCompat.App;
+using AndroidX.Lifecycle;
+
+namespace Avalonia.Android
+{
+    public abstract class AvaloniaSplashActivity : AppCompatActivity
+    {
+        protected abstract AppBuilder CreateAppBuilder();
+
+        protected override void OnCreate(Bundle? savedInstanceState)
+        {
+            base.OnCreate(savedInstanceState);
+
+            var builder = CreateAppBuilder();
+
+            var lifetime = new SingleViewLifetime();
+
+            builder.SetupWithLifetime(lifetime);
+        }
+    }
+
+    public abstract class AvaloniaSplashActivity<TApp> : AvaloniaSplashActivity where TApp : Application, new()
+    {
+        protected virtual AppBuilder CustomizeAppBuilder(AppBuilder builder) => builder.UseAndroid();
+
+        protected override AppBuilder CreateAppBuilder()
+        {
+            var builder = AppBuilder.Configure<TApp>();
+
+            return CustomizeAppBuilder(builder);
+        }
+    }
+}

src/Android/Avalonia.Android/AvaloniaView.cs

@@ -74,7 +74,7 @@ namespace Avalonia.Android
 
         class ViewImpl : TopLevelImpl
         {
-            public ViewImpl(AvaloniaView avaloniaView) : base(avaloniaView)
+            public ViewImpl(AvaloniaView avaloniaView) : base(avaloniaView, true)
             {
                 View.Focusable = true;
                 View.FocusChange += ViewImpl_FocusChange;

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/OpenGL/GlPlatformSurface.cs

@@ -1,4 +1,5 @@
-using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL;
+using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 
 namespace Avalonia.Android.OpenGL
@@ -19,7 +20,8 @@ namespace Avalonia.Android.OpenGL
 
         public static GlPlatformSurface TryCreate(IEglWindowGlPlatformSurfaceInfo info)
         {
-            if (EglPlatformOpenGlInterface.TryCreate() is EglPlatformOpenGlInterface egl)
+            var feature = AvaloniaLocator.Current.GetService<IPlatformOpenGlInterface>();
+            if (feature is EglPlatformOpenGlInterface egl)
             {
                 return new GlPlatformSurface(egl, info);
             }

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

@@ -3,20 +3,14 @@ using System.Collections.Generic;
 
 using Android.Content;
 using Android.Graphics;
-using Android.Media.TV;
-using Android.OS;
 using Android.Runtime;
-using Android.Text;
 using Android.Views;
 using Android.Views.InputMethods;
-using Android.Widget;
 using Avalonia.Android.OpenGL;
-using Avalonia.Android.Platform.Input;
 using Avalonia.Android.Platform.Specific;
 using Avalonia.Android.Platform.Specific.Helpers;
 using Avalonia.Android.Platform.Storage;
 using Avalonia.Controls;
-using Avalonia.Controls.Documents;
 using Avalonia.Controls.Platform;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Input;
@@ -29,7 +23,6 @@ using Avalonia.Platform.Storage;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
 using Java.Lang;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
@@ -59,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) =>
@@ -301,7 +294,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
             IsComposing = true;
 
-            _inputMethod.Client.SetPreeditText(ComposingText);
+            _inputMethod.Client?.SetPreeditText(ComposingText);
 
             return base.SetComposingText(text, newCursorPosition);
         }

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;
     }

src/Android/Avalonia.Android/SingleViewLifetime.cs

@@ -0,0 +1,26 @@
+using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace Avalonia.Android
+{
+    internal class SingleViewLifetime : ISingleViewApplicationLifetime
+    {
+        private AvaloniaView _view;
+
+        public AvaloniaView View
+        {
+            get => _view; internal set
+            {
+                if (_view != null)
+                {
+                    _view.Content = null;
+                    _view.Dispose();
+                }
+                _view = value;
+                _view.Content = MainView;
+            }
+        }
+
+        public Control MainView { get; set; }
+    }
+}

src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj

@@ -9,6 +9,11 @@
         <NoWarn>NU1605;CS8632</NoWarn>
     </PropertyGroup>
 
+    <!--Disable Net Perf. analyzer for submodule to avoid commit issue -->
+    <PropertyGroup>
+      <EnableNETAnalyzers>false</EnableNETAnalyzers>
+    </PropertyGroup>
+
     <ItemGroup>
       <Compile Include="../Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs">
         <Link>Shared/AvaloniaResourcesIndex.cs</Link>