Merge branch 'master' into issue-template-labels

build/ApiDiff.props

@@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ApiContractPackageVersion>0.10.0-rc1</ApiContractPackageVersion>
+    <ApiContractPackageVersion>0.10.0</ApiContractPackageVersion>
     <NugetPackageName Condition="'$(PackageId)' != ''">$(PackageId)</NugetPackageName>
     <NugetPackageName Condition="'$(PackageId)' == ''">Avalonia</NugetPackageName>
   </PropertyGroup>

build/SharedVersion.props

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Product>Avalonia</Product>
     <Version>0.10.999</Version>
-    <Copyright>Copyright 2020 &#169; The AvaloniaUI Project</Copyright>
+    <Copyright>Copyright 2021 &#169; The AvaloniaUI Project</Copyright>
     <PackageProjectUrl>https://avaloniaui.net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/AvaloniaUI/Avalonia/</RepositoryUrl>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

readme.md

@@ -12,8 +12,6 @@ Avalonia is a cross-platform XAML-based UI framework providing a flexible stylin
 
 ([Xaml Control Gallery](https://github.com/AvaloniaUI/xamlcontrolsgallery))
 
-> **Note:** The UI theme you see in the picture above is still work-in-progress and will be available in the upcoming Avalonia 0.10.0 release. However, you can connect to our nightly build feed and install latest pre-release versions of Avalonia NuGet packages, if you are willing to help out with the development and testing. See [Using nightly build feed](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed) for more info.
-
 To see the status of some of our features, please see our [Roadmap](https://github.com/AvaloniaUI/Avalonia/issues/2239). You can also see what [breaking changes](https://github.com/AvaloniaUI/Avalonia/issues/3538) we have planned and what our [past breaking changes](https://github.com/AvaloniaUI/Avalonia/wiki/Breaking-Changes) have been. [Awesome Avalonia](https://github.com/AvaloniaCommunity/awesome-avalonia) is community-curated list of awesome Avalonia UI tools, libraries, projects and resources. Go and see what people are building with Avalonia!
 
 ## 🚀 Getting Started

src/Android/Avalonia.Android/AndroidPlatform.cs

@@ -1,11 +1,13 @@
 using System;
+
+using Avalonia.Android;
 using Avalonia.Android.Platform;
 using Avalonia.Android.Platform.Input;
-using Avalonia.Android.Platform.SkiaPlatform;
 using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
+using Avalonia.OpenGL.Egl;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Shared.PlatformSupport;
@@ -17,7 +19,8 @@ namespace Avalonia
     {
         public static T UseAndroid<T>(this T builder) where T : AppBuilderBase<T>, new()
         {
-            builder.UseWindowingSubsystem(() => Android.AndroidPlatform.Initialize(builder.ApplicationType), "Android");
+            var options = AvaloniaLocator.Current.GetService<AndroidPlatformOptions>() ?? new AndroidPlatformOptions();
+            builder.UseWindowingSubsystem(() => AndroidPlatform.Initialize(builder.ApplicationType, options), "Android");
             builder.UseSkia();
             return builder;
         }
@@ -41,7 +44,7 @@ namespace Avalonia.Android
             _scalingFactor = global::Android.App.Application.Context.Resources.DisplayMetrics.ScaledDensity;
         }
 
-        public static void Initialize(Type appType)
+        public static void Initialize(Type appType, AndroidPlatformOptions options)
         {
             AvaloniaLocator.CurrentMutable
                 .Bind<IClipboard>().ToTransient<ClipboardImpl>()
@@ -60,6 +63,11 @@ namespace Avalonia.Android
             SkiaPlatform.Initialize();
             ((global::Android.App.Application) global::Android.App.Application.Context.ApplicationContext)
                 .RegisterActivityLifecycleCallbacks(new ActivityTracker());
+
+            if (options.UseGpu)
+            {
+                EglPlatformOpenGlInterface.TryInitialize();
+            }
         }
 
         public IWindowImpl CreateWindow()
@@ -72,4 +80,9 @@ namespace Avalonia.Android
             throw new NotSupportedException();
         }
     }
+
+    public sealed class AndroidPlatformOptions
+    {
+        public bool UseGpu { get; set; } = true;
+    }
 }

src/Android/Avalonia.Android/OpenGL/GlPlatformSurface.cs

@@ -0,0 +1,32 @@
+using System.Linq;
+
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+
+namespace Avalonia.Android.OpenGL
+{
+    internal sealed class GlPlatformSurface : EglGlPlatformSurfaceBase
+    {
+        private readonly EglPlatformOpenGlInterface _egl;
+        private readonly IEglWindowGlPlatformSurfaceInfo _info;
+
+        private GlPlatformSurface(EglPlatformOpenGlInterface egl, IEglWindowGlPlatformSurfaceInfo info)
+        {
+            _egl = egl;
+            _info = info;
+        }
+
+        public override IGlPlatformSurfaceRenderTarget CreateGlRenderTarget() =>
+            new GlRenderTarget(_egl, _info, _egl.CreateWindowSurface(_info.Handle));
+
+        public static GlPlatformSurface TryCreate(IEglWindowGlPlatformSurfaceInfo info)
+        {
+            if (EglPlatformOpenGlInterface.TryCreate() is EglPlatformOpenGlInterface egl)
+            {
+                return new GlPlatformSurface(egl, info);
+            }
+
+            return null;
+        }
+    }
+}

