LibGDX:

* ui adjustments

Author: Mikhael-Danilov

RemixedDungeon/src/main/java/com/nyrds/pixeldungeon/windows/WndModsDisclaimer.java

@@ -1,7 +1,6 @@
 package com.nyrds.pixeldungeon.windows;
 
 import com.nyrds.pixeldungeon.game.GameLoop;
-import com.nyrds.pixeldungeon.ml.BuildConfig;
 import com.nyrds.pixeldungeon.ml.R;
 import com.nyrds.platform.storage.FileSystem;
 import com.nyrds.platform.util.Os;
@@ -24,7 +23,7 @@ public class WndModsDisclaimer extends WndOptions {
 
     static String [] platformOptions;
     static {
-        if (BuildConfig.FLAVOR_platform.equals(Utils.PLATFORM_ANDROID)) {
+        if (Utils.isAndroid()) {
             platformOptions = new String[] {StringsManager.getVar(R.string.WndModsDisclaimer_manage),
                     StringsManager.getVar(R.string.WndModsDisclaimer_install)};
         } else {

RemixedDungeon/src/main/java/com/nyrds/pixeldungeon/windows/WndUiSettings.java

@@ -3,7 +3,6 @@
 
 import com.nyrds.pixeldungeon.game.GameLoop;
 import com.nyrds.pixeldungeon.game.GamePreferences;
-import com.nyrds.pixeldungeon.ml.BuildConfig;
 import com.nyrds.pixeldungeon.ml.R;
 import com.nyrds.platform.game.RemixedDungeon;
 import com.nyrds.platform.util.StringsManager;
@@ -16,7 +15,7 @@ public class WndUiSettings extends WndMenuCommon {
 	@Override
 	protected void createItems() {
 
-		if(BuildConfig.FLAVOR_platform.equals(Utils.PLATFORM_ANDROID)) {
+		if(Utils.isAndroid()) {
 			menuItems.add(new MenuCheckBox(R.string.WndSettings_Immersive, GamePreferences.immersed()) {
 				@Override
 				protected void onClick() {
@@ -28,7 +27,7 @@ protected void onClick() {
 		if(!GamePreferences.classicFont()){
 			menuItems.add(createTextScaleButtons());
 		}
-		if(BuildConfig.FLAVOR_platform.equals(Utils.PLATFORM_ANDROID)) {
+		if(Utils.isAndroid()) {
 			menuItems.add(new MenuButton(orientationText()) {
 				@Override
 				protected void onClick() {

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/scenes/TitleScene.java

@@ -171,7 +171,7 @@ protected void onClick() {
             leftGroup.add(new ImageButton(social.get()) {
                 @Override
                 protected void onClick() {
-                    Game.instance().openUrl("Visit us on social network", ruUser ? "https://vk.com/pixel_dungeon_remix" : "https://fb.me/RemixedDungeon");
+                    Game.openUrl("Visit us on social network", ruUser ? "https://vk.com/pixel_dungeon_remix" : "https://fb.me/RemixedDungeon");
                 }
             });
         }
@@ -180,15 +180,15 @@ protected void onClick() {
             leftGroup.add(new ImageButton(Icons.DISCORD.get()) {
                 @Override
                 protected void onClick() {
-                    Game.instance().openUrl("Let talk on Discord", "https://discord.gg/AMXrhQZ");
+                    Game.openUrl("Let talk on Discord", "https://discord.gg/AMXrhQZ");
                 }
             });
         }
 
         leftGroup.add(new ImageButton(Icons.TG.get()) {
             @Override
             protected void onClick() {
-                Game.instance().openUrl("Join our Telegram group", "https://t.me/RemixedDungeon");
+                Game.openUrl("Join our Telegram group", "https://t.me/RemixedDungeon");
             }
         });
 
@@ -224,25 +224,31 @@ protected void onClick() {
 
         add(btnChangelog);
 
-        StatisticsButton btnStats = new StatisticsButton();
-        btnStats.setPos(w - btnStats.width(), btnChangelog.bottom() + 2);
-        add(btnStats);
+        if(Utils.isAndroid()) {
+            StatisticsButton btnStats = new StatisticsButton();
+            btnStats.setPos(w - btnStats.width(), btnChangelog.bottom() + 2);
+            add(btnStats);
+        }
 
         Dungeon.reset();
 
         fadeIn();
 
-        if (AndroidSAF.mBaseSrcPath !=null) {
-            GameLoop.pushUiTask(() -> WndLocalModInstall.onDirectoryPicked());
-        }
+        if(Utils.isAndroid()) {
+            if (AndroidSAF.mBaseSrcPath != null) {
+                GameLoop.pushUiTask(() -> WndLocalModInstall.onDirectoryPicked());
+            }
 
-        if (AndroidSAF.mBaseDstPath !=null) {
-            GameLoop.pushUiTask(() -> WndModInfo.onDirectoryPicked());
-        }
+            if (AndroidSAF.mBaseDstPath != null) {
+                GameLoop.pushUiTask(() -> WndModInfo.onDirectoryPicked());
+            }
 
 
-        if(Game.instance() instanceof InstallMod) {
-            GameLoop.pushUiTask(()  -> {((InstallMod) Game.instance()).installMod();});
+            if (Game.instance() instanceof InstallMod) {
+                GameLoop.pushUiTask(() -> {
+                    ((InstallMod) Game.instance()).installMod();
+                });
+            }
         }
 
     }

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/utils/Utils.java

@@ -1,6 +1,7 @@
 
 package com.watabou.pixeldungeon.utils;
 
+import com.nyrds.pixeldungeon.ml.BuildConfig;
 import com.nyrds.pixeldungeon.ml.R;
 import com.nyrds.platform.EventCollector;
 import com.nyrds.platform.util.PUtil;
@@ -189,6 +190,11 @@ public static void printStackTrace() {
         PUtil.slog("stacktrace", baos.toString());
     }
 
+    public static boolean isAndroid() {
+        //noinspection ConstantValue
+        return BuildConfig.FLAVOR_platform.equals(PLATFORM_ANDROID);
+    }
+
     public static class SpuriousReturn implements InterstitialPoint {
 
         @Override

RemixedDungeon/src/main/java/com/watabou/pixeldungeon/windows/WndModInfo.java

@@ -15,6 +15,7 @@
 import com.watabou.pixeldungeon.scenes.PixelScene;
 import com.watabou.pixeldungeon.ui.RedButton;
 import com.watabou.pixeldungeon.ui.Window;
+import com.watabou.pixeldungeon.utils.Utils;
 
 import java.io.IOException;
 
@@ -71,7 +72,7 @@ protected void onClick(Touchscreen.Touch touch) {
             add(siteTouch);
         }
 
-        if(desc.installed) {
+        if(desc.installed && Utils.isAndroid()) {
             RedButton exportButton = new RedButton("Save on Device") {
                 @Override
                 protected void onClick() {