diff --git a/core/src/com/unciv/MainMenuScreen.kt b/core/src/com/unciv/MainMenuScreen.kt index 9188bafebc..46f7298580 100644 --- a/core/src/com/unciv/MainMenuScreen.kt +++ b/core/src/com/unciv/MainMenuScreen.kt @@ -6,7 +6,6 @@ import com.badlogic.gdx.scenes.scene2d.Touchable import com.badlogic.gdx.scenes.scene2d.actions.Actions import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane import com.badlogic.gdx.scenes.scene2d.ui.Table -import com.badlogic.gdx.utils.Align import com.unciv.logic.GameInfo import com.unciv.logic.GameSaver import com.unciv.logic.GameStarter @@ -165,16 +164,16 @@ class MainMenuScreen: CameraStageBaseScreen() { private fun autoLoadGame() { - ResponsePopup("Loading...", this) + ToastPopup("Loading...", this) thread { // Load game from file to class on separate thread to avoid ANR... val savedGame: GameInfo try { savedGame = GameSaver.loadGameByName(autosave) } catch (outOfMemory: OutOfMemoryError) { - ResponsePopup("Not enough memory on phone to load game!", this) + ToastPopup("Not enough memory on phone to load game!", this) return@thread } catch (ex: Exception) { // silent fail if we can't read the autosave for any reason - ResponsePopup("Cannot resume game!", this) + ToastPopup("Cannot resume game!", this) return@thread } @@ -183,7 +182,7 @@ class MainMenuScreen: CameraStageBaseScreen() { game.loadGame(savedGame) dispose() } catch (outOfMemory: OutOfMemoryError) { - ResponsePopup("Not enough memory on phone to load game!", this) + ToastPopup("Not enough memory on phone to load game!", this) } } diff --git a/core/src/com/unciv/ui/MultiplayerScreen.kt b/core/src/com/unciv/ui/MultiplayerScreen.kt index 9df133c7b8..a577bc87c8 100644 --- a/core/src/com/unciv/ui/MultiplayerScreen.kt +++ b/core/src/com/unciv/ui/MultiplayerScreen.kt @@ -82,13 +82,13 @@ class MultiplayerScreen(previousScreen: CameraStageBaseScreen) : PickerScreen() //rightTable Setup copyUserIdButton.onClick { Gdx.app.clipboard.contents = game.settings.userId - ResponsePopup("UserID copied to clipboard".tr(), this) + ToastPopup("UserID copied to clipboard".tr(), this) } rightSideTable.add(copyUserIdButton).padBottom(30f).row() copyGameIdButton.onClick { Gdx.app.clipboard.contents = selectedGame.gameId - ResponsePopup("GameID copied to clipboard".tr(), this) + ToastPopup("GameID copied to clipboard".tr(), this) } rightSideTable.add(copyGameIdButton).row() @@ -132,7 +132,7 @@ class MultiplayerScreen(previousScreen: CameraStageBaseScreen) : PickerScreen() } if (gameIsAlreadySavedAsMultiplayer(gameId)) { - ResponsePopup("Game is already added".tr(), this) + ToastPopup("Game is already added".tr(), this) return } @@ -235,7 +235,7 @@ class MultiplayerScreen(previousScreen: CameraStageBaseScreen) : PickerScreen() leftSubTable.add(gameTable).row() } catch (ex: Exception) { //skipping one save is not fatal - ResponsePopup("Could not refresh!".tr(), this) + ToastPopup("Could not refresh!".tr(), this) continue } } @@ -260,7 +260,7 @@ class MultiplayerScreen(previousScreen: CameraStageBaseScreen) : PickerScreen() //skipping one is not fatal //Trying to use as many prev. used strings as possible Gdx.app.postRunnable { - ResponsePopup("Could not download game!".tr() + " ${multiplayerGameList.getValue(gameId)}", this) + ToastPopup("Could not download game!".tr() + " ${multiplayerGameList.getValue(gameId)}", this) } continue } @@ -344,7 +344,7 @@ class EditMultiplayerGameInfoScreen(game: GameInfo, gameName: String, backScreen backScreen.reloadGameListUI() }catch (ex: Exception) { askPopup.close() - ResponsePopup("Could not delete game!".tr(), this) + ToastPopup("Could not delete game!".tr(), this) } } askPopup.addButton("No"){ @@ -415,7 +415,7 @@ class AddMultiplayerGameScreen(backScreen: MultiplayerScreen) : PickerScreen(){ try { UUID.fromString(IdChecker.checkAndReturnGameUuid(gameIDTextField.text)) }catch (ex: Exception){ - ResponsePopup("Invalid game ID!".tr(), this) + ToastPopup("Invalid game ID!".tr(), this) return@onClick } diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt b/core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt index 2f9ffcc22a..53fc98c758 100644 --- a/core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt +++ b/core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt @@ -95,7 +95,7 @@ class MapEditorMenuPopup(var mapEditorScreen: MapEditorScreen): Popup(mapEditorS } close() Gdx.app.postRunnable { - ResponsePopup("Map saved", mapEditorScreen) // todo - add this text to translations + ToastPopup("Map saved", mapEditorScreen) // todo - add this text to translations } } catch (ex: Exception) { ex.printStackTrace() diff --git a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt index 96990c2c6e..8bfed19480 100644 --- a/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt +++ b/core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt @@ -137,7 +137,7 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe // Save gameId to clipboard because you have to do it anyway. Gdx.app.clipboard.contents = newGame!!.gameId // Popup to notify the User that the gameID got copied to the clipboard - Gdx.app.postRunnable { ResponsePopup("gameID copied to clipboard".tr(), UncivGame.Current.worldScreen, 2500) } + Gdx.app.postRunnable { ToastPopup("gameID copied to clipboard".tr(), UncivGame.Current.worldScreen, 2500) } } catch (ex: Exception) { Gdx.app.postRunnable { val cantUploadNewGamePopup = Popup(this) diff --git a/core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt b/core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt index b90dd8e426..b8993354cc 100644 --- a/core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ModManagementScreen.kt @@ -33,7 +33,7 @@ class ModManagementScreen: PickerScreen() { } catch (ex: Exception) { Gdx.app.postRunnable { - ResponsePopup("Could not download mod list", this) + ToastPopup("Could not download mod list", this) } return@thread } @@ -88,13 +88,13 @@ class ModManagementScreen: PickerScreen() { Github.downloadAndExtract("$gitRepoUrl/archive/master.zip", Gdx.files.local("mods")) Gdx.app.postRunnable { - ResponsePopup("Downloaded!", this) + ToastPopup("Downloaded!", this) RulesetCache.loadRulesets() refresh() } } catch (ex:Exception){ Gdx.app.postRunnable { - ResponsePopup("Could not download mod", this) + ToastPopup("Could not download mod", this) } } finally { diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index e475787fae..adbed70a0c 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -8,7 +8,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.civilization.CivilizationInfo -import com.unciv.logic.civilization.PopupAlert import com.unciv.logic.civilization.TechManager import com.unciv.models.UncivSound import com.unciv.models.ruleset.tech.Technology @@ -175,13 +174,13 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec for (tech in civInfo.gameInfo.ruleSet.technologies.values) { if (!techNameToButton.containsKey(tech.name)) { - ResponsePopup("Tech ${tech.name} appears to be missing - perhaps two techs have the same row & column", this) + ToastPopup("Tech ${tech.name} appears to be missing - perhaps two techs have the same row & column", this) continue } val techButton = techNameToButton[tech.name]!! for (prerequisite in tech.prerequisites) { if (!techNameToButton.containsKey(prerequisite)) { - ResponsePopup("Tech $prerequisite. prerequisite of ${tech.name}, appears to be missing - perhaps two techs have the same row & column", this) + ToastPopup("Tech $prerequisite. prerequisite of ${tech.name}, appears to be missing - perhaps two techs have the same row & column", this) continue } val prerequisiteButton = techNameToButton[prerequisite]!! diff --git a/core/src/com/unciv/ui/utils/ResponsePopup.kt b/core/src/com/unciv/ui/utils/ToastPopup.kt similarity index 87% rename from core/src/com/unciv/ui/utils/ResponsePopup.kt rename to core/src/com/unciv/ui/utils/ToastPopup.kt index ac1fe7c065..981f134232 100644 --- a/core/src/com/unciv/ui/utils/ResponsePopup.kt +++ b/core/src/com/unciv/ui/utils/ToastPopup.kt @@ -4,7 +4,7 @@ import kotlin.concurrent.thread //Its a popUp which will close itself after a given amount of time //Standard time is one second (in milliseconds) -class ResponsePopup (message: String, screen: CameraStageBaseScreen, time: Long = 1000) : Popup(screen){ +class ToastPopup (message: String, screen: CameraStageBaseScreen, time: Long = 1000) : Popup(screen){ private val visibilityTime = time init { addGoodSizedLabel(message)