diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 45cd33a..accb349 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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index faa25f0..5f144a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,9 +8,10 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.AppCompat"> + android:theme="@style/PingPoints"> + android:screenOrientation="sensorLandscape" + android:theme="@style/PingPoints"> diff --git a/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt b/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt index a72c3a2..387ae91 100644 --- a/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt +++ b/app/src/main/java/adrienmalin/pingpoints/EndOfMatchDialog.kt @@ -11,22 +11,54 @@ import android.support.v4.app.DialogFragment class EndOfMatchDialog: DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val builder = AlertDialog.Builder(activity) + val player1Name = arguments?.getString("PLAYER_1_NAME") + val player2Name = arguments?.getString("PLAYER_2_NAME") 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)) + R.string.new_match, + DialogInterface.OnClickListener {dialog, id -> + startActivity(Intent(context, MainActivity::class.java)) activity?.finish() } ) + .setNeutralButton( + R.string.share_button, + DialogInterface.OnClickListener { dialog, id -> + val sendIntent: Intent = Intent().apply { + action = Intent.ACTION_SEND + putExtra( + Intent.EXTRA_SUBJECT, + getString( + R.string.share_subject, + player1Name, + player2Name + ) + ) + putExtra( + Intent.EXTRA_TEXT, + getString( + R.string.share_message, + player1Name, + player2Name, + winnerName, + winnerScore, + loserScore + ) + ) + type = "text/plain" + } + startActivity(sendIntent) + } + ) .setNegativeButton( R.string.quit_button, - DialogInterface.OnClickListener { - dialog, id -> activity?.finish() + DialogInterface.OnClickListener { dialog, id -> + activity?.finish() } ) diff --git a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt index 1414484..750e844 100644 --- a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt +++ b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt @@ -11,6 +11,8 @@ import android.text.Spanned import android.text.TextUtils.join import kotlin.math.abs import android.support.design.widget.Snackbar +import android.support.v4.app.DialogFragment +import android.widget.Toast @SuppressWarnings("deprecation") @@ -24,7 +26,7 @@ fun fromHtml(html: String): Spanned { } -class MainActivity : AppCompatActivity() { +class MainActivity : AppCompatActivity(), StarterNameDialog.StarterNameDialogListener{ var players: Array = arrayOf( Player(), Player() @@ -34,9 +36,7 @@ class MainActivity : AppCompatActivity() { var textScore: android.widget.TextView? = null - var stringScore:String = "" var textService: android.widget.TextView? = null - var stringService:String = "" var buttons: Array