diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..773d062 --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,65 @@ + + + + + + \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f9f7e25..45cd33a 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..de50cc6 Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt b/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt new file mode 100644 index 0000000..a72c3a2 --- /dev/null +++ b/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt @@ -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() + } +} \ No newline at end of file diff --git a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt index 3de3e43..162032a 100644 --- a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt +++ b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt @@ -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