Browse Source

Added do-nothing iOS and Android window icon support.

pull/575/head
Jeremy Koritzinsky 10 years ago
parent
commit
c2a783e2ca
  1. 13
      src/Android/Avalonia.Android/AndroidPlatform.cs
  2. 5
      src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs
  3. 1
      src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
  4. 4
      src/iOS/Avalonia.iOS/AvaloniaView.cs
  5. 21
      src/iOS/Avalonia.iOS/PlatformIconLoader.cs
  6. 3
      src/iOS/Avalonia.iOS/iOSPlatform.cs

13
src/Android/Avalonia.Android/AndroidPlatform.cs

@ -11,10 +11,11 @@ using Avalonia.Skia;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Avalonia.Android.Platform.SkiaPlatform; using Avalonia.Android.Platform.SkiaPlatform;
using System.IO;
namespace Avalonia.Android namespace Avalonia.Android
{ {
public class AndroidPlatform : IPlatformSettings, IWindowingPlatform public class AndroidPlatform : IPlatformSettings, IWindowingPlatform, IPlatformIconLoader
{ {
public static readonly AndroidPlatform Instance = new AndroidPlatform(); public static readonly AndroidPlatform Instance = new AndroidPlatform();
public Size DoubleClickSize => new Size(4, 4); public Size DoubleClickSize => new Size(4, 4);
@ -65,5 +66,15 @@ namespace Avalonia.Android
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
public IIconImpl LoadIcon(string fileName)
{
return null;
}
public IIconImpl LoadIcon(Stream stream)
{
return null;
}
} }
} }

5
src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs

@ -180,5 +180,10 @@ namespace Avalonia.Android.Platform.SkiaPlatform
{ {
Paint?.Invoke(new Rect(new Point(0, 0), ClientSize)); Paint?.Invoke(new Rect(new Point(0, 0), ClientSize));
} }
public void SetIcon(IIconImpl icon)
{
// No window icons for mobile platforms
}
} }
} }

1
src/iOS/Avalonia.iOS/Avalonia.iOS.csproj

@ -39,6 +39,7 @@
<Compile Include="Extensions.cs" /> <Compile Include="Extensions.cs" />
<Compile Include="iOSPlatform.cs" /> <Compile Include="iOSPlatform.cs" />
<Compile Include="AvaloniaView.cs" /> <Compile Include="AvaloniaView.cs" />
<Compile Include="PlatformIconLoader.cs" />
<Compile Include="PlatformSettings.cs" /> <Compile Include="PlatformSettings.cs" />
<Compile Include="PlatformThreadingInterface.cs" /> <Compile Include="PlatformThreadingInterface.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />

4
src/iOS/Avalonia.iOS/AvaloniaView.cs

@ -214,7 +214,9 @@ namespace Avalonia.iOS
} }
} }
public void SetIcon(IIconImpl icon)
{
}
} }
class AvaloniaViewController : UIViewController class AvaloniaViewController : UIViewController

21
src/iOS/Avalonia.iOS/PlatformIconLoader.cs

@ -0,0 +1,21 @@
using Avalonia.Platform;
using System;
using System.Collections.Generic;
using System.Text;
using System.IO;
namespace Avalonia.iOS
{
class PlatformIconLoader : IPlatformIconLoader
{
public IIconImpl LoadIcon(Stream stream)
{
return null;
}
public IIconImpl LoadIcon(string fileName)
{
return null;
}
}
}

3
src/iOS/Avalonia.iOS/iOSPlatform.cs

@ -61,7 +61,8 @@ namespace Avalonia.iOS
.Bind<IKeyboardDevice>().ToConstant(KeyboardDevice) .Bind<IKeyboardDevice>().ToConstant(KeyboardDevice)
.Bind<IMouseDevice>().ToConstant(MouseDevice) .Bind<IMouseDevice>().ToConstant(MouseDevice)
.Bind<IPlatformSettings>().ToSingleton<PlatformSettings>() .Bind<IPlatformSettings>().ToSingleton<PlatformSettings>()
.Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance); .Bind<IPlatformThreadingInterface>().ToConstant(PlatformThreadingInterface.Instance)
.Bind<IPlatformIconLoader>().ToSingleton<PlatformIconLoader>();
} }
} }
} }

Loading…
Cancel
Save