wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New screen for "Add Game" [MultiplayerScreen] (#2431)

Browse source 
* Adding AddGame Screen

Old button was confusing for new players

* Adding translation file entry
This commit is contained in:
GGGuenni 2020-04-16 13:44:52 +02:00 committed by GitHub
parent 7d3a10b6ab
commit 4fc5c5de64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/assets/jsons/translations/template.properties
View file

@ -349,6 +349,7 @@ Could not refresh! =
Last refresh: [time] minutes ago =
Current Turn: =
Add Currently Running Game =
Game name =
# Save game menu

51
core/src/com/unciv/ui/MultiplayerScreen.kt
View file

@ -96,7 +96,7 @@ class MultiplayerScreen() : PickerScreen() {
rightSideTable.add(editButton).pad(10f).row()
addGameButton.onClick {
addMultiplayerGame(Gdx.app.clipboard.contents)
UncivGame.Current.setScreen(AddMultiplayerGameScreen(this))
}
rightSideTable.add(addGameButton).pad(10f).padBottom(30f).row()
@ -126,12 +126,12 @@ class MultiplayerScreen() : PickerScreen() {
errorPopup.open()
return
}
if (gameIsAlreadySavedAsMultiplayer(gameId)) {
ResponsePopup("Game is already added".tr(), this)
return
}
thread(name="MultiplayerDownload") {
addGameButton.setText("Working...".tr())
addGameButton.disable()
@ -313,10 +313,10 @@ class MultiplayerScreen() : PickerScreen() {
//backScreen is used for getting back to the MultiplayerScreen so it doesn't have to be created over and over again
class EditMultiplayerGameInfoScreen(game: GameInfo, gameName: String, backScreen: MultiplayerScreen): PickerScreen(){
init {
var textField = TextField(gameName, skin)
val textField = TextField(gameName, skin)
topTable.add(Label("Rename".tr(), skin)).row()
topTable.add(textField).pad(10f).padBottom(30f).width(backScreen.stage.width/2).row()
topTable.add(textField).pad(10f).padBottom(30f).width(stage.width/2).row()
//TODO Change delete to "give up"
//->turn a player into an AI so everyone can still play without the user
@ -371,3 +371,44 @@ class EditMultiplayerGameInfoScreen(game: GameInfo, gameName: String, backScreen
}
}
}
class AddMultiplayerGameScreen(backScreen: MultiplayerScreen) : PickerScreen(){
init {
val gameNameTextField = TextField("", skin)
val gameIDTextField = TextField("", skin)
val pasteGameIDButton = TextButton("Paste gameID from clipboard", skin)
pasteGameIDButton.onClick {
gameIDTextField.text = Gdx.app.clipboard.contents
}
topTable.add(Label("GameID".tr(), skin)).row()
val gameIDTable = Table()
gameIDTable.add(gameIDTextField).pad(10f).width(2*stage.width/3 - pasteGameIDButton.width)
gameIDTable.add(pasteGameIDButton)
topTable.add(gameIDTable).padBottom(30f).row()
topTable.add(Label("Game name".tr(), skin)).row()
topTable.add(gameNameTextField).pad(10f).padBottom(30f).width(stage.width/2).row()
//CloseButton Setup
closeButton.setText("Back".tr())
closeButton.onClick {
UncivGame.Current.setScreen(backScreen)
}
//RightSideButton Setup
rightSideButton.setText("Save game".tr())
rightSideButton.enable()
rightSideButton.onClick {
try {
UUID.fromString(IdChecker.checkAndReturnGameUuid(gameIDTextField.text))
}catch (ex: Exception){
ResponsePopup("Invalid game ID!".tr(), this)
return@onClick
}
backScreen.addMultiplayerGame(gameIDTextField.text.trim(), gameNameTextField.text.trim())
UncivGame.Current.setScreen(backScreen)
}
}
}