diff --git a/src/Android/Avalonia.Android/AndroidPlatform.cs b/src/Android/Avalonia.Android/AndroidPlatform.cs index 3192629494..38619fe276 100644 --- a/src/Android/Avalonia.Android/AndroidPlatform.cs +++ b/src/Android/Avalonia.Android/AndroidPlatform.cs @@ -11,10 +11,11 @@ using Avalonia.Skia; using System; using System.Collections.Generic; using Avalonia.Android.Platform.SkiaPlatform; +using System.IO; namespace Avalonia.Android { - public class AndroidPlatform : IPlatformSettings, IWindowingPlatform + public class AndroidPlatform : IPlatformSettings, IWindowingPlatform, IPlatformIconLoader { public static readonly AndroidPlatform Instance = new AndroidPlatform(); public Size DoubleClickSize => new Size(4, 4); @@ -65,5 +66,15 @@ namespace Avalonia.Android { throw new NotImplementedException(); } + + public IIconImpl LoadIcon(string fileName) + { + return null; + } + + public IIconImpl LoadIcon(Stream stream) + { + return null; + } } } \ No newline at end of file diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs index 12371eec95..421885f45f 100644 --- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/WindowImpl.cs +++ b/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)); } + + public void SetIcon(IIconImpl icon) + { + // No window icons for mobile platforms + } } } \ No newline at end of file diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj index 3548aac61b..fcaee22c5a 100644 --- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj +++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj @@ -39,6 +39,7 @@ + diff --git a/src/iOS/Avalonia.iOS/AvaloniaView.cs b/src/iOS/Avalonia.iOS/AvaloniaView.cs index 8adc56dec2..74d637899b 100644 --- a/src/iOS/Avalonia.iOS/AvaloniaView.cs +++ b/src/iOS/Avalonia.iOS/AvaloniaView.cs @@ -214,7 +214,9 @@ namespace Avalonia.iOS } } - + public void SetIcon(IIconImpl icon) + { + } } class AvaloniaViewController : UIViewController diff --git a/src/iOS/Avalonia.iOS/PlatformIconLoader.cs b/src/iOS/Avalonia.iOS/PlatformIconLoader.cs new file mode 100644 index 0000000000..9cf60e7ce4 --- /dev/null +++ b/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; + } + } +} diff --git a/src/iOS/Avalonia.iOS/iOSPlatform.cs b/src/iOS/Avalonia.iOS/iOSPlatform.cs index e28aadf034..86f7a66895 100644 --- a/src/iOS/Avalonia.iOS/iOSPlatform.cs +++ b/src/iOS/Avalonia.iOS/iOSPlatform.cs @@ -61,7 +61,8 @@ namespace Avalonia.iOS .Bind().ToConstant(KeyboardDevice) .Bind().ToConstant(MouseDevice) .Bind().ToSingleton() - .Bind().ToConstant(PlatformThreadingInterface.Instance); + .Bind().ToConstant(PlatformThreadingInterface.Instance) + .Bind().ToSingleton(); } } }