[Jrisk-cvs] SF.net SVN: domination-code:[2512] Domination

[<yu...@us...>]

Revision: 2512
          http://sourceforge.net/p/domination/code/2512
Author:   yuranet
Date:     2024-03-09 22:25:57 +0000 (Sat, 09 Mar 2024)
Log Message:
-----------
show more info for iPad

Modified Paths:
--------------
    Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
    Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapRenderer.java
    Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java
    Domination/src/net/yura/domination/engine/translation/Risk.properties

Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java	2024-02-11 22:01:52 UTC (rev 2511)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapChooser.java	2024-03-09 22:25:57 UTC (rev 2512)
@@ -571,7 +571,7 @@
         String author = map.getAuthorName();
         String noOfDownloads = map.getNumberOfDownloads();
         return "By: " + (author == null ? "?" : author) + "\n" +
-        "Downloads: " + (noOfDownloads == null ? "?" : noOfDownloads) + "\n" +
+        JavaCompatUtil.replaceAll(TranslationBundle.getBundle().getString("mapchooser.map.numberOfDownloads"), "{0}", (noOfDownloads == null ? "?" : noOfDownloads)) + "\n" +
         "Version: " + map.getVersion() + "\n" +
         map.getDescription();
     }

Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapRenderer.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapRenderer.java	2024-02-11 22:01:52 UTC (rev 2511)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/mapstore/MapRenderer.java	2024-03-09 22:25:57 UTC (rev 2512)
@@ -1,6 +1,8 @@
 package net.yura.domination.mapstore;
 
+import java.util.ResourceBundle;
 import javax.microedition.lcdui.Image;
+import net.yura.domination.engine.JavaCompatUtil;
 import net.yura.domination.engine.translation.TranslationBundle;
 import net.yura.mobile.gui.Animation;
 import net.yura.mobile.gui.Application;
@@ -31,6 +33,8 @@
 
     MapChooser chooser;
     Map map;
+    
+    ResourceBundle resb = TranslationBundle.getBundle();
 
     public MapRenderer(MapChooser chooser) {
 
@@ -86,7 +90,7 @@
 
             String author = map.getAuthorName();
             if (author!=null && !"".equals(author)) {
-                line2 = TranslationBundle.getBundle().getString("mapchooser.by").replaceAll("\\{0\\}", author);
+                line2 = resb.getString("mapchooser.by").replaceAll("\\{0\\}", author);
             }
             String description = map.getDescription();
             if (description!=null && !"".equals(description)) {
@@ -167,6 +171,18 @@
             else {
                 g.drawImage(play, getWidth()-play.getWidth()-gap, gap);
             }
+
+            int w = getWidth();
+            if (w >= XULLoader.adjustSizeToDensity(768)) {
+                if (map.getMapWidth() > 0) {
+                    String size = "Size: " + map.getMapWidth() + "x" + map.getMapHeight();
+                    g.drawString(size, textx + w / 2, padding);
+                }
+                if (map.getNumberOfDownloads() != null) {
+                    String downloads = JavaCompatUtil.replaceAll(resb.getString("mapchooser.map.numberOfDownloads"), "{0}", map.getNumberOfDownloads());
+                    g.drawString(downloads, textx + w / 2 , padding + getFont().getHeight() + this.gap);
+                }
+            }
         }
 
         setIcon(icon);

Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java	2024-02-11 22:01:52 UTC (rev 2511)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/MiniUtil.java	2024-03-09 22:25:57 UTC (rev 2512)
@@ -18,6 +18,7 @@
 import net.yura.mobile.gui.ActionListener;
 import net.yura.mobile.gui.KeyEvent;
 import net.yura.mobile.gui.Application;
+import net.yura.mobile.gui.DesktopPane;
 import net.yura.mobile.gui.components.Button;
 import net.yura.mobile.gui.components.OptionPane;
 import net.yura.mobile.io.FileUtil;
@@ -92,9 +93,11 @@
         String displayInfo;
 
         if (Application.getPlatform() == Application.PLATFORM_IOS) {
-            displayInfo = "<p>Screen scale: " + System.getProperty("display.scale") + "</p>";
+            DesktopPane dp = DesktopPane.getDesktopPane();
+            displayInfo = "<p>Screen scale: " + System.getProperty("display.scale") + " window: " +dp.getWidth() + "x" + dp.getHeight() + "</p>";
         }
         else {
+            // display.size = small/normal/large/...
             displayInfo = "<p>DPI: " + System.getProperty("display.dpi") + " Density: " + System.getProperty("display.density") + " Size: " + System.getProperty("display.size") + "</p>";
         }
 

Modified: Domination/src/net/yura/domination/engine/translation/Risk.properties
===================================================================
--- Domination/src/net/yura/domination/engine/translation/Risk.properties	2024-02-11 22:01:52 UTC (rev 2511)
+++ Domination/src/net/yura/domination/engine/translation/Risk.properties	2024-03-09 22:25:57 UTC (rev 2512)
@@ -334,6 +334,7 @@
 mapchooser.toprated=Top Rated
 mapchooser.updateall=Update All
 mapchooser.updates=Updates
+mapchooser.map.numberOfDownloads=Downloads: {0}
 mission.title=
 move.cancel=Cancel
 move.max=max