mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-22 02:07:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

CityRenamePopup (#8534)

Browse Source 
it is now possible to rename a city by clicking on its name in the UnitTable on the world screen(bottom left)
This commit is contained in:
Gualdimar 2023-02-01 20:08:49 +02:00 committed by GitHub
parent b79411a5b2
commit d43e190d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/com/unciv/ui/cityscreen/CityScreenCityPickerTable.kt
View File

@ -5,11 +5,10 @@ import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popup.AskTextPopup
import com.unciv.ui.pickerscreens.CityRenamePopup
import com.unciv.ui.utils.BaseScreen
import com.unciv.ui.utils.extensions.onClick
import com.unciv.ui.utils.extensions.toLabel
import com.unciv.models.translations.tr
/** Widget for the City Screen -
* the panel at bottom center showing the city name and offering arrows to cycle through the cities. */
@ -55,16 +54,13 @@ class CityScreenCityPickerTable(private val cityScreen: CityScreen) : Table() {
val currentCityLabel = city.name.toLabel(fontSize = 30, fontColor = civInfo.nation.getInnerColor())
if (cityScreen.canChangeState) currentCityLabel.onClick {
AskTextPopup(
cityScreen,
label = "Please enter a new name for your city",
defaultText = city.name.tr(),
validate = { it != "" },
actionOnOk = { text ->
city.name = text
CityRenamePopup(
screen = cityScreen,
city = city,
actionOnClose = {
cityScreen.game.replaceCurrentScreen(CityScreen(city))
}
).open()
)
}
cityNameTable.add(currentCityLabel)

24
core/src/com/unciv/ui/pickerscreens/CityRenamePopup.kt Normal file
View File

@ -0,0 +1,24 @@
package com.unciv.ui.pickerscreens
import com.unciv.logic.city.City
import com.unciv.models.translations.tr
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popup.AskTextPopup
import com.unciv.ui.utils.BaseScreen
class CityRenamePopup(val screen: BaseScreen, val city: City, val actionOnClose: ()->Unit) {
init {
AskTextPopup(
screen,
label = "Please enter a new name for your city",
defaultText = city.name.tr(),
validate = { it != "" },
actionOnOk = { text ->
city.name = text
actionOnClose()
}
).open()
}
}

16
core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
View File

@ -17,6 +17,7 @@ import com.unciv.models.translations.tr
import com.unciv.ui.civilopedia.CivilopediaCategories
import com.unciv.ui.civilopedia.CivilopediaScreen
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.pickerscreens.CityRenamePopup
import com.unciv.ui.pickerscreens.PromotionPickerScreen
import com.unciv.ui.pickerscreens.UnitRenamePopup
import com.unciv.ui.utils.BaseScreen
@ -125,7 +126,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table() {
if (selectedUnit!!.civInfo != worldScreen.viewingCiv && !worldScreen.viewingCiv.isSpectator()) { // The unit that was selected, was captured. It exists but is no longer ours.
selectUnit()
selectedUnitHasChanged = true
} else if (selectedUnit!! !in selectedUnit!!.getTile().getUnits()) { // The unit that was there no longer exists}
} else if (selectedUnit!! !in selectedUnit!!.getTile().getUnits()) { // The unit that was there no longer exists
selectUnit()
selectedUnitHasChanged = true
}
@ -228,7 +229,20 @@ class UnitTable(val worldScreen: WorldScreen) : Table() {
var nameLabelText = city.name.tr()
if(city.health<city.getMaxHealth()) nameLabelText+=" ("+city.health+")"
unitNameLabel.setText(nameLabelText)
unitNameLabel.clearListeners()
unitNameLabel.onClick {
if (!worldScreen.canChangeState) return@onClick
CityRenamePopup(
screen = worldScreen,
city = city,
actionOnClose = {
unitNameLabel.setText(city.name.tr())
worldScreen.shouldUpdate = true
}
)
}
unitDescriptionTable.clear()
unitDescriptionTable.defaults().pad(2f).padRight(5f)
unitDescriptionTable.add("Strength".tr())