diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java index 26761ccd9cc..94a979acc2a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/VSubmenuDraft.java @@ -35,7 +35,6 @@ public enum VSubmenuDraft implements IVSubmenu { private final StartButton btnStart = new StartButton(); private final DeckManager lstDecks = new DeckManager(GameType.Draft); - private final JList lstAI = new FList(); private final JRadioButton radSingle = new FRadioButton("Play one opponent"); private final JRadioButton radAll = new FRadioButton("Play all 7 opponents"); @@ -62,7 +61,6 @@ public enum VSubmenuDraft implements IVSubmenu { * Constructor. */ private VSubmenuDraft() { - lstAI.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); btnStart.setEnabled(false); lblTitle.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); diff --git a/forge-gui-mobile/src/forge/screens/LaunchScreen.java b/forge-gui-mobile/src/forge/screens/LaunchScreen.java index 389cc2ca9c2..e2e0b3ff66a 100644 --- a/forge-gui-mobile/src/forge/screens/LaunchScreen.java +++ b/forge-gui-mobile/src/forge/screens/LaunchScreen.java @@ -24,7 +24,7 @@ public abstract class LaunchScreen extends FScreen { private static final float IMAGE_WIDTH = FSkinImage.BTN_START_UP.getWidth() * IMAGE_HEIGHT / FSkinImage.BTN_START_UP.getHeight(); private static final float PADDING = IMAGE_HEIGHT * 0.025f; - private final StartButton btnStart; + protected final StartButton btnStart; private boolean creatingMatch; public LaunchScreen(String headerCaption) { @@ -78,7 +78,7 @@ public abstract class LaunchScreen extends FScreen { }); } - private class StartButton extends FDisplayObject { + protected class StartButton extends FDisplayObject { private boolean pressed; /** diff --git a/forge-gui-mobile/src/forge/screens/draft/DraftScreen.java b/forge-gui-mobile/src/forge/screens/draft/DraftScreen.java index c0cff6537e7..626ea76f093 100644 --- a/forge-gui-mobile/src/forge/screens/draft/DraftScreen.java +++ b/forge-gui-mobile/src/forge/screens/draft/DraftScreen.java @@ -1,17 +1,38 @@ package forge.screens.draft; import forge.screens.LaunchScreen; +import forge.toolbox.FLabel; +import forge.toolbox.FOptionPane; +import forge.util.Utils; +import forge.assets.FSkinFont; +import forge.deck.DeckProxy; import forge.game.GameType; +import forge.itemmanager.DeckManager; +import forge.itemmanager.ItemManagerConfig; +import forge.model.FModel; public class DraftScreen extends LaunchScreen { + private static final float PADDING = Utils.scaleMin(5); + + private final FLabel btnNewDraft = add(new FLabel.ButtonBuilder().text("New Booster Draft Game").font(FSkinFont.get(16)).build()); + private final DeckManager lstDecks = add(new DeckManager(GameType.Draft)); + public DraftScreen() { - super("Draft"); + super("Booster Draft"); + + lstDecks.setPool(DeckProxy.getDraftDecks(FModel.getDecks().getDraft())); + lstDecks.setup(ItemManagerConfig.DRAFT_DECKS); + btnStart.setEnabled(!lstDecks.getPool().isEmpty()); } @Override protected void doLayoutAboveBtnStart(float startY, float width, float height) { - // TODO Auto-generated method stub - + float x = PADDING; + float y = startY + PADDING; + float w = width - 2 * PADDING; + btnNewDraft.setBounds(x, y, w, btnNewDraft.getAutoSizeBounds().height * 1.2f); + y += btnNewDraft.getHeight() + PADDING; + lstDecks.setBounds(x, y, w, height - y - PADDING); } @Override diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/GauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/GauntletScreen.java index f18c6915baa..a79d1e1dbde 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/GauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/GauntletScreen.java @@ -5,7 +5,7 @@ import forge.screens.LaunchScreen; public class GauntletScreen extends LaunchScreen { public GauntletScreen() { - super("Gauntlet"); + super("Gauntlets"); } @Override diff --git a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java index 7dfd1d22fd8..dd1ab6872d5 100644 --- a/forge-gui-mobile/src/forge/screens/home/HomeScreen.java +++ b/forge-gui-mobile/src/forge/screens/home/HomeScreen.java @@ -31,25 +31,25 @@ public class HomeScreen extends FScreen { Forge.openScreen(new ConstructedScreen()); } }, true); - addButton("Draft", new FEventHandler() { + addButton("Booster Draft", new FEventHandler() { @Override public void handleEvent(FEvent e) { Forge.openScreen(new DraftScreen()); } - }, false); - addButton("Sealed", new FEventHandler() { + }, true); + addButton("Sealed Deck", new FEventHandler() { @Override public void handleEvent(FEvent e) { Forge.openScreen(new SealedScreen()); } }, false); - addButton("Quest", new FEventHandler() { + addButton("Quest Mode", new FEventHandler() { @Override public void handleEvent(FEvent e) { Forge.openScreen(new QuestScreen()); } }, false); - addButton("Gauntlet", new FEventHandler() { + addButton("Gauntlets", new FEventHandler() { @Override public void handleEvent(FEvent e) { Forge.openScreen(new GauntletScreen()); diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/QuestScreen.java index 8a9a622a692..ca7aa12872a 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestScreen.java @@ -5,7 +5,7 @@ import forge.screens.LaunchScreen; public class QuestScreen extends LaunchScreen { public QuestScreen() { - super("Quest"); + super("Quest Mode"); } @Override diff --git a/forge-gui-mobile/src/forge/screens/sealed/SealedScreen.java b/forge-gui-mobile/src/forge/screens/sealed/SealedScreen.java index 401fe1f5d04..23da6adcd83 100644 --- a/forge-gui-mobile/src/forge/screens/sealed/SealedScreen.java +++ b/forge-gui-mobile/src/forge/screens/sealed/SealedScreen.java @@ -5,7 +5,7 @@ import forge.screens.LaunchScreen; public class SealedScreen extends LaunchScreen { public SealedScreen() { - super("Sealed"); + super("Sealed Deck"); } @Override