From f804af8b9d889a6603b0805f5482de81465b362b Mon Sep 17 00:00:00 2001
From: adrienmalin <41926238+adrienmalin@users.noreply.github.com>
Date: Mon, 13 Aug 2018 01:05:51 +0200
Subject: [PATCH] ...
---
.idea/vcs.xml | 6 ++
.../java/adrienmalin/pingpoints/Dialog.kt | 26 +++++
.../adrienmalin/pingpoints/MainActivity.kt | 7 +-
.../NomsJoueursEtPremierServeurDialog.kt | 100 ------------------
app/src/main/res/layout/activity_main.xml | 80 ++++++++++++++
..._premier_serveur_dialog.xml => dialog.xml} | 2 +-
app/src/main/res/values/strings.xml | 14 ++-
7 files changed, 127 insertions(+), 108 deletions(-)
create mode 100644 .idea/vcs.xml
create mode 100644 app/src/main/java/adrienmalin/pingpoints/Dialog.kt
delete mode 100644 app/src/main/java/adrienmalin/pingpoints/NomsJoueursEtPremierServeurDialog.kt
rename app/src/main/res/layout/{fragment_noms_joueurs_et_premier_serveur_dialog.xml => dialog.xml} (96%)
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/adrienmalin/pingpoints/Dialog.kt b/app/src/main/java/adrienmalin/pingpoints/Dialog.kt
new file mode 100644
index 0000000..c614281
--- /dev/null
+++ b/app/src/main/java/adrienmalin/pingpoints/Dialog.kt
@@ -0,0 +1,26 @@
+package adrienmalin.pingpoints
+
+import android.os.Bundle
+import android.support.v4.app.DialogFragment
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.DialogInterface
+
+
+class Dialog : DialogFragment() {
+ override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+ // Use the Builder class for convenient dialog construction
+ val builder = AlertDialog.Builder(activity)
+ builder.setTitle(R.string.dialog_title)
+ .setMessage(R.string.dialog_message)
+ .setPositiveButton(R.string.go, DialogInterface.OnClickListener { dialog, id ->
+ // FIRE ZE MISSILES!
+ })
+ .setNegativeButton(R.string.cancel, DialogInterface.OnClickListener { dialog, id ->
+ // User cancelled the dialog
+ })
+ .setView(view)
+ // Create the AlertDialog object and return it
+ 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 4ebf2ed..f782c0b 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MainActivity.kt
@@ -3,6 +3,7 @@ package adrienmalin.pingpoints
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
+
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
@@ -10,10 +11,10 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.activity_main)
}
- val joueurs: Array = arrayOf(Joueur("Joueur 1"), Joueur("Joueur 2"))
- val serveur: Joueur? = null
+ val joueurs: Array = arrayOf(Joueur(getString(R.string.nom_joueur_1)), Joueur(getString(R.string.nom_joueur_2)))
+ val serveur: Int? = null
}
-class Joueur(nom: String)
\ No newline at end of file
+class Joueur(nom: String, score: Int = 0)
\ No newline at end of file
diff --git a/app/src/main/java/adrienmalin/pingpoints/NomsJoueursEtPremierServeurDialog.kt b/app/src/main/java/adrienmalin/pingpoints/NomsJoueursEtPremierServeurDialog.kt
deleted file mode 100644
index 0bfb0ec..0000000
--- a/app/src/main/java/adrienmalin/pingpoints/NomsJoueursEtPremierServeurDialog.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package adrienmalin.pingpoints
-
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Activities that contain this fragment must implement the
- * [NomsJoueursEtPremierServeurDialog.OnFragmentInteractionListener] interface
- * to handle interaction events.
- * Use the [NomsJoueursEtPremierServeurDialog.newInstance] factory method to
- * create an instance of this fragment.
- *
- */
-class NomsJoueursEtPremierServeurDialog : Fragment() {
- // TODO: Rename and change types of parameters
- private var param1: String? = null
- private var param2: String? = null
- private var listener: OnFragmentInteractionListener? = null
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- arguments?.let {
- param1 = it.getString(ARG_PARAM1)
- param2 = it.getString(ARG_PARAM2)
- }
- }
-
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?): View? {
- // Inflate the layout for this fragment
- return inflater.inflate(R.layout.fragment_noms_joueurs_et_premier_serveur_dialog, container, false)
- }
-
- // TODO: Rename method, update argument and hook method into UI event
- fun onButtonPressed(uri: Uri) {
- listener?.onFragmentInteraction(uri)
- }
-
- override fun onAttach(context: Context) {
- super.onAttach(context)
- if (context is OnFragmentInteractionListener) {
- listener = context
- } else {
- throw RuntimeException(context.toString() + " must implement OnFragmentInteractionListener")
- }
- }
-
- override fun onDetach() {
- super.onDetach()
- listener = null
- }
-
- /**
- * This interface must be implemented by activities that contain this
- * fragment to allow an interaction in this fragment to be communicated
- * to the activity and potentially other fragments contained in that
- * activity.
- *
- *
- * See the Android Training lesson [Communicating with Other Fragments]
- * (http://developer.android.com/training/basics/fragments/communicating.html)
- * for more information.
- */
- interface OnFragmentInteractionListener {
- // TODO: Update argument type and name
- fun onFragmentInteraction(uri: Uri)
- }
-
- companion object {
- /**
- * Use this factory method to create a new instance of
- * this fragment using the provided parameters.
- *
- * @param param1 Parameter 1.
- * @param param2 Parameter 2.
- * @return A new instance of fragment NomsJoueursEtPremierServeurDialog.
- */
- // TODO: Rename and change types and number of parameters
- @JvmStatic
- fun newInstance(param1: String, param2: String) =
- NomsJoueursEtPremierServeurDialog().apply {
- arguments = Bundle().apply {
- putString(ARG_PARAM1, param1)
- putString(ARG_PARAM2, param2)
- }
- }
- }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4bc129d..268d656 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,4 +7,84 @@
tools:context=".MainActivity"
tools:layout_editor_absoluteY="73dp">
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_noms_joueurs_et_premier_serveur_dialog.xml b/app/src/main/res/layout/dialog.xml
similarity index 96%
rename from app/src/main/res/layout/fragment_noms_joueurs_et_premier_serveur_dialog.xml
rename to app/src/main/res/layout/dialog.xml
index d22bf70..9133069 100644
--- a/app/src/main/res/layout/fragment_noms_joueurs_et_premier_serveur_dialog.xml
+++ b/app/src/main/res/layout/dialog.xml
@@ -13,7 +13,7 @@
android:orientation="horizontal">
- PingPoints
-
-
- Hello blank fragment
+ Ping Points
+ Allons-y !
+ Annuler
+ Nouvelle partie
+ Qui commence ?
+ Joueur 1
+ Joueur 2
+ Cliquez sur le joueur qui a marqué
+ Service
+ Score