diff --git a/osu.Android.props b/osu.Android.props index dd263d6aaa..77c29a5d6e 100644 --- a/osu.Android.props +++ b/osu.Android.props @@ -52,7 +52,7 @@ - + diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 59c0af1533..ea005319f3 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -24,7 +24,6 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Input; using osu.Framework.Input.Bindings; using osu.Framework.Input.Events; -using osu.Framework.Input.Handlers.Tablet; using osu.Framework.Localisation; using osu.Framework.Logging; using osu.Framework.Screens; @@ -1039,48 +1038,50 @@ namespace osu.Game private void forwardTabletLogsToNotifications() { - const string tablet_prefix = @"[Tablet] "; - bool notifyOnWarning = true; + // Temporarily disabled due to framework downgrade. - Logger.NewEntry += entry => - { - if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(tablet_prefix, StringComparison.OrdinalIgnoreCase)) - return; - - string message = entry.Message.Replace(tablet_prefix, string.Empty); - - if (entry.Level == LogLevel.Error) - { - Schedule(() => Notifications.Post(new SimpleNotification - { - Text = $"Encountered tablet error: \"{message}\"", - Icon = FontAwesome.Solid.PenSquare, - IconColour = Colours.RedDark, - })); - } - else if (notifyOnWarning) - { - Schedule(() => Notifications.Post(new SimpleNotification - { - Text = @"Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported.", - Icon = FontAwesome.Solid.PenSquare, - IconColour = Colours.YellowDark, - Activated = () => - { - OpenUrlExternally("https://opentabletdriver.net/Tablets", true); - return true; - } - })); - - notifyOnWarning = false; - } - }; - - Schedule(() => - { - ITabletHandler tablet = Host.AvailableInputHandlers.OfType().SingleOrDefault(); - tablet?.Tablet.BindValueChanged(_ => notifyOnWarning = true, true); - }); + // const string tablet_prefix = @"[Tablet] "; + // bool notifyOnWarning = true; + // + // Logger.NewEntry += entry => + // { + // if (entry.Level < LogLevel.Important || entry.Target != LoggingTarget.Input || !entry.Message.StartsWith(tablet_prefix, StringComparison.OrdinalIgnoreCase)) + // return; + // + // string message = entry.Message.Replace(tablet_prefix, string.Empty); + // + // if (entry.Level == LogLevel.Error) + // { + // Schedule(() => Notifications.Post(new SimpleNotification + // { + // Text = $"Encountered tablet error: \"{message}\"", + // Icon = FontAwesome.Solid.PenSquare, + // IconColour = Colours.RedDark, + // })); + // } + // else if (notifyOnWarning) + // { + // Schedule(() => Notifications.Post(new SimpleNotification + // { + // Text = @"Encountered tablet warning, your tablet may not function correctly. Click here for a list of all tablets supported.", + // Icon = FontAwesome.Solid.PenSquare, + // IconColour = Colours.YellowDark, + // Activated = () => + // { + // OpenUrlExternally("https://opentabletdriver.net/Tablets", true); + // return true; + // } + // })); + // + // notifyOnWarning = false; + // } + // }; + // + // Schedule(() => + // { + // ITabletHandler tablet = Host.AvailableInputHandlers.OfType().SingleOrDefault(); + // tablet?.Tablet.BindValueChanged(_ => notifyOnWarning = true, true); + // }); } private Task asyncLoadStream; diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index c4e2a5168e..29e690a024 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -35,7 +35,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/osu.iOS.props b/osu.iOS.props index 622efcd63d..83410b08f6 100644 --- a/osu.iOS.props +++ b/osu.iOS.props @@ -61,7 +61,7 @@ - + @@ -82,7 +82,7 @@ - +