diff --git a/forge-gui-android/src/forge/app/Main.java b/forge-gui-android/src/forge/app/Main.java index 1a442d8353e..424582ba2f1 100644 --- a/forge-gui-android/src/forge/app/Main.java +++ b/forge-gui-android/src/forge/app/Main.java @@ -640,6 +640,11 @@ public class Main extends AndroidApplication { System.exit(0); } + @Override + public void closeSplashScreen() { + //only for desktop mobile-dev + } + @Override public boolean isTablet() { return isTablet; diff --git a/forge-gui-ios/src/forge/ios/Main.java b/forge-gui-ios/src/forge/ios/Main.java index fc9c20256b7..4aadfd59093 100644 --- a/forge-gui-ios/src/forge/ios/Main.java +++ b/forge-gui-ios/src/forge/ios/Main.java @@ -112,6 +112,11 @@ public class Main extends IOSApplication.Delegate { // Not possible on iOS } + @Override + public void closeSplashScreen() { + //only for desktop mobile-dev + } + @Override public void convertToJPEG(InputStream input, OutputStream output) throws IOException { diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index 3f5a17a1dce..d69eee02bf0 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -27,6 +27,7 @@ **/bg_splash.png **/bg_texture.jpg **/font1.ttf + **/logo.png @@ -84,11 +85,6 @@ forge https://bell-sw.com/pages/downloads/#jdk-17-lts src/main/config/forge-adventure.ico - - forge.app.Main - false - anything - 17 jdkOnly @@ -154,6 +150,9 @@ forge.app.Main true + + splash/logo.png + diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java index 547c7bcef29..8de8d460a0a 100644 --- a/forge-gui-mobile-dev/src/forge/app/Main.java +++ b/forge-gui-mobile-dev/src/forge/app/Main.java @@ -10,6 +10,7 @@ import org.apache.commons.lang3.tuple.Pair; import javax.imageio.ImageIO; import java.awt.Desktop; +import java.awt.SplashScreen; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; @@ -89,6 +90,14 @@ public class Main { System.exit(0); } + @Override + public void closeSplashScreen() { + SplashScreen splash = SplashScreen.getSplashScreen(); + if (splash != null) { + splash.close(); + } + } + @Override public boolean isTablet() { return true; //treat desktop the same as a tablet diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 347749bf5da..80ab02ecca4 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -159,6 +159,7 @@ public class Forge implements ApplicationListener { public void create() { //install our error handler ExceptionHandler.registerErrorHandling(); + getDeviceAdapter().closeSplashScreen(); GuiBase.setIsAndroid(Gdx.app.getType() == Application.ApplicationType.Android); diff --git a/forge-gui/src/main/java/forge/interfaces/IDeviceAdapter.java b/forge-gui/src/main/java/forge/interfaces/IDeviceAdapter.java index d324d5c703a..d53742838b7 100644 --- a/forge-gui/src/main/java/forge/interfaces/IDeviceAdapter.java +++ b/forge-gui/src/main/java/forge/interfaces/IDeviceAdapter.java @@ -17,6 +17,7 @@ public interface IDeviceAdapter { void preventSystemSleep(boolean preventSleep); void restart(); void exit(); + void closeSplashScreen(); void convertToJPEG(InputStream input, OutputStream output) throws IOException; Pair getRealScreenSize(boolean real); ArrayList getGamepads();