From 081259f461e9dee0f2c38b4146957fc81eb0763e Mon Sep 17 00:00:00 2001 From: Miepee Date: Mon, 23 Jan 2023 14:12:33 +0100 Subject: [PATCH] Get rid of android specific splash, use desktop splash --- AM2RPortHelperLib/RawMods.cs | 5 +---- AM2RPortHelperLib/Resources.Designer.cs | 10 ---------- AM2RPortHelperLib/Resources.resx | 3 --- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/AM2RPortHelperLib/RawMods.cs b/AM2RPortHelperLib/RawMods.cs index ae0e434..f1dd535 100644 --- a/AM2RPortHelperLib/RawMods.cs +++ b/AM2RPortHelperLib/RawMods.cs @@ -60,7 +60,6 @@ public abstract class RawMods : ModsBase { nameof(Resources.icon) + ".png" => Resources.icon, nameof(Resources.splash) + ".png" => Resources.splash, - nameof(Resources.splashAndroid) + ".png" => Resources.splashAndroid, _ => throw new InvalidDataException("SubCaseFunction was called with an improper resource!") }; @@ -79,8 +78,6 @@ public abstract class RawMods : ModsBase return SubCaseFunction(nameof(Resources.icon) + ".png"); case nameof(Resources.splash): return SubCaseFunction(nameof(Resources.splash) + ".png"); - case nameof(Resources.splashAndroid): - return SubCaseFunction(nameof(Resources.splashAndroid) + ".png"); default: throw new InvalidDataException(nameOfResource + " is an unknown Icon!"); } } @@ -286,7 +283,7 @@ public abstract class RawMods : ModsBase } // The wrapper always has a splash image, so we want to overwrite it. - File.Copy(GetProperPathToBuiltinIcons(nameof(Resources.splashAndroid), pathToSplashScreen), apkAssetsDir + "/splash.png", true); + File.Copy(GetProperPathToBuiltinIcons(nameof(Resources.splash), pathToSplashScreen), apkAssetsDir + "/splash.png", true); //recursively lowercase everything in the assets folder outputDelegate.SendOutput("Lowercase everything in the assets folder..."); diff --git a/AM2RPortHelperLib/Resources.Designer.cs b/AM2RPortHelperLib/Resources.Designer.cs index 8af4cb1..dd8a22d 100644 --- a/AM2RPortHelperLib/Resources.Designer.cs +++ b/AM2RPortHelperLib/Resources.Designer.cs @@ -64,15 +64,5 @@ namespace AM2RPortHelperLib { return ((byte[])(obj)); } } - - /// - /// Looks up a localized resource of type System.Byte[]. - /// - public static byte[] splashAndroid { - get { - object obj = ResourceManager.GetObject("splashAndroid", resourceCulture); - return ((byte[])(obj)); - } - } } } \ No newline at end of file diff --git a/AM2RPortHelperLib/Resources.resx b/AM2RPortHelperLib/Resources.resx index 572ed8f..b168360 100644 --- a/AM2RPortHelperLib/Resources.resx +++ b/AM2RPortHelperLib/Resources.resx @@ -24,7 +24,4 @@ Resources\splash.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Resources\splashAndroid.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - \ No newline at end of file