From 74ed94971763b6d795e8ff18f9b3b5a58db16aad Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Tue, 25 Nov 2014 22:01:49 +0000
Subject: [PATCH] Add plane name and End Day button to bottom of map screen

---
 .../screens/planarconquest/ConquestMapScreen.java    | 12 +++++++++++-
 .../main/java/forge/planarconquest/ConquestData.java |  5 +++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java
index a7fd04278e1..77a24b11a60 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java
@@ -46,6 +46,8 @@ public class ConquestMapScreen extends FScreen {
 
     private final RegionDisplay regionDisplay = add(new RegionDisplay());
     private final CommanderRow commanderRow = add(new CommanderRow());
+    private final FLabel lblCurrentPlane = add(new FLabel.Builder().font(FSkinFont.get(16)).align(HAlignment.CENTER).build());
+    private final FLabel btnEndDay = add(new FLabel.ButtonBuilder().font(FSkinFont.get(14)).build());
 
     private ConquestData model;
 
@@ -60,7 +62,9 @@ public class ConquestMapScreen extends FScreen {
 
     public void update() {
         model = FModel.getConquest().getModel();
-        setHeaderCaption(model.getName());
+        setHeaderCaption(model.getName() + " - Map");
+        lblCurrentPlane.setText(model.getCurrentPlane().getName());
+        btnEndDay.setText("End Day " + model.getDay());
     }
 
     @Override
@@ -69,6 +73,12 @@ public class ConquestMapScreen extends FScreen {
         regionDisplay.setBounds(0, y, width, width / CardRenderer.CARD_ART_RATIO + REGION_SLIDER_HEIGHT);
         y += regionDisplay.getHeight() + PADDING;
         commanderRow.setBounds(0, y, width, COMMANDER_ROW_HEIGHT);
+
+        btnEndDay.setSize(width / 2, btnEndDay.getAutoSizeBounds().height);
+        btnEndDay.setPosition((width - btnEndDay.getWidth()) / 2, height - btnEndDay.getHeight());
+
+        lblCurrentPlane.setSize(btnEndDay.getWidth(), lblCurrentPlane.getAutoSizeBounds().height);
+        lblCurrentPlane.setPosition(btnEndDay.getLeft(), btnEndDay.getTop() - lblCurrentPlane.getHeight());
     }
 
     private class RegionDisplay extends FContainer {
diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
index 3a89780bc29..043938d4a3e 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java
@@ -40,6 +40,7 @@ public final class ConquestData {
     private int wins, losses;
     private int winStreakBest = 0;
     private int winStreakCurrent = 0;
+    private int day = 1;
     private int difficulty;
     private ConquestPlane startingPlane, currentPlane;
     private int currentRegionIndex;
@@ -75,6 +76,10 @@ public final class ConquestData {
         return difficulty;
     }
 
+    public int getDay() {
+        return day;
+    }
+
     public ConquestPlane getStartingPlane() {
         return startingPlane;
     }