From d49ead6113c85d3b30db664aad1a965ffdef6bbb Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sat, 31 Aug 2019 16:26:42 -0400 Subject: remove custom enum, add Android to SMAPI's platform enum This will also be used in an upcoming commit for SMAPI's target platform constant. --- src/SMAPI.Toolkit/Utilities/Platform.cs | 3 +++ .../ClientPlatformMiddleware.cs | 1 + .../Framework/ClientPlatformDetection/Platform.cs | 18 ------------------ src/SMAPI.Web/Views/LogParser/Index.cshtml | 1 + 4 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 src/SMAPI.Web/Framework/ClientPlatformDetection/Platform.cs (limited to 'src') diff --git a/src/SMAPI.Toolkit/Utilities/Platform.cs b/src/SMAPI.Toolkit/Utilities/Platform.cs index d64cbeb9..f780e812 100644 --- a/src/SMAPI.Toolkit/Utilities/Platform.cs +++ b/src/SMAPI.Toolkit/Utilities/Platform.cs @@ -3,6 +3,9 @@ namespace StardewModdingAPI.Toolkit.Utilities /// The game's platform version. public enum Platform { + /// The Android version of the game. + Android, + /// The Linux version of the game. Linux, diff --git a/src/SMAPI.Web/Framework/ClientPlatformDetection/ClientPlatformMiddleware.cs b/src/SMAPI.Web/Framework/ClientPlatformDetection/ClientPlatformMiddleware.cs index 2430d239..2bf23ff9 100644 --- a/src/SMAPI.Web/Framework/ClientPlatformDetection/ClientPlatformMiddleware.cs +++ b/src/SMAPI.Web/Framework/ClientPlatformDetection/ClientPlatformMiddleware.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; +using StardewModdingAPI.Toolkit.Utilities; namespace StardewModdingAPI.Web.Framework.ClientPlatformDetection { diff --git a/src/SMAPI.Web/Framework/ClientPlatformDetection/Platform.cs b/src/SMAPI.Web/Framework/ClientPlatformDetection/Platform.cs deleted file mode 100644 index 2fe1d324..00000000 --- a/src/SMAPI.Web/Framework/ClientPlatformDetection/Platform.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace StardewModdingAPI.Web.Framework.ClientPlatformDetection -{ - /// A software platform. - public enum Platform - { - /// The Android platform. - Android, - - /// The Linux platform. - Linux, - - /// The Mac platform. - Mac, - - /// The Windows platform. - Windows - } -} diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml index 7f8036db..42887019 100644 --- a/src/SMAPI.Web/Views/LogParser/Index.cshtml +++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml @@ -1,4 +1,5 @@ @using Newtonsoft.Json +@using StardewModdingAPI.Toolkit.Utilities @using StardewModdingAPI.Web.Framework.ClientPlatformDetection @using StardewModdingAPI.Web.Framework.LogParsing.Models @model StardewModdingAPI.Web.ViewModels.LogParserModel -- cgit