AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Organized trade table

Browse Source
This commit is contained in:
Yair Morgenstern 2018-12-03 13:08:34 +02:00
parent 1e17df4b1e
commit b3b2cbe23c
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@ -20,7 +20,7 @@ android {
defaultConfig { defaultConfig {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 28 targetSdkVersion 27
versionCode 172 versionCode 172
versionName "2.10.9" versionName "2.10.9"
} }

22
core/src/com/unciv/ui/trade/OfferColumnsTable.kt
View File

@ -4,6 +4,7 @@ import com.badlogic.gdx.scenes.scene2d.Stage
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.logic.trade.TradeLogic import com.unciv.logic.trade.TradeLogic
import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.addSeparator
import com.unciv.ui.utils.tr import com.unciv.ui.utils.tr
class OfferColumnsTable(tradeLogic: TradeLogic, stage: Stage, onChange: ()->Unit): Table(CameraStageBaseScreen.skin) { 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() } tradeLogic.ourAvailableOffers, tradeLogic.currentTrade.ourOffers) { onChange() }
init { init {
defaults().pad(5f)
val columnWidth = stage.width / 3
add("Our items".tr()) 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() add("[${tradeLogic.otherCivilization.civName}]'s items".tr()).row()
val columnWidth = stage.width / 5f
val columnHeight = stage.height * 0.8f add(ourAvailableOffersTable).size(columnWidth,stage.height/2)
add(ourAvailableOffersTable).size(columnWidth,columnHeight) add(theirAvailableOffersTable).size(columnWidth,stage.height/2).row()
add(ourOffersTable).size(columnWidth,columnHeight)
add(theirOffersTable).size(columnWidth,columnHeight) addSeparator().height(2f)
add(theirAvailableOffersTable).size(columnWidth,columnHeight)
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() pack()
} }