From b3b2cbe23c92c3cf16a2a1bc18ce493a3af94cbd Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 3 Dec 2018 13:08:34 +0200
Subject: [PATCH] Organized trade table

---
 android/build.gradle                          |  2 +-
 .../com/unciv/ui/trade/OfferColumnsTable.kt   | 22 ++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 5d285f710b..655c9de09a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -20,7 +20,7 @@ android {
     defaultConfig {
         applicationId "com.unciv.game"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 27
         versionCode 172
         versionName "2.10.9"
     }
diff --git a/core/src/com/unciv/ui/trade/OfferColumnsTable.kt b/core/src/com/unciv/ui/trade/OfferColumnsTable.kt
index b07746a542..14296f7c62 100644
--- a/core/src/com/unciv/ui/trade/OfferColumnsTable.kt
+++ b/core/src/com/unciv/ui/trade/OfferColumnsTable.kt
@@ -4,6 +4,7 @@ import com.badlogic.gdx.scenes.scene2d.Stage
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.unciv.logic.trade.TradeLogic
 import com.unciv.ui.utils.CameraStageBaseScreen
+import com.unciv.ui.utils.addSeparator
 import com.unciv.ui.utils.tr
 
 class OfferColumnsTable(tradeLogic: TradeLogic, stage: Stage, onChange: ()->Unit): Table(CameraStageBaseScreen.skin) {
@@ -18,16 +19,21 @@ class OfferColumnsTable(tradeLogic: TradeLogic, stage: Stage, onChange: ()->Unit
             tradeLogic.ourAvailableOffers, tradeLogic.currentTrade.ourOffers) { onChange() }
 
     init {
+        defaults().pad(5f)
+        val columnWidth = stage.width / 3
+
         add("Our items".tr())
-        add("Our trade offer".tr())
-        add("[${tradeLogic.otherCivilization.civName}]'s trade offer".tr())
         add("[${tradeLogic.otherCivilization.civName}]'s items".tr()).row()
-        val columnWidth = stage.width / 5f
-        val columnHeight = stage.height * 0.8f
-        add(ourAvailableOffersTable).size(columnWidth,columnHeight)
-        add(ourOffersTable).size(columnWidth,columnHeight)
-        add(theirOffersTable).size(columnWidth,columnHeight)
-        add(theirAvailableOffersTable).size(columnWidth,columnHeight)
+
+        add(ourAvailableOffersTable).size(columnWidth,stage.height/2)
+        add(theirAvailableOffersTable).size(columnWidth,stage.height/2).row()
+
+        addSeparator().height(2f)
+
+        add("Our trade offer".tr())
+        add("[${tradeLogic.otherCivilization.civName}]'s trade offer".tr()).row()
+        add(ourOffersTable).size(columnWidth,stage.height/5)
+        add(theirOffersTable).size(columnWidth,stage.height/5)
         pack()
     }