Browse Source

Android and browser internals

pull/10336/head
Max Katz 4 years ago
parent
commit
d27936af67
  1. 4
      src/Android/Avalonia.Android/AndroidInputMethod.cs
  2. 1
      src/Android/Avalonia.Android/Avalonia.Android.csproj
  3. 2
      src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs
  4. 2
      src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs
  5. 4
      src/Android/Avalonia.Android/PlatformIconLoader.cs
  6. 6
      src/Android/Avalonia.Android/Stubs.cs
  7. 2
      src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs

4
src/Android/Avalonia.Android/AndroidInputMethod.cs

@ -32,7 +32,7 @@ namespace Avalonia.Android
ActionPrevious = 0x00000007, ActionPrevious = 0x00000007,
} }
class AndroidInputMethod<TView> : ITextInputMethodImpl, IAndroidInputMethod internal class AndroidInputMethod<TView> : ITextInputMethodImpl, IAndroidInputMethod
where TView : View, IInitEditorInfo where TView : View, IInitEditorInfo
{ {
private readonly TView _host; 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 _start = -1;
private readonly int _end = -1; private readonly int _end = -1;

1
src/Android/Avalonia.Android/Avalonia.Android.csproj

@ -5,6 +5,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver> <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<AndroidResgenNamespace>Avalonia.Android.Internal</AndroidResgenNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" /> <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />

2
src/Android/Avalonia.Android/Platform/Input/AndroidKeyboardDevice.cs

@ -5,7 +5,7 @@ using Avalonia.Input;
namespace Avalonia.Android.Platform.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> private static readonly Dictionary<Keycode, Key> KeyDic = new Dictionary<Keycode, Key>
{ {
// { Keycode.Cancel?, Key.Cancel }, // { Keycode.Cancel?, Key.Cancel },

2
src/Android/Avalonia.Android/Platform/SkiaPlatform/InvalidationAwareSurfaceView.cs

@ -10,7 +10,7 @@ using Avalonia.Platform;
namespace Avalonia.Android namespace Avalonia.Android
{ {
public abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle internal abstract class InvalidationAwareSurfaceView : SurfaceView, ISurfaceHolderCallback, IPlatformNativeSurfaceHandle
{ {
bool _invalidateQueued; bool _invalidateQueued;
readonly object _lock = new object(); readonly object _lock = new object();

4
src/Android/Avalonia.Android/PlatformIconLoader.cs

@ -3,7 +3,7 @@ using Avalonia.Platform;
namespace Avalonia.Android namespace Avalonia.Android
{ {
class PlatformIconLoader : IPlatformIconLoader internal class PlatformIconLoader : IPlatformIconLoader
{ {
public IWindowIconImpl LoadIcon(IBitmapImpl bitmap) 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 // 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(); private Stream stream = new MemoryStream();

6
src/Android/Avalonia.Android/Stubs.cs

@ -4,7 +4,7 @@ using Avalonia.Platform;
namespace Avalonia.Android namespace Avalonia.Android
{ {
class WindowingPlatformStub : IWindowingPlatform internal class WindowingPlatformStub : IWindowingPlatform
{ {
public IWindowImpl CreateWindow() => throw new NotSupportedException(); public IWindowImpl CreateWindow() => throw new NotSupportedException();
@ -13,7 +13,7 @@ namespace Avalonia.Android
public ITrayIconImpl CreateTrayIcon() => null; public ITrayIconImpl CreateTrayIcon() => null;
} }
class PlatformIconLoaderStub : IPlatformIconLoader internal class PlatformIconLoaderStub : IPlatformIconLoader
{ {
public IWindowIconImpl LoadIcon(IBitmapImpl bitmap) public IWindowIconImpl LoadIcon(IBitmapImpl bitmap)
{ {
@ -38,7 +38,7 @@ namespace Avalonia.Android
} }
} }
public class IconStub : IWindowIconImpl internal class IconStub : IWindowIconImpl
{ {
private readonly MemoryStream _ms; private readonly MemoryStream _ms;

2
src/Browser/Avalonia.Browser/Skia/BrowserSkiaGpu.cs

@ -6,7 +6,7 @@ using Avalonia.Reactive;
namespace Avalonia.Browser.Skia namespace Avalonia.Browser.Skia
{ {
public class BrowserSkiaGpu : ISkiaGpu internal class BrowserSkiaGpu : ISkiaGpu
{ {
public ISkiaGpuRenderTarget? TryCreateRenderTarget(IEnumerable<object> surfaces) public ISkiaGpuRenderTarget? TryCreateRenderTarget(IEnumerable<object> surfaces)
{ {

Loading…
Cancel
Save