diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-08-31 16:26:42 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-09-14 19:14:51 -0400 |
| commit | d49ead6113c85d3b30db664aad1a965ffdef6bbb (patch) | |
| tree | d8435a7090b2f378f3411b3786fa8c79aba9963a | |
| parent | f04f7811536ba6e35c4ad6357fb6904826eda9dc (diff) | |
| download | SMAPI-d49ead6113c85d3b30db664aad1a965ffdef6bbb.tar.gz SMAPI-d49ead6113c85d3b30db664aad1a965ffdef6bbb.tar.bz2 SMAPI-d49ead6113c85d3b30db664aad1a965ffdef6bbb.zip | |
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.
4 files changed, 5 insertions, 18 deletions
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 /// <summary>The game's platform version.</summary> public enum Platform { + /// <summary>The Android version of the game.</summary> + Android, + /// <summary>The Linux version of the game.</summary> 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 -{ - /// <summary>A software platform.</summary> - public enum Platform - { - /// <summary>The Android platform.</summary> - Android, - - /// <summary>The Linux platform.</summary> - Linux, - - /// <summary>The Mac platform.</summary> - Mac, - - /// <summary>The Windows platform.</summary> - 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 |