src/Android/Avalonia.Android/OpenGL/GlRenderTarget.cs

@@ -0,0 +1,23 @@
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
+
+namespace Avalonia.Android.OpenGL
+{
+    internal sealed class GlRenderTarget : EglPlatformSurfaceRenderTargetBase
+    {
+        private readonly EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo _info;
+        private readonly EglSurface _surface;
+
+        public GlRenderTarget(
+            EglPlatformOpenGlInterface egl,
+            EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo info,
+            EglSurface surface)
+            : base(egl)
+        {
+            _info = info;
+            _surface = surface;
+        }
+
+        public override IGlPlatformSurfaceRenderingSession BeginDraw() => BeginDraw(_surface, _info);
+    }
+}

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

@@ -0,0 +1,17 @@
+using Avalonia.Controls.Platform.Surfaces;
+using Avalonia.Platform;
+
+namespace Avalonia.Android.Platform.SkiaPlatform
+{
+    internal sealed class FramebufferManager : IFramebufferPlatformSurface
+    {
+        private readonly TopLevelImpl _topLevel;
+
+        public FramebufferManager(TopLevelImpl topLevel)
+        {
+            _topLevel = topLevel;
+        }
+
+        public ILockedFramebuffer Lock() => new AndroidFramebuffer(_topLevel.InternalView.Holder.Surface);
+    }
+}

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

@@ -2,7 +2,10 @@ using System;
 using System.Collections.Generic;
 using Android.Content;
 using Android.Graphics;
+using Android.Runtime;
 using Android.Views;
+
+using Avalonia.Android.OpenGL;
 using Avalonia.Android.Platform.Input;
 using Avalonia.Android.Platform.Specific;
 using Avalonia.Android.Platform.Specific.Helpers;
@@ -10,13 +13,18 @@ using Avalonia.Controls;
 using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Input;
 using Avalonia.Input.Raw;
+using Avalonia.OpenGL.Egl;
+using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
-    class TopLevelImpl : IAndroidView, ITopLevelImpl,  IFramebufferPlatformSurface
+    class TopLevelImpl : IAndroidView, ITopLevelImpl, EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo
     {
+        private readonly IGlPlatformSurface _gl;
+        private readonly IFramebufferPlatformSurface _framebuffer;
+
         private readonly AndroidKeyboardEventsHelper<TopLevelImpl> _keyboardHelper;
         private readonly AndroidTouchEventsHelper<TopLevelImpl> _touchHelper;
 
@@ -29,7 +37,8 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             _touchHelper = new AndroidTouchEventsHelper<TopLevelImpl>(this, () => InputRoot,
                 p => GetAvaloniaPointFromEvent(p));
 
-            Surfaces = new object[] { this };
+            _gl = GlPlatformSurface.TryCreate(this);
+            _framebuffer = new FramebufferManager(this);
 
             MaxClientSize = new Size(_view.Resources.DisplayMetrics.WidthPixels,
                 _view.Resources.DisplayMetrics.HeightPixels);
@@ -48,7 +57,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
                 _keyboardHelper.HandleEvents = _handleEvents;
             }
         }
-        
+
         public virtual Point GetAvaloniaPointFromEvent(MotionEvent e) => new Point(e.GetX(), e.GetY());
 
         public IInputRoot InputRoot { get; private set; }
@@ -63,7 +72,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
             }
             set
             {
-                
+
             }
         }
 
@@ -83,9 +92,11 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public View View => _view;
 
+        internal InvalidationAwareSurfaceView InternalView => _view;
+
         public IPlatformHandle Handle => _view;
 
