Skip to content

Commit 55019b2

Browse files
MartinZikmundMartinZikmund
committed
feat: Adjust Uno WinRT for tvOS
1 parent ac2d071 commit 55019b2

20 files changed

+27
-53
lines changed

‎src/Uno.UWP/ApplicationModel/DataTransfer/Clipboard.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !IS_UNIT_TESTS
1+
#if !IS_UNIT_TESTS && !__TVOS__
22

33
using System;
44

@@ -44,7 +44,7 @@ public static event EventHandler<object> ContentChanged
4444
}
4545
}
4646

47-
#if __ANDROID__ || __IOS__ || __MACOS__ || __SKIA__ || __WASM__
47+
#if __ANDROID__ || __IOS__ || __MACOS__ || __SKIA__ || __WASM__ || __TVOS__
4848
private static void OnContentChanged()
4949
{
5050
_contentChanged?.Invoke(null, null);

‎src/Uno.UWP/ApplicationModel/DataTransfer/Clipboard.iOS.cs renamed to ‎src/Uno.UWP/ApplicationModel/DataTransfer/Clipboard.iOSmacOS.cs

File renamed without changes.

‎src/Uno.UWP/ApplicationModel/Package.iOSmacOS.cs renamed to ‎src/Uno.UWP/ApplicationModel/Package.Apple.cs

File renamed without changes.

‎src/Uno.UWP/ApplicationModel/Package.Other.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !(__IOS__ || __ANDROID__ || __MACOS__)
1+
#if !(__IOS__ || __ANDROID__ || __MACOS__ || __TVOS__)
22
#nullable enable
33
using System;
44
using System.Reflection;

‎src/Uno.UWP/Devices/Haptics/VibrationDevice.iOS.cs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,19 @@
33
using System.Threading.Tasks;
44
using UIKit;
55

6-
namespace Windows.Devices.Haptics
6+
namespace Windows.Devices.Haptics;
7+
8+
public partial class VibrationDevice
79
{
8-
public partial class VibrationDevice
9-
{
10-
private static Task<VibrationAccessStatus> RequestAccessTaskAsync() =>
11-
Task.FromResult(VibrationAccessStatus.Allowed);
10+
private static Task<VibrationAccessStatus> RequestAccessTaskAsync() =>
11+
Task.FromResult(VibrationAccessStatus.Allowed);
1212

13-
private static Task<VibrationDevice?> GetDefaultTaskAsync()
13+
private static Task<VibrationDevice?> GetDefaultTaskAsync()
14+
{
15+
if (UIDevice.CurrentDevice.CheckSystemVersion(10, 0))
1416
{
15-
if (UIDevice.CurrentDevice.CheckSystemVersion(10, 0))
16-
{
17-
return Task.FromResult<VibrationDevice?>(new VibrationDevice());
18-
}
19-
return Task.FromResult<VibrationDevice?>(null);
17+
return Task.FromResult<VibrationDevice?>(new VibrationDevice());
2018
}
19+
return Task.FromResult<VibrationDevice?>(null);
2120
}
2221
}

‎src/Uno.UWP/Devices/Haptics/VibrationDevice.unsupported.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
#if IS_UNIT_TESTS || __NETSTD_REFERENCE__
1+
#if IS_UNIT_TESTS || __NETSTD_REFERENCE__ || __TVOS__
22
#nullable enable
33

44
using System.Threading.Tasks;
55

6-
namespace Windows.Devices.Haptics
6+
namespace Windows.Devices.Haptics;
7+
8+
public partial class VibrationDevice
79
{
8-
public partial class VibrationDevice
9-
{
10-
private static Task<VibrationAccessStatus> RequestAccessTaskAsync() =>
11-
Task.FromResult(VibrationAccessStatus.Allowed);
10+
private static Task<VibrationAccessStatus> RequestAccessTaskAsync() =>
11+
Task.FromResult(VibrationAccessStatus.Allowed);
1212

13-
private static Task<VibrationDevice?> GetDefaultTaskAsync() =>
14-
Task.FromResult<VibrationDevice?>(null);
15-
}
13+
private static Task<VibrationDevice?> GetDefaultTaskAsync() =>
14+
Task.FromResult<VibrationDevice?>(null);
1615
}
1716
#endif

‎src/Uno.UWP/Devices/Midi/MidiInPort.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !IS_UNIT_TESTS && !__SKIA__ && !__NETSTD_REFERENCE__
1+
#if !IS_UNIT_TESTS && !__SKIA__ && !__NETSTD_REFERENCE__ && !__TVOS__
22
using System;
33

44
using Uno.Devices.Enumeration.Internal;

‎src/Uno.UWP/Devices/Midi/MidiInPort.unsupported.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IS_UNIT_TESTS || __SKIA__ || __NETSTD_REFERENCE__
1+
#if IS_UNIT_TESTS || __SKIA__ || __NETSTD_REFERENCE__ || __TVOS__
22
namespace Windows.Devices.Midi
33
{
44
public partial class MidiInPort

‎src/Uno.UWP/Devices/Midi/MidiOutPort.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !IS_UNIT_TESTS && !__SKIA__ && !__NETSTD_REFERENCE__
1+
#if !IS_UNIT_TESTS && !__SKIA__ && !__NETSTD_REFERENCE__ && !__TVOS__
22
using System;
33
using Uno.Devices.Enumeration.Internal;
44
using Windows.Foundation;

‎src/Uno.UWP/Devices/Midi/MidiOutPort.unsupported.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if IS_UNIT_TESTS || __SKIA__ || __NETSTD_REFERENCE__
1+
#if IS_UNIT_TESTS || __SKIA__ || __NETSTD_REFERENCE__ || __TVOS__
22
namespace Windows.Devices.Midi
33
{
44
public partial class MidiOutPort

0 commit comments

Comments
 (0)