Support selecting cards

forge-gui-mobile/src/forge/menu/FDropDown.java

@@ -20,7 +20,7 @@ public abstract class FDropDown extends FScrollPane {
     protected ScrollBounds paneSize;
 
     public FDropDown() {
-        setVisible(false); //hide by default
+        super.setVisible(false); //hide by default
     }
 
     public FMenuTab getMenuTab() {
@@ -37,11 +37,11 @@ public abstract class FDropDown extends FScrollPane {
     }
 
     public void show() {
-        this.setVisible(true);
+        setVisible(true);
     }
 
     public void hide() {
-        this.setVisible(false);
+        setVisible(false);
     }
 
     @Override
@@ -59,7 +59,7 @@ public abstract class FDropDown extends FScrollPane {
 
     @Override
     public void setVisible(boolean visible0) {
-        if (this.isVisible() == visible0) { return; }
+        if (isVisible() == visible0) { return; }
 
         //add/remove drop down from current screen when its visibility changes
         FScreen screen = Forge.getCurrentScreen();
@@ -76,6 +76,7 @@ public abstract class FDropDown extends FScrollPane {
         else {
             screen.remove(this);
             if (backdrop != null) {
+                backdrop.setVisible(false);
                 screen.remove(backdrop);
                 backdrop = null;
             }
@@ -145,6 +146,7 @@ public abstract class FDropDown extends FScrollPane {
 
         @Override
         public boolean tap(float x, float y, int count) {
+            if (!isVisible()) { return false; }
             hide(); //always hide if tapped
 
             //prevent owner handling this tap unless it's a sub menu and not over it

forge-gui-mobile/src/forge/screens/match/InputSelectCard.java

@@ -1,41 +1,189 @@
 package forge.screens.match;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
+import com.badlogic.gdx.math.Vector2;
+
+import forge.Forge.Graphics;
+import forge.assets.FSkinColor;
+import forge.assets.FSkinFont;
+import forge.assets.FSkinColor.Colors;
 import forge.game.card.Card;
 import forge.game.spellability.SpellAbility;
 import forge.match.input.Input;
 import forge.match.input.InputPassPriority;
-import forge.toolbox.FCardZoom;
+import forge.screens.FScreen;
-import forge.toolbox.FCardZoom.ZoomController;
+import forge.screens.match.views.VCardDisplayArea.CardAreaPanel;
+import forge.toolbox.FCardPanel;
+import forge.toolbox.FDisplayObject;
+import forge.toolbox.FList;
+import forge.util.Callback;
+import forge.util.Utils;
 
 public class InputSelectCard {
     private InputSelectCard() {
     }
 
-    public static void selectCard(Card card, List<Card> orderedCards) {
+    public static void selectCard(CardAreaPanel cardPanel, List<Card> orderedCards) {
         Input currentInput = FControl.getInputQueue().getInput();
         if (currentInput == null) { return; }
 
-        List<Card> orderedCardOptions = new ArrayList<Card>(orderedCards); //copy list to allow it being modified
+        if (CardOptionsList.visibleList != null) {
+            boolean isCurrentOwner = (CardOptionsList.visibleList.owner == cardPanel);
+            CardOptionsList.hide();
+            if (isCurrentOwner) {
+                return;
+            }
+        }
+
+        final Card card = cardPanel.getCard();
 
         if (currentInput instanceof InputPassPriority) {
-            FCardZoom.show("Select a spell/ability", card, orderedCardOptions, new ZoomController<SpellAbility>() {
+            CardOptionsList.show(cardPanel,
+                    card.getAllPossibleAbilities(FControl.getCurrentPlayer(), true),
+                    new Callback<SpellAbility>() {
                 @Override
-                public List<SpellAbility> getOptions(final Card card) {
+                public void run(SpellAbility result) {
-                    return card.getAllPossibleAbilities(FControl.getCurrentPlayer(), true);
+                    FControl.getInputProxy().selectAbility(result);
-                }
-
-                @Override
-                public boolean selectOption(final Card card, final SpellAbility option) {
-                    FControl.getInputProxy().selectAbility(option);
-                    return true; //TODO: Avoid hiding card zoom when selecting mana abilities
                 }
             });
         }
         else {
-            FControl.getInputProxy().selectCard(card, null);
+            List<String> options = new ArrayList<String>();
+            options.add("Select Card");
+            CardOptionsList.show(cardPanel, options, new Callback<String>() {
+                @Override
+                public void run(String result) {
+                    FControl.getInputProxy().selectCard(card, null);
+                }
+            });
+        }
+    }
+
+    public enum AttackOption {
+        DECLARE_AS_ATTACKER("Declare as Attacker"),
+        REMOVE_FROM_COMBAT("Remove from Combat"),
+        ATTACK_THIS_DEFENDER("Attack this Defender"),
+        ACTIVATE_BAND("Activate Band"),
+        JOIN_BAND("Join Band");
+
+        private String text;
+
+        private AttackOption(String text0) {
+            text = text0;
+        }
+
+        public String toString() {
+            return text;
+        }
+    }
+
+    private static class CardOptionsList<T> extends FList<T> {
+        private static final FSkinColor BACK_COLOR = FSkinColor.get(Colors.CLR_OVERLAY).alphaColor(0.5f);
+        private static final float LIST_OPTION_HEIGHT = Utils.AVG_FINGER_HEIGHT;
+
+        private static CardOptionsList<?> visibleList;
+        private static final Backdrop backdrop = new Backdrop();
+
+        private static <T> void show(CardAreaPanel cardPanel, Collection<T> options, final Callback<T> callback) {
+            final CardOptionsList<T> optionsList = new CardOptionsList<T>(cardPanel, options);
+            optionsList.setListItemRenderer(new ListItemRenderer<T>() {
+                @Override
+                public boolean tap(T value, float x, float y, int count) {
+                    hide();
+                    callback.run(value);
+                    return true;
+                }
+
+                @Override
+                public float getItemHeight() {
+                    return LIST_OPTION_HEIGHT;
+                }
+
+                @Override
+                public void drawValue(Graphics g, Object value, FSkinFont font, FSkinColor foreColor, float width, float height) {
+                    float x = width * FList.INSETS_FACTOR;
+                    float y = 3;
+                    g.startClip(0, 0, width, height);
+                    g.drawText(value.toString(), font, foreColor, x, y, width - 2 * x, height - 2 * y, true, HAlignment.CENTER, true);
+                    g.endClip();
+                }
+            });
+
+            FScreen screen = FControl.getView();
+            float screenWidth = screen.getWidth();
+            float screenHeight = screen.getHeight();
+
+            Vector2 pos = cardPanel.getScreenPosition();
+            float height = Math.min(options.size() * LIST_OPTION_HEIGHT + 1, pos.y);
+            optionsList.setBounds(0, pos.y - height, screenWidth, height);
+            optionsList.setVisible(!options.isEmpty());
+
+            backdrop.setBounds(0, 0, screenWidth, screenHeight);
+            screen.add(backdrop);
+            screen.add(optionsList);
+            visibleList = optionsList;
+        }
+
+        private CardAreaPanel owner;
+
+        private CardOptionsList(CardAreaPanel owner0, Iterable<T> options) {
+            super(options);
+            owner = owner0;
+        }
+
+        public static void hide() {
+            if (visibleList == null) { return; }
+            FControl.getView().remove(visibleList);
+            FControl.getView().remove(backdrop);
+            visibleList = null;
+        }
+
+        @Override
+        protected void drawBackground(Graphics g) {
+            g.fillRect(BACK_COLOR, 0, 0, getWidth(), getHeight());
+        }
+
+        @Override
+        protected void drawOverlay(Graphics g) { //draw top border
+            g.drawLine(1, FList.LINE_COLOR, 0, 0, getWidth(), 0);
+        }
+
+        private static class Backdrop extends FDisplayObject {
+            private Backdrop() {
+            }
+
+            @Override
+            public boolean press(float x, float y) {
+                if (visibleList == null) { return false; }
+                CardAreaPanel owner = visibleList.owner;
+                boolean onOwner = owner.contains(owner.getLeft() + owner.screenToLocalX(x), owner.getTop() + owner.screenToLocalY(y));
+                hide(); //auto-hide when backdrop pressed
+                return onOwner; //allow press to pass through to object if it's not the owner
+            }
+
+            @Override
+            public void draw(Graphics g) {
+                if (visibleList != null) {
+                    //draw outline around that owns visible list
+                    CardAreaPanel owner = visibleList.owner;
+                    Vector2 pos = owner.getScreenPosition();
+                    float x = pos.x;
+                    float y = pos.y;
+                    float h = owner.getHeight();
+                    float w = h / FCardPanel.ASPECT_RATIO;
+                    if (owner.isTapped()) {
+                        w = owner.getWidth();
+                        h = w * FCardPanel.ASPECT_RATIO;
+                        y = owner.getHeight() - h;
+                    }
+                    g.drawRect(2, Color.GREEN, x, y, w, h);
+                }
+            }
         }
     }
 }

forge-gui-mobile/src/forge/screens/match/views/VCardDisplayArea.java

@@ -166,28 +166,10 @@ public abstract class VCardDisplayArea extends VDisplayArea {
             return attachedPanels;
         }
 
-        public enum AttackOption {
-            DECLARE_AS_ATTACKER("Declare as Attacker"),
-            REMOVE_FROM_COMBAT("Remove from Combat"),
-            ATTACK_THIS_DEFENDER("Attack this Defender"),
-            ACTIVATE_BAND("Activate Band"),
-            JOIN_BAND("Join Band");
-
-            private String text;
-
-            private AttackOption(String text0) {
-                text = text0;
-            }
-
-            public String toString() {
-                return text;
-            }
-        }
-
         @Override
-        public boolean tap(float x, float y, int count) {
+        public boolean press(float x, float y) {
             if (displayArea != null) {
-                InputSelectCard.selectCard(getCard(), displayArea.orderedCards);
+                InputSelectCard.selectCard(this, displayArea.orderedCards);
             }
             return true;
         }