another commit

This commit is contained in:
adrienmalin
2018-08-16 01:17:38 +02:00
parent 991823ea22
commit 3ccb72226c
25 changed files with 177 additions and 165 deletions

View File

@ -62,12 +62,12 @@ class EndOfMatchDialog: DialogFragment() {
startActivity(sendIntent)
}
)
setNegativeButton(
/*setNegativeButton(
R.string.quit_button,
DialogInterface.OnClickListener { dialog, id ->
activity?.finish()
}
)
)*/
}.create()
}
}

View File

@ -47,7 +47,7 @@ class StarterNameDialog : DialogFragment() {
setView(namesView)
setPositiveButton(R.string.go_button) { dialog, id ->
mainActivity?.setStarterName(
when ((namesView.findViewById(R.id.radioGroup) as RadioGroup)?.checkedRadioButtonId) {
when ((namesView.findViewById(R.id.radioGroup) as RadioGroup).checkedRadioButtonId) {
R.id.radioLeftPlayer -> Side.LEFT
else -> Side.RIGHT
},
@ -55,7 +55,7 @@ class StarterNameDialog : DialogFragment() {
)
dismiss()
}
setNegativeButton(R.string.quit_button) { dialog, id -> activity?.finish() }
//setNegativeButton(R.string.quit_button) { dialog, id -> activity?.finish() }
}.create()
}
}