diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index a2e42e84943..b9fa75d703a 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -61,7 +61,8 @@ public abstract class ItemManager extends FContainer im private FEventHandler selectionChangedHandler, itemActivateHandler; private final Class genericType; private ItemManagerConfig config; - private String caption, ratio; + private String caption = "Items"; + private String ratio = "(0 / 0)"; private final ItemFilter mainSearchFilter; diff --git a/forge-gui-mobile/src/forge/screens/draft/CurrentPackPage.java b/forge-gui-mobile/src/forge/screens/draft/CurrentPackPage.java index 137cef5e202..670f8b2d8e3 100644 --- a/forge-gui-mobile/src/forge/screens/draft/CurrentPackPage.java +++ b/forge-gui-mobile/src/forge/screens/draft/CurrentPackPage.java @@ -1,19 +1,36 @@ package forge.screens.draft; import forge.assets.FSkinImage; +import forge.itemmanager.CardManager; +import forge.itemmanager.ItemManagerConfig; import forge.limited.BoosterDraft; import forge.screens.TabPageScreen.TabPage; +import forge.toolbox.FEvent; +import forge.toolbox.FEvent.FEventHandler; public class CurrentPackPage extends TabPage { private final BoosterDraft draft; + private final CardManager lstPack = add(new CardManager(false)); protected CurrentPackPage(BoosterDraft draft0) { super("Pack 1", FSkinImage.PACK); draft = draft0; + + //hide filters and options panel so more of pack is visible by default + lstPack.setHideViewOptions(1, true); + lstPack.setAlwaysNonUnique(true); + lstPack.setup(ItemManagerConfig.DRAFT_PACK); + lstPack.setItemActivateHandler(new FEventHandler() { + @Override + public void handleEvent(FEvent e) { + draft.setChoice(lstPack.getSelectedItem()); + } + }); } @Override protected void doLayout(float width, float height) { + lstPack.setBounds(0, 0, width, height); } } diff --git a/forge-gui-mobile/src/forge/screens/draft/DraftDeckPage.java b/forge-gui-mobile/src/forge/screens/draft/DraftDeckPage.java index 150619f4c99..0d53f980759 100644 --- a/forge-gui-mobile/src/forge/screens/draft/DraftDeckPage.java +++ b/forge-gui-mobile/src/forge/screens/draft/DraftDeckPage.java @@ -1,19 +1,27 @@ package forge.screens.draft; import forge.assets.FSkinImage; +import forge.itemmanager.CardManager; +import forge.itemmanager.ItemManagerConfig; import forge.limited.BoosterDraft; import forge.screens.TabPageScreen.TabPage; public class DraftDeckPage extends TabPage { private final BoosterDraft draft; + private final CardManager lstDeck = add(new CardManager(false)); protected DraftDeckPage(BoosterDraft draft0) { super("Deck", FSkinImage.DECKLIST); draft = draft0; + + lstDeck.setCaption("Deck"); + lstDeck.setAlwaysNonUnique(true); + lstDeck.setup(ItemManagerConfig.DRAFT_POOL); } @Override protected void doLayout(float width, float height) { + lstDeck.setBounds(0, 0, width, height); } } diff --git a/forge-gui-mobile/src/forge/screens/draft/DraftSideboardPage.java b/forge-gui-mobile/src/forge/screens/draft/DraftSideboardPage.java index 962aabac82e..8a45a81421d 100644 --- a/forge-gui-mobile/src/forge/screens/draft/DraftSideboardPage.java +++ b/forge-gui-mobile/src/forge/screens/draft/DraftSideboardPage.java @@ -1,19 +1,27 @@ package forge.screens.draft; import forge.assets.FSkinImage; +import forge.itemmanager.CardManager; +import forge.itemmanager.ItemManagerConfig; import forge.limited.BoosterDraft; import forge.screens.TabPageScreen.TabPage; public class DraftSideboardPage extends TabPage { private final BoosterDraft draft; + private final CardManager lstSideboard = add(new CardManager(false)); protected DraftSideboardPage(BoosterDraft draft0) { super("Sideboard", FSkinImage.FLASHBACK); draft = draft0; + + lstSideboard.setCaption("Sideboard"); + lstSideboard.setAlwaysNonUnique(true); + lstSideboard.setup(ItemManagerConfig.DRAFT_POOL); } @Override protected void doLayout(float width, float height) { + lstSideboard.setBounds(0, 0, width, height); } }