-        public IEnumerable<object> Surfaces { get; }
+        public IEnumerable<object> Surfaces => new object[] { _gl, _framebuffer };
 
         public IRenderer CreateRenderer(IRenderRoot root)
         {
@@ -96,7 +107,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
         {
             _view.Visibility = ViewStates.Invisible;
         }
-        
+
         public void Invalidate(Rect rect)
         {
             if (_view.Holder?.Surface?.IsValid == true) _view.Invalidate();
@@ -203,7 +214,12 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
         public AcrylicPlatformCompensationLevels AcrylicCompensationLevels => new AcrylicPlatformCompensationLevels(1, 1, 1);
 
-        ILockedFramebuffer IFramebufferPlatformSurface.Lock() => new AndroidFramebuffer(_view.Holder.Surface);
+        IntPtr EglGlPlatformSurfaceBase.IEglWindowGlPlatformSurfaceInfo.Handle =>
+            AndroidFramebuffer.ANativeWindow_fromSurface(JNIEnv.Handle, _view.Holder.Surface.Handle);
+
+        public PixelSize Size => new PixelSize(_view.Holder.SurfaceFrame.Width(), _view.Holder.SurfaceFrame.Height());
+
+        public double Scaling => RenderScaling;
 
         public void SetTransparencyLevelHint(WindowTransparencyLevel transparencyLevel)
         {

src/Avalonia.Controls/Primitives/LightDismissOverlayLayer.cs

@@ -2,6 +2,7 @@ using System;
 using System.Linq;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
+using Avalonia.Media;
 using Avalonia.Rendering;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
@@ -17,6 +18,11 @@ namespace Avalonia.Controls.Primitives
     {
         public IInputElement? InputPassThroughElement { get; set; }
 
+        static LightDismissOverlayLayer()
+        {
+            BackgroundProperty.OverrideDefaultValue<LightDismissOverlayLayer>(Brushes.Transparent);
+        }
+
         /// <summary>
         /// Returns the light dismiss overlay for a specified visual.
         /// </summary>

src/Avalonia.Controls/Primitives/VisualLayerManager.cs

@@ -74,7 +74,6 @@ namespace Avalonia.Controls.Primitives
                 {
                     rv = new LightDismissOverlayLayer
                     {
-                        Background = Brushes.Transparent,
                         IsVisible = false
                     };
 

src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml

@@ -99,7 +99,7 @@
       </StackPanel>
      </StackPanel> 
     <StackPanel VerticalAlignment="Bottom" Margin="10">
-      <TextBlock Text="© 2020 The Avalonia Project" TextWrapping="Wrap" HorizontalAlignment="Center" />
+      <TextBlock Text="© 2021 The Avalonia Project" TextWrapping="Wrap" HorizontalAlignment="Center" />
     </StackPanel>
   </Grid>
 </Window>

src/Avalonia.OpenGL/Egl/EglInterface.cs

@@ -30,8 +30,10 @@ namespace Avalonia.OpenGL.Egl
         static Func<string, IntPtr> Load()
         {
             var os = AvaloniaLocator.Current.GetService<IRuntimePlatform>().GetRuntimeInfo().OperatingSystem;
-            if(os == OperatingSystemType.Linux || os == OperatingSystemType.Android)
+            if(os == OperatingSystemType.Linux)
                 return Load("libEGL.so.1");
+            if (os == OperatingSystemType.Android)
+                return Load("libEGL.so");
 
             throw new PlatformNotSupportedException();
         }

src/Avalonia.OpenGL/GlInterface.cs

@@ -128,7 +128,7 @@ namespace Avalonia.OpenGL
             int dstY1,
             int mask,
             int filter);
-        [GlMinVersionEntryPoint("glBlitFramebuffer", 3, 0)]
+        [GlMinVersionEntryPoint("glBlitFramebuffer", 3, 0), GlOptionalEntryPoint]
         public GlBlitFramebuffer BlitFramebuffer { get; }
         
         public delegate void GlGenRenderbuffers(int count, int[] res);

src/Avalonia.Themes.Fluent/Controls/Expander.xaml

@@ -26,6 +26,9 @@
       </ControlTemplate>
     </Setter>
   </Style>
+  <Style Selector="Expander[IsExpanded=true] /template/ ToggleButton#PART_toggle /template/ ContentPresenter#PART_ContentPresenter">
+    <Setter Property="TextBlock.Foreground" Value="{DynamicResource ToggleButtonForeground}"/>
+  </Style>
   <Style Selector="Expander[ExpandDirection=Up]">
     <Setter Property="Template">
       <ControlTemplate>

src/Shared/PlatformSupport/DynLoader.cs

@@ -11,13 +11,25 @@ namespace Avalonia.Shared.PlatformSupport
         // ReSharper disable InconsistentNaming
         static class LinuxImports
         {
+#if __ANDROID__
+            [DllImport("libdl.so")]
+#else
             [DllImport("libdl.so.2")]
+#endif
             private static extern IntPtr dlopen(string path, int flags);
 
+#if __ANDROID__
+            [DllImport("libdl.so")]
+#else
             [DllImport("libdl.so.2")]
+#endif
             private static extern IntPtr dlsym(IntPtr handle, string symbol);
 
+#if __ANDROID__
+            [DllImport("libdl.so")]
+#else
             [DllImport("libdl.so.2")]
+#endif
             private static extern IntPtr dlerror();
 
             public static void Init()
@@ -27,7 +39,7 @@ namespace Avalonia.Shared.PlatformSupport
                 DlError = dlerror;
             }
         }
-        
+
         static class OsXImports
         {