From 64c920421b5a6ad98188aa86378041678045c53e Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Wed, 8 Mar 2023 17:20:58 +0800
Subject: [PATCH] update SaveLoadScene, InventoryScene - fix layout, add table
 header and scrollable content - update textratypist

---
 .../forge/adventure/scene/InventoryScene.java | 205 ++++++++----------
 .../forge/adventure/scene/SaveLoadScene.java  |  26 +--
 forge-gui/pom.xml                             |   2 +-
 .../res/adventure/Shandalar/ui/save_load.json |   2 +-
 .../Shandalar/ui/save_load_portrait.json      |   2 +-
 5 files changed, 101 insertions(+), 136 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java b/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
index 804cbf8fcf6..9f92205fed2 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/InventoryScene.java
@@ -21,21 +21,21 @@ import forge.adventure.util.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
-public class InventoryScene  extends UIScene {
+public class InventoryScene extends UIScene {
     TextraButton leave;
     Button equipButton;
     TextraButton useButton;
     TextraLabel itemDescription;
     private final Table inventory;
-    private final Array<Button> inventoryButtons=new Array<>();
-    private final HashMap<String,Button> equipmentSlots=new HashMap<>();
-    HashMap<Button,String> itemLocation=new HashMap<>();
+    private final Array<Button> inventoryButtons = new Array<>();
+    private final HashMap<String, Button> equipmentSlots = new HashMap<>();
+    HashMap<Button, String> itemLocation = new HashMap<>();
     Button selected;
     Button deleteButton;
     Texture equipOverlay;
-    int columns=0;
-    public InventoryScene()
-    {
+    int columns = 0;
+
+    public InventoryScene() {
         super(Forge.isLandscapeMode() ? "ui/inventory.json" : "ui/inventory_portrait.json");
         equipOverlay = new Texture(Config.instance().getFile(Paths.ITEMS_EQUIP));
         ui.onButtonPress("return", () -> done());
@@ -44,51 +44,44 @@ public class InventoryScene  extends UIScene {
         ui.onButtonPress("equip", () -> equip());
         ui.onButtonPress("use", () -> use());
         equipButton = ui.findActor("equip");
-        useButton= ui.findActor("use");
+        useButton = ui.findActor("use");
         useButton.setDisabled(true);
         deleteButton = ui.findActor("delete");
         itemDescription = ui.findActor("item_description");
+        ScrollPane pane = new ScrollPane(itemDescription);
+        pane.setBounds(itemDescription.getX(), itemDescription.getY(), itemDescription.getWidth() - 5, itemDescription.getHeight() - 5);
         itemDescription.setAlignment(Align.topLeft);
-
+        ui.addActor(pane);
 
         Array<Actor> children = ui.getChildren();
-        for (int i = 0, n = children.size; i < n; i++)
-        {
+        for (int i = 0, n = children.size; i < n; i++) {
 
-            if(children.get(i).getName()!=null&&children.get(i).getName().startsWith("Equipment"))
-            {
-                String slotName=children.get(i).getName().split("_")[1];
+            if (children.get(i).getName() != null && children.get(i).getName().startsWith("Equipment")) {
+                String slotName = children.get(i).getName().split("_")[1];
                 equipmentSlots.put(slotName, (Button) children.get(i));
-                Actor slot=children.get(i);
+                Actor slot = children.get(i);
                 slot.addListener(new ChangeListener() {
                     @Override
                     public void changed(ChangeEvent event, Actor actor) {
-                        Button button=((Button) actor);
-                        if(button.isChecked())
-                        {
-                            for(Button otherButton:equipmentSlots.values())
-                            {
-                                if(button!=otherButton&&otherButton.isChecked()){
+                        Button button = ((Button) actor);
+                        if (button.isChecked()) {
+                            for (Button otherButton : equipmentSlots.values()) {
+                                if (button != otherButton && otherButton.isChecked()) {
                                     otherButton.setChecked(false);
                                 }
                             }
-                            String item=Current.player().itemInSlot(slotName);
-                            if(item!=null&& !item.equals(""))
-                            {
-                                Button changeButton=null;
-                                for(Button invButton:inventoryButtons)
-                                {
-                                    if(itemLocation.get(invButton)!=null&&itemLocation.get(invButton).equals(item))
-                                    {
-                                        changeButton=invButton;
+                            String item = Current.player().itemInSlot(slotName);
+                            if (item != null && !item.equals("")) {
+                                Button changeButton = null;
+                                for (Button invButton : inventoryButtons) {
+                                    if (itemLocation.get(invButton) != null && itemLocation.get(invButton).equals(item)) {
+                                        changeButton = invButton;
                                         break;
                                     }
                                 }
-                                if(changeButton!=null)
+                                if (changeButton != null)
                                     changeButton.setChecked(true);
-                            }
-                            else
-                            {
+                            } else {
                                 setSelected(null);
                             }
                         }
@@ -99,29 +92,26 @@ public class InventoryScene  extends UIScene {
         }
         inventory = new Table(Controls.getSkin());
         ScrollPane scrollPane = ui.findActor("inventory");
-        scrollPane.setScrollingDisabled(true,false);
+        scrollPane.setScrollingDisabled(true, false);
         scrollPane.setActor(inventory);
-        columns= (int) (scrollPane.getWidth()/createInventorySlot().getWidth());
-        columns-=1;
-        if(columns<=0)columns=1;
+        columns = (int) (scrollPane.getWidth() / createInventorySlot().getWidth());
+        columns -= 1;
+        if (columns <= 0) columns = 1;
         scrollPane.setActor(inventory);
-
         itemDescription.setWrap(true);
-
-
     }
 
     private void showConfirm() {
-        Dialog confirm = prepareDialog("",ButtonYes|ButtonNo,()->delete());
-        confirm.text( Controls.newLabel(Forge.getLocalizer().getMessage("lblDelete")));
+        Dialog confirm = prepareDialog("", ButtonYes | ButtonNo, () -> delete());
+        confirm.text(Controls.newLabel(Forge.getLocalizer().getMessage("lblDelete")));
         showDialog(confirm);
     }
 
     private static InventoryScene object;
 
     public static InventoryScene instance() {
-        if(object==null)
-            object=new InventoryScene();
+        if (object == null)
+            object = new InventoryScene();
         return object;
     }
 
@@ -134,16 +124,17 @@ public class InventoryScene  extends UIScene {
     public void delete() {
 
         ItemData data = ItemData.getItem(itemLocation.get(selected));
-        if(data != null) {
+        if (data != null) {
             Current.player().removeItem(data.name);
         }
         updateInventory();
 
     }
+
     public void equip() {
-        if(selected == null) return;
+        if (selected == null) return;
         ItemData data = ItemData.getItem(itemLocation.get(selected));
-        if(data==null)return;
+        if (data == null) return;
         Current.player().equip(data);
         updateInventory();
     }
@@ -153,100 +144,88 @@ public class InventoryScene  extends UIScene {
         stage.act(delta);
     }
 
-
     private void triggerUse() {
-        if(selected==null)return;
+        if (selected == null) return;
 
         ItemData data = ItemData.getItem(itemLocation.get(selected));
-        if(data==null)return;
+        if (data == null) return;
         Current.player().addShards(-data.shardsNeeded);
         done();
         ConsoleCommandInterpreter.getInstance().command(data.commandOnUse);
     }
+
     private void use() {
         ItemData data = ItemData.getItem(itemLocation.get(selected));
-        if(data==null)return;
-        Dialog useDialog = prepareDialog("",ButtonYes|ButtonNo,()->triggerUse());
-        useDialog.getContentTable().add(Controls.newTextraLabel("Use "+data.name+"?\n"+data.getDescription()));
+        if (data == null) return;
+        Dialog useDialog = prepareDialog("", ButtonYes | ButtonNo, () -> triggerUse());
+        useDialog.getContentTable().add(Controls.newTextraLabel("Use " + data.name + "?\n" + data.getDescription()));
         showDialog(useDialog);
     }
 
     private void setSelected(Button actor) {
-        selected=actor;
-        if(actor==null)
-        {
+        selected = actor;
+        if (actor == null) {
             itemDescription.setText("");
             deleteButton.setDisabled(true);
             equipButton.setDisabled(true);
             useButton.setDisabled(true);
-            for(Button button:inventoryButtons)
-            {
+            for (Button button : inventoryButtons) {
                 button.setChecked(false);
             }
             return;
         }
         ItemData data = ItemData.getItem(itemLocation.get(actor));
 
-        if(data==null) return;
+        if (data == null) return;
         deleteButton.setDisabled(data.questItem);
 
         boolean isInPoi = MapStage.getInstance().isInMap();
-        useButton.setDisabled(!(isInPoi&&data.usableInPoi||!isInPoi&&data.usableOnWorldMap));
-        if(data.shardsNeeded==0)
+        useButton.setDisabled(!(isInPoi && data.usableInPoi || !isInPoi && data.usableOnWorldMap));
+        if (data.shardsNeeded == 0)
             useButton.setText("Use");
         else
-            useButton.setText("Use "+data.shardsNeeded+"[+Shards]");
+            useButton.setText("Use " + data.shardsNeeded + "[+Shards]");
         useButton.layout();
-        if(Current.player().getShards()<data.shardsNeeded)
+        if (Current.player().getShards() < data.shardsNeeded)
             useButton.setDisabled(true);
 
-        if(data.equipmentSlot==null|| data.equipmentSlot.equals(""))
-        {
+        if (data.equipmentSlot == null || data.equipmentSlot.equals("")) {
             equipButton.setDisabled(true);
-        }
-        else
-        {
+        } else {
             equipButton.setDisabled(false);
-            if(equipButton instanceof TextraButton)
-            {
-                TextraButton button=(TextraButton) equipButton;
-                String item=Current.player().itemInSlot(data.equipmentSlot);
-                if(item!=null&&item.equals(data.name))
-                {
+            if (equipButton instanceof TextraButton) {
+                TextraButton button = (TextraButton) equipButton;
+                String item = Current.player().itemInSlot(data.equipmentSlot);
+                if (item != null && item.equals(data.name)) {
                     button.setText("Unequip");
-                }
-                else
-                {
+                } else {
                     button.setText("Equip");
                 }
                 button.layout();
             }
         }
 
-        for(Button button:inventoryButtons)
-        {
-            if(actor!=button&&button.isChecked()){
+        for (Button button : inventoryButtons) {
+            if (actor != button && button.isChecked()) {
                 button.setChecked(false);
             }
         }
-        itemDescription.setText(data.name+"\n"+data.getDescription());
+        itemDescription.setText(data.name + "\n" + data.getDescription());
         itemDescription.setWrap(true);
         itemDescription.layout();
-
-
     }
 
     private void updateInventory() {
         clearSelectable();
         inventoryButtons.clear();
         inventory.clear();
-        for(int i=0;i<Current.player().getItems().size;i++) {
+        for (int i = 0; i < Current.player().getItems().size; i++) {
 
-            if(i%columns==0)
+            if (i % columns == 0)
                 inventory.row();
-            Button newActor=createInventorySlot();
+            Button newActor = createInventorySlot();
             inventory.add(newActor).top().left().space(1);
-            addToSelectable(new Selectable(newActor){
+            addToSelectable(new Selectable(newActor) {
                 @Override
                 public void onSelect(UIScene scene) {
                     setSelected(newActor);
@@ -254,47 +233,43 @@ public class InventoryScene  extends UIScene {
                 }
             });
             inventoryButtons.add(newActor);
-            ItemData item=ItemData.getItem(Current.player().getItems().get(i));
-            if(item==null)
-            {
-                System.err.print("Can not find item name "+Current.player().getItems().get(i)+"\n");
+            ItemData item = ItemData.getItem(Current.player().getItems().get(i));
+            if (item == null) {
+                System.err.print("Can not find item name " + Current.player().getItems().get(i) + "\n");
                 continue;
             }
-            if(item.sprite()==null)
-            {
-                System.err.print("Can not find sprite name "+item.iconName+"\n");
+            if (item.sprite() == null) {
+                System.err.print("Can not find sprite name " + item.iconName + "\n");
                 continue;
             }
-            Image img=new Image(item.sprite());
-            img.setX((newActor.getWidth()-img.getWidth())/2);
-            img.setY((newActor.getHeight()-img.getHeight())/2);
+            Image img = new Image(item.sprite());
+            img.setX((newActor.getWidth() - img.getWidth()) / 2);
+            img.setY((newActor.getHeight() - img.getHeight()) / 2);
             newActor.addActor(img);
-            itemLocation.put(newActor,Current.player().getItems().get(i));
-            if(Current.player().getEquippedItems().contains(item.name))
-            {
-                Image overlay=new Image(equipOverlay);
-                overlay.setX((newActor.getWidth()-img.getWidth())/2);
-                overlay.setY((newActor.getHeight()-img.getHeight())/2);
+            itemLocation.put(newActor, Current.player().getItems().get(i));
+            if (Current.player().getEquippedItems().contains(item.name)) {
+                Image overlay = new Image(equipOverlay);
+                overlay.setX((newActor.getWidth() - img.getWidth()) / 2);
+                overlay.setY((newActor.getHeight() - img.getHeight()) / 2);
                 newActor.addActor(overlay);
             }
             newActor.addListener(new ChangeListener() {
                 @Override
                 public void changed(ChangeEvent event, Actor actor) {
-                    if(((Button) actor).isChecked())
-                    {
+                    if (((Button) actor).isChecked()) {
                         setSelected((Button) actor);
                     }
                 }
             });
         }
-        for(Map.Entry<String, Button> slot :equipmentSlots.entrySet()) {
-            if(slot.getValue().getChildren().size>=2)
-                slot.getValue().removeActorAt(1,false);
-            String equippedItem=Current.player().itemInSlot(slot.getKey());
-            if(equippedItem == null || equippedItem.equals(""))
+        for (Map.Entry<String, Button> slot : equipmentSlots.entrySet()) {
+            if (slot.getValue().getChildren().size >= 2)
+                slot.getValue().removeActorAt(1, false);
+            String equippedItem = Current.player().itemInSlot(slot.getKey());
+            if (equippedItem == null || equippedItem.equals(""))
                 continue;
             ItemData item = ItemData.getItem(equippedItem);
-            if(item != null) {
+            if (item != null) {
                 Image img = new Image(item.sprite());
                 img.setX((slot.getValue().getWidth() - img.getWidth()) / 2);
                 img.setY((slot.getValue().getHeight() - img.getHeight()) / 2);
@@ -311,9 +286,7 @@ public class InventoryScene  extends UIScene {
     }
 
     public Button createInventorySlot() {
-
-        ImageButton button=new ImageButton(Controls.getSkin(),"item_frame");
-        return  button;
+        ImageButton button = new ImageButton(Controls.getSkin(), "item_frame");
+        return button;
     }
-
 }
diff --git a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
index 81ed3b1ce19..08130d6955a 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java
@@ -56,8 +56,11 @@ public class SaveLoadScene extends UIScene {
     private SaveLoadScene() {
         super(Forge.isLandscapeMode() ? "ui/save_load.json" : "ui/save_load_portrait.json");
 
+        Table root = new Table();
         layout = new Table();
-        stage.addActor(layout);
+        scrollPane = new ScrollPane(layout);
+        Window window = ui.findActor("saveSlots");
+        window.add(root);
         textInput = Controls.newTextField("");
         int c = 0;
         String[] diffList = new String[Config.instance().getConfigData().difficulties.length];
@@ -78,9 +81,11 @@ public class SaveLoadScene extends UIScene {
         playerLocation.setY(previewImage.getY() + 5);
         ui.addActor(playerLocation);
         header = Controls.newTextraLabel(Forge.getLocalizer().getMessage("lblSave"));
-        header.setAlignment(Align.center);
-        layout.add(header).pad(2).colspan(4).align(Align.center).expandX();
-        layout.row();
+        root.row();
+        root.add(header).grow();
+        root.add(difficulty);
+        root.row();
+        root.add(scrollPane).colspan(2).width(window.getWidth() - 20);
         autoSave = addSaveSlot(Forge.getLocalizer().getMessage("lblAutoSave"), WorldSave.AUTO_SAVE_SLOT);
         quickSave = addSaveSlot(Forge.getLocalizer().getMessage("lblQuickSave"), WorldSave.QUICK_SAVE_SLOT);
         for (int i = 1; i < NUMBEROFSAVESLOTS; i++)
@@ -91,10 +96,6 @@ public class SaveLoadScene extends UIScene {
         ui.onButtonPress("save", () -> SaveLoadScene.this.loadSave());
         back = ui.findActor("return");
         ui.onButtonPress("return", () -> SaveLoadScene.this.back());
-
-        scrollPane = ui.findActor("saveSlots");
-        scrollPane.setActor(layout);
-        ui.addActor(difficulty);
         difficulty.setSelectedIndex(1);
         difficulty.setAlignment(Align.center);
         difficulty.getStyle().fontColor = Color.GOLD;
@@ -137,7 +138,6 @@ public class SaveLoadScene extends UIScene {
             super.onSelect(scene);
             updateSlot(slotNumber);
         }
-
     }
 
     private Selectable<TextraButton> addSaveSlot(String name, int i) {
@@ -151,7 +151,6 @@ public class SaveLoadScene extends UIScene {
 
     }
 
-
     public boolean select(int slot) {
         if (!buttons.containsKey(slot))
             return false;
@@ -193,7 +192,6 @@ public class SaveLoadScene extends UIScene {
             if (previewDate != null)
                 previewDate.setVisible(false);
         }
-
         return true;
     }
 
@@ -247,7 +245,6 @@ public class SaveLoadScene extends UIScene {
                     Forge.clearTransitionScreen();
                 }
                 break;
-
         }
     }
 
@@ -281,7 +278,6 @@ public class SaveLoadScene extends UIScene {
         for (File name : names) {
             if (WorldSave.isSafeFile(name.getName())) {
                 try {
-
                     try (FileInputStream fos = new FileInputStream(name.getAbsolutePath());
                          InflaterInputStream inf = new InflaterInputStream(fos);
                          ObjectInputStream oos = new ObjectInputStream(inf)) {
@@ -298,10 +294,7 @@ public class SaveLoadScene extends UIScene {
                         }
                         previews.put(slot, header);
                     }
-
                 } catch (ClassNotFoundException | IOException | GdxRuntimeException e) {
-
-
                 }
             }
         }
@@ -353,5 +346,4 @@ public class SaveLoadScene extends UIScene {
         }
         super.enter();
     }
-
 }
diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 173c77a064a..ab47fee1ce4 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.github.tommyettinger</groupId>
             <artifactId>textratypist</artifactId>
-            <version>0.7.8</version>
+            <version>0.7.9</version>
         </dependency>
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
diff --git a/forge-gui/res/adventure/Shandalar/ui/save_load.json b/forge-gui/res/adventure/Shandalar/ui/save_load.json
index 6f77b073af9..3b7b0fe9c86 100644
--- a/forge-gui/res/adventure/Shandalar/ui/save_load.json
+++ b/forge-gui/res/adventure/Shandalar/ui/save_load.json
@@ -10,7 +10,7 @@
       "height": 270
     },
     {
-      "type": "Scroll",
+      "type": "Window",
       "name": "saveSlots",
       "x": 15,
       "y": 18,
diff --git a/forge-gui/res/adventure/Shandalar/ui/save_load_portrait.json b/forge-gui/res/adventure/Shandalar/ui/save_load_portrait.json
index 397b785aef4..0657e17d835 100644
--- a/forge-gui/res/adventure/Shandalar/ui/save_load_portrait.json
+++ b/forge-gui/res/adventure/Shandalar/ui/save_load_portrait.json
@@ -10,7 +10,7 @@
       "height": 480
     },
     {
-      "type": "Scroll",
+      "type": "Window",
       "name": "saveSlots",
       "x": 10,
       "y": 106,