From d27936af67f79101bae2df07a5b0113b85f90ec5 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Mon, 13 Feb 2023 23:05:50 -0500
Subject: [PATCH] Android and browser internals

---
 src/Android/Avalonia.Android/AndroidInputMethod.cs          | 4 ++--
 src/Android/Avalonia.Android/Avalonia.Android.csproj        | 1 +
 .../Platform/Input/AndroidKeyboardDevice.cs                 | 2 +-
 .../Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs   | 2 +-
 src/Android/Avalonia.Android/PlatformIconLoader.cs          | 4 ++--
 src/Android/Avalonia.Android/Stubs.cs                       | 6 +++---
 src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs         | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Android/Avalonia.Android/AndroidInputMethod.cs b/src/Android/Avalonia.Android/AndroidInputMethod.cs
index c885a7768c..df0c494648 100644
--- a/src/Android/Avalonia.Android/AndroidInputMethod.cs
+++ b/src/Android/Avalonia.Android/AndroidInputMethod.cs
@@ -32,7 +32,7 @@ namespace Avalonia.Android
        ActionPrevious = 0x00000007,
     }
 
-    class AndroidInputMethod<TView> : ITextInputMethodImpl, IAndroidInputMethod
+    internal class AndroidInputMethod<TView> : ITextInputMethodImpl, IAndroidInputMethod
         where TView : View, IInitEditorInfo
     {
         private readonly TView _host;
@@ -167,7 +167,7 @@ namespace Avalonia.Android
         }
     }
 
-    public readonly record struct ComposingRegion
+    internal readonly record struct ComposingRegion
     {
         private readonly int _start = -1;
         private readonly int _end = -1;
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
index 66557418dd..2533016e9f 100644
--- a/src/Android/Avalonia.Android/Avalonia.Android.csproj
+++ b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -5,6 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
     <DebugType>portable</DebugType>
+    <AndroidResgenNamespace>Avalonia.Android.Internal</AndroidResgenNamespace>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
diff --git a/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs b/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs
index 726ccdbbdd..ab84801e57 100644
--- a/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs
+++ b/src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs
@@ -5,7 +5,7 @@ using Avalonia.Input;
 
 namespace Avalonia.Android.Platform.Input
 {
-    public class AndroidKeyboardDevice : KeyboardDevice, IKeyboardDevice {
+    internal class AndroidKeyboardDevice : KeyboardDevice, IKeyboardDevice {
     private static readonly Dictionary<Keycode, Key> KeyDic = new Dictionary<Keycode, Key>
      {
          //   { Keycode.Cancel?, Key.Cancel },
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
index f205458f0e..47297a4f76 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
@@ -10,7 +10,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
+    internal abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
     {
         bool _invalidateQueued;
         readonly object _lock = new object();
diff --git a/src/Android/Avalonia.Android/PlatformIconLoader.cs b/src/Android/Avalonia.Android/PlatformIconLoader.cs
index 88677a9375..f557685dd2 100644
--- a/src/Android/Avalonia.Android/PlatformIconLoader.cs
+++ b/src/Android/Avalonia.Android/PlatformIconLoader.cs
@@ -3,7 +3,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    class PlatformIconLoader : IPlatformIconLoader
+    internal class PlatformIconLoader : IPlatformIconLoader
     {
         public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
@@ -29,7 +29,7 @@ namespace Avalonia.Android
     }
 
     // Stores the icon created as a stream to support saving even though an icon is never shown
-    public class FakeIcon : IWindowIconImpl
+    internal class FakeIcon : IWindowIconImpl
     {
         private Stream stream = new MemoryStream();
 
diff --git a/src/Android/Avalonia.Android/Stubs.cs b/src/Android/Avalonia.Android/Stubs.cs
index f36c01dbc8..05638cdf88 100644
--- a/src/Android/Avalonia.Android/Stubs.cs
+++ b/src/Android/Avalonia.Android/Stubs.cs
@@ -4,7 +4,7 @@ using Avalonia.Platform;
 
 namespace Avalonia.Android
 {
-    class WindowingPlatformStub : IWindowingPlatform
+    internal class WindowingPlatformStub : IWindowingPlatform
     {
         public IWindowImpl CreateWindow() => throw new NotSupportedException();
 
@@ -13,7 +13,7 @@ namespace Avalonia.Android
         public ITrayIconImpl CreateTrayIcon() => null;
     }
 
-    class PlatformIconLoaderStub : IPlatformIconLoader
+    internal class PlatformIconLoaderStub : IPlatformIconLoader
     {
         public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
         {
@@ -38,7 +38,7 @@ namespace Avalonia.Android
         }
     }
 
-    public class IconStub : IWindowIconImpl
+    internal class IconStub : IWindowIconImpl
     {
         private readonly MemoryStream _ms;
 
diff --git a/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs b/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs
index 4d3d8dcd97..3c04935f0d 100644
--- a/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs
+++ b/src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs
@@ -6,7 +6,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.Browser.Skia
 {
-    public class BrowserSkiaGpu : ISkiaGpu
+    internal class BrowserSkiaGpu : ISkiaGpu
     {
         public ISkiaGpuRenderTarget? TryCreateRenderTarget(IEnumerable<object> surfaces)
         {