adrien/PingPoints
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Add icons, set layout, add end dialog

Browse Source
This commit is contained in:
adrienmalin
2018-08-14 02:58:12 +02:00
parent 09c7fef71c
commit 8387482e45
18 changed files with 280 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt Normal file
View File

@ -0,0 +1,35 @@
package adrienmalin.pingpoints
import android.content.DialogInterface
import android.app.AlertDialog
import android.app.Dialog
import android.content.Intent
import android.os.Bundle
import android.support.v4.app.DialogFragment
class EndOfMatchDialog: DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val builder = AlertDialog.Builder(activity)
val winnerName = arguments?.getString("WINNER_NAME")
val winnerScore = arguments?.getInt("WINNER_SCORE")
val loserScore = arguments?.getInt("LOSER_SCORE")
builder.setTitle(getString(R.string.end_match_dialog_title, winnerName))
.setMessage(getString(R.string.score, winnerScore, loserScore))
.setPositiveButton(
R.string.new_match_button,
DialogInterface.OnClickListener {
dialog, id -> startActivity(Intent(context, MainActivity::class.java))
activity?.finish()
}
)
.setNegativeButton(
R.string.quit_button,
DialogInterface.OnClickListener {
dialog, id -> activity?.finish()
}
)
return builder.create()
}
}

91
app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
View File

@ -2,8 +2,24 @@ package adrienmalin.pingpoints
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import android.text.Html
import android.view.View
import android.widget.Button
import android.os.Build
import android.text.Spanned
import android.text.TextUtils.join
import kotlin.math.abs
@SuppressWarnings("deprecation")
fun fromHtml(html: String): Spanned {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY)
} else {
Html.fromHtml(html)
}
}
class MainActivity : AppCompatActivity() {
@ -14,16 +30,12 @@ class MainActivity : AppCompatActivity() {
var server: Int = 0
var notServer: Int = 1
var buttonPlayers: Array<Button> = emptyArray()
var serviceTexts: Array<Array<String>> = arrayOf(
arrayOf("""_o/°""", ""),
arrayOf("", """°\o_""")
)
var textScore: android.widget.TextView? = null
var textService: android.widget.TextView? = null
var stringScore:String = ""
var textService: android.widget.TextView? = null
var stringService:String = ""
var buttons: Array<Button> = emptyArray()
override fun onCreate(savedInstanceState: Bundle?) {
@ -37,12 +49,7 @@ class MainActivity : AppCompatActivity() {
textScore = findViewById(R.id.textScore)
textService = findViewById(R.id.textService)
stringScore = getString(R.string.score)
stringService = getString(R.string.service)
buttonPlayers = arrayOf(
buttons = arrayOf(
findViewById(R.id.buttonPlayer1),
findViewById(R.id.buttonPlayer2)
)
@ -50,14 +57,23 @@ class MainActivity : AppCompatActivity() {
update_ui()
}
fun updateScore(scoringPlayerId: Int) {
players[scoringPlayerId].score ++
fun update_ui() {
if (players.sumBy { it.score } % 2 == 0) {
server = notServer.also { notServer = server }
textScore?.text = getString(R.string.score, players[server].score, players[notServer].score)
textService?.text = getString(R.string.service, players[server].name)
for ((button, player) in buttons.zip(players)) {
button.text = fromHtml(getString(R.string.button_text, player.name, player.score))
}
update_ui()
if (server == 0) {
buttons[0].setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_button, 0, 0, 0)
buttons[1].setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
} else {
buttons[0].setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0)
buttons[1].setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_button, 0)
}
}
fun onClickPlayer1(view: View) {
@ -68,27 +84,42 @@ class MainActivity : AppCompatActivity() {
updateScore(1)
}
fun update_ui(){
fun updateScore(scoringPlayerId: Int) {
players[scoringPlayerId].score++
textScore?.text = "$stringScore ${players[server].score} - ${players[notServer].score}"
textService?.text = "$stringService ${players[server].name}"
for ((player, serviceText) in players.zip(serviceTexts[server])) {
player.serviceText = serviceText
if (players.sumBy { it.score } % 2 == 0) {
server = notServer.also { notServer = server }
}
for ((button, player) in buttonPlayers.zip(players)) {
button.text = """
|${player.name}
|${player.score}
|${player.serviceText}""".trimMargin()
update_ui()
if (
(players.map { it -> it.score } .max() ?: 0 >= 11) and
(abs(players[0].score - players[1].score) >= 2)
) {
endOfMatch()
}
}
fun endOfMatch() {
val (loser, winner) = players.sortedBy { it.score }
var endOfMatchDialog: EndOfMatchDialog = EndOfMatchDialog()
val bundle = Bundle()
bundle.putString("WINNER_NAME", winner.name)
bundle.putInt("WINNER_SCORE", winner.score)
bundle.putInt("LOSER_SCORE", loser.score)
endOfMatchDialog.arguments = bundle
endOfMatchDialog.show(
supportFragmentManager,
join(" ", arrayOf(winner.name, winner.score.toString(), "-", loser.name, loser.score.toString()))
)
}
}
class Player(
data class Player(
var name: String = "",
var score: Int = 0,
var serviceText: String = ""

4
app/src/main/java/adrienmalin/pingpoints/Dialog.kt → app/src/main/java/adrienmalin/pingpoints/StarterNameDialog.kt
View File

@ -7,7 +7,7 @@ import android.app.Dialog
import android.content.DialogInterface
class Dialog : DialogFragment() {
class StarterNameDialog : DialogFragment() {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
// Use the Builder class for convenient dialog construction
val builder = AlertDialog.Builder(activity)
@ -19,7 +19,7 @@ class Dialog : DialogFragment() {
.setNegativeButton(R.string.quit, DialogInterface.OnClickListener { dialog, id ->
// User cancelled the dialog
})
.setView(view)
.setView(R.layout.dialog)
// Create the AlertDialog object and return it
return builder.create()
}