diff --git a/android/Images/StatIcons/CityConnection.png b/android/Images/StatIcons/CityConnection.png index ea38ebf627..681cbe1b3f 100644 Binary files a/android/Images/StatIcons/CityConnection.png and b/android/Images/StatIcons/CityConnection.png differ diff --git a/android/assets/game.png b/android/assets/game.png index 31a3bad2fe..42b6d9b602 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/build.gradle b/android/build.gradle index 59daab8699..31b5ec93d0 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.app" minSdkVersion 14 targetSdkVersion 28 - versionCode 259 - versionName "2.17.8" + versionCode 260 + versionName "2.17.9" } // Had to add this crap for Travis to build, it wanted to sign the app diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index 89888297cb..7144b4c899 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -30,7 +30,8 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski background = ImageGetter.getDrawable("OtherIcons/civTableBackground.png") .tint(city.civInfo.getNation().getColor()) val label = cityButtonText.toLabel() - label.setFontColor(city.civInfo.getNation().getSecondaryColor()) + val secondaryColor = city.civInfo.getNation().getSecondaryColor() + label.setFontColor(secondaryColor) clear() val unitTable = tileGroup.worldScreen.bottomBar.unitTable @@ -80,7 +81,7 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski if (city.isCapital()) { if (city.civInfo.isCityState()) { val cityStateImage = ImageGetter.getNationIcon("CityState") - .apply { color = city.civInfo.getNation().getSecondaryColor()} + .apply { color = secondaryColor} iconTable.add(cityStateImage).size(20f).pad(2f).padLeft(10f) } else { val starImage = ImageGetter.getImage("OtherIcons/Star.png").apply { color = Color.LIGHT_GRAY } @@ -88,13 +89,19 @@ class CityButton(val city: CityInfo, internal val tileGroup: WorldTileGroup, ski } } else if (city.civInfo.isCurrentPlayer() && city.isConnectedToCapital()) { val connectionImage = ImageGetter.getStatIcon("CityConnection") + connectionImage.color = secondaryColor iconTable.add(connectionImage).size(20f).pad(2f).padLeft(10f) } iconTable.add(label).pad(10f) // sufficient horizontal padding .fillY() // provide full-height clicking area - if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer()) { + + if (UnCivGame.Current.viewEntireMapForDebug || city.civInfo.isCurrentPlayer()) iconTable.add(getConstructionGroup(city.cityConstructions)).padRight(10f) + else if(city.civInfo.isMajorCiv()) { + val nationIcon = ImageGetter.getNationIcon(city.civInfo.getNation().name) + nationIcon.color = secondaryColor + iconTable.add(nationIcon).size(20f).padRight(10f) } add(iconTable).row() pack()