Get rid of android specific splash, use desktop splash

mac
Miepee 3 years ago
parent 77c8f6a389
commit 081259f461

@ -60,7 +60,6 @@ public abstract class RawMods : ModsBase
{ {
nameof(Resources.icon) + ".png" => Resources.icon, nameof(Resources.icon) + ".png" => Resources.icon,
nameof(Resources.splash) + ".png" => Resources.splash, nameof(Resources.splash) + ".png" => Resources.splash,
nameof(Resources.splashAndroid) + ".png" => Resources.splashAndroid,
_ => throw new InvalidDataException("SubCaseFunction was called with an improper resource!") _ => 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"); return SubCaseFunction(nameof(Resources.icon) + ".png");
case nameof(Resources.splash): case nameof(Resources.splash):
return SubCaseFunction(nameof(Resources.splash) + ".png"); 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!"); 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. // 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 //recursively lowercase everything in the assets folder
outputDelegate.SendOutput("Lowercase everything in the assets folder..."); outputDelegate.SendOutput("Lowercase everything in the assets folder...");

@ -64,15 +64,5 @@ namespace AM2RPortHelperLib {
return ((byte[])(obj)); return ((byte[])(obj));
} }
} }
/// <summary>
/// Looks up a localized resource of type System.Byte[].
/// </summary>
public static byte[] splashAndroid {
get {
object obj = ResourceManager.GetObject("splashAndroid", resourceCulture);
return ((byte[])(obj));
}
}
} }
} }

@ -24,7 +24,4 @@
<data name="splash" type="System.Resources.ResXFileRef"> <data name="splash" type="System.Resources.ResXFileRef">
<value>Resources\splash.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>Resources\splash.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="splashAndroid" type="System.Resources.ResXFileRef">
<value>Resources\splashAndroid.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root> </root>
Loading…
Cancel
Save