From 0145bb94702eced50bfc6dffa6aad7c426dc062e Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 27 Nov 2021 11:20:20 +0800
Subject: [PATCH] [Mobile] Add "Match: Number" Selection

---
 .../screens/constructed/LobbyScreen.java      | 49 ++++++++++++-------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
index 82195fb2593..571022aa317 100644
--- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
+++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
@@ -70,6 +70,10 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
     private final FLabel lblVariants = new FLabel.Builder().text(localizer.getMessage("lblVariants") + ":").font(VARIANTS_FONT).build();
     private final FComboBox<Object> cbVariants = new FComboBox<>();
 
+    // Max games in a match frame and variables
+    private final FLabel lblGamesInMatch = new FLabel.Builder().text(localizer.getMessage("lblMatch") + ":").font(VARIANTS_FONT).build();
+    private final FComboBox<String> cbGamesInMatch = new FComboBox<>();
+
     private final List<PlayerPanel> playerPanels = new ArrayList<>(MAX_PLAYERS);
     private final FScrollPane playersScroll = new FScrollPane() {
         @Override
@@ -127,6 +131,20 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
 
         initLobby(lobby0);
 
+        add(lblGamesInMatch);
+        add(cbGamesInMatch);
+        cbGamesInMatch.setFont(VARIANTS_FONT);
+        cbGamesInMatch.addItem("1");
+        cbGamesInMatch.addItem("3");
+        cbGamesInMatch.addItem("5");
+        cbGamesInMatch.setSelectedItem(FModel.getPreferences().getPref((FPref.UI_MATCHES_PER_GAME)));
+        cbGamesInMatch.setChangedHandler(new FEventHandler() {
+            @Override
+            public void handleEvent(FEvent e) {
+                FModel.getPreferences().setPref(FPref.UI_MATCHES_PER_GAME, cbGamesInMatch.getSelectedItem());
+            }
+        });
+
         add(lblVariants);
         add(cbVariants);
         cbVariants.setFont(VARIANTS_FONT);
@@ -207,6 +225,8 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
         btnStart.setEnabled(hasControl);
         lblVariants.setEnabled(hasControl);
         cbVariants.setEnabled(hasControl);
+        lblGamesInMatch.setEnabled(hasControl);
+        cbGamesInMatch.setEnabled(hasControl);
         lblPlayers.setEnabled(hasControl);
         cbPlayerCount.setEnabled(hasControl);
         while (lobby.getNumberOfSlots() < getNumPlayers()){
@@ -252,23 +272,18 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
         float x = PADDING;
         float y = startY + PADDING;
         float fieldHeight = cbPlayerCount.getHeight();
-        if (Forge.isLandscapeMode()) {
-            lblVariants.setBounds(x, y, lblVariants.getAutoSizeBounds().width + PADDING / 2, fieldHeight);
-            x += lblVariants.getWidth();
-            cbVariants.setBounds(x, y, width - (x + lblPlayers.getAutoSizeBounds().width + PADDING/2 + Utils.AVG_FINGER_WIDTH + PADDING), fieldHeight);
-            x += cbVariants.getWidth();
-            lblPlayers.setBounds(x, y, lblPlayers.getAutoSizeBounds().width + PADDING / 2, fieldHeight);
-            x += lblPlayers.getWidth();
-            cbPlayerCount.setBounds(x, y, Utils.AVG_FINGER_WIDTH, fieldHeight);
-        } else {
-            lblPlayers.setBounds(x, y, lblPlayers.getAutoSizeBounds().width + PADDING / 2, fieldHeight);
-            x += lblPlayers.getWidth();
-            cbPlayerCount.setBounds(x, y, Utils.AVG_FINGER_WIDTH, fieldHeight);
-            x += cbPlayerCount.getWidth() + PADDING;
-            lblVariants.setBounds(x, y, lblVariants.getAutoSizeBounds().width + PADDING / 2, fieldHeight);
-            x += lblVariants.getWidth();
-            cbVariants.setBounds(x, y, width - x - PADDING, fieldHeight);
-        }
+        lblVariants.setBounds(x, y, lblVariants.getAutoSizeBounds().width + PADDING / 2, fieldHeight);
+        x += lblVariants.getWidth();
+        cbVariants.setBounds(x, y, width - (x + lblGamesInMatch.getAutoSizeBounds().width + PADDING/2
+                + lblPlayers.getAutoSizeBounds().width + (Utils.AVG_FINGER_WIDTH + PADDING)*2), fieldHeight);
+        x += cbVariants.getWidth();
+        lblPlayers.setBounds(x, y, lblPlayers.getAutoSizeBounds().width + PADDING / 2, fieldHeight);
+        x += lblPlayers.getWidth();
+        cbPlayerCount.setBounds(x, y, Utils.AVG_FINGER_WIDTH, fieldHeight);
+        x += cbPlayerCount.getWidth() + PADDING;
+        lblGamesInMatch.setBounds(x, y, lblGamesInMatch.getAutoSizeBounds().width + PADDING / 2, fieldHeight);
+        x += lblGamesInMatch.getWidth();
+        cbGamesInMatch.setBounds(x, y, Utils.AVG_FINGER_WIDTH, fieldHeight);
         y += cbPlayerCount.getHeight() + PADDING;
         playersScroll.setBounds(0, y, width, height - y);
     }