From 9e7fd48e91485052a39f2ee929993b734188ca95 Mon Sep 17 00:00:00 2001 From: Adrien Date: Mon, 21 Dec 2020 17:31:37 +0100 Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20partie=20"Liste=20de=20cartes?= =?UTF-8?q?"=20disponible=20depuis=20l'accueil.=20Avec=20:=20-=20Image=20-?= =?UTF-8?q?=20Nb=20Attaque=20et=20Nb=20PVs=20-=20Lien=20clickable=20(reste?= =?UTF-8?q?=20qu'=C3=A0=20ajouter=20une=20barre=20de=20recherche)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 5 ++++ ...ialogue.java => DeckPickDialogueGame.java} | 17 ++++++++----- .../myapplication/Game/Cards/Card.java | 7 +++--- .../iutlaval/myapplication/MainActivity.java | 25 +++++++++++++------ app/src/main/res/layout/activity_main.xml | 14 +++++------ app/src/main/res/values/strings.xml | 4 +-- 6 files changed, 47 insertions(+), 25 deletions(-) rename app/src/main/java/com/iutlaval/myapplication/{DeckPickDialogue.java => DeckPickDialogueGame.java} (66%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a3ee35e..c5a1658 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,6 +23,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogue.java b/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogueGame.java similarity index 66% rename from app/src/main/java/com/iutlaval/myapplication/DeckPickDialogue.java rename to app/src/main/java/com/iutlaval/myapplication/DeckPickDialogueGame.java index f00b123..84df489 100644 --- a/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogue.java +++ b/app/src/main/java/com/iutlaval/myapplication/DeckPickDialogueGame.java @@ -10,9 +10,9 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; -public class DeckPickDialogue extends DialogFragment { +public class DeckPickDialogueGame extends DialogFragment { Context context; - public DeckPickDialogue(@NonNull Context context) { + public DeckPickDialogueGame(@NonNull Context context) { this.context=context; } @@ -26,14 +26,19 @@ public class DeckPickDialogue extends DialogFragment { // of the selected item String[] mTestArray = getResources().getStringArray(R.array.decks); - Intent gameActivity = new Intent(context, GameActivity.class); - gameActivity.putExtra("DECK", mTestArray[which]); - gameActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + startActivity(mTestArray, which); - startActivity(gameActivity); } }); return builder.create(); } + public void startActivity(String[] mTestArray, int which) { + Intent gameActivity = new Intent(context, GameActivity.class); + gameActivity.putExtra("DECK", mTestArray[which]); + gameActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); + + startActivity(gameActivity); + } + } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java index df57ac9..1cd95db 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java @@ -17,9 +17,10 @@ public abstract class Card { * @param UID * @param c */ - public Card(String UID,Context c) - { - drawableCard = new DrawableCard(this,0,0,UID,c); + public Card(String UID,Context c) { + if(!(UID == null || c == null)) { + drawableCard = new DrawableCard(this, 0, 0, UID, c); + } } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/MainActivity.java b/app/src/main/java/com/iutlaval/myapplication/MainActivity.java index 4fb7d45..abef5f0 100644 --- a/app/src/main/java/com/iutlaval/myapplication/MainActivity.java +++ b/app/src/main/java/com/iutlaval/myapplication/MainActivity.java @@ -1,10 +1,6 @@ package com.iutlaval.myapplication; -import android.app.AlertDialog; -import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; @@ -26,15 +22,30 @@ public class MainActivity extends AppCompatActivity { playButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { //Toast.makeText(getApplicationContext(), "click sur button", Toast.LENGTH_LONG).show(); - pickDeck(); + pickDeckGame(); } }); + + final Button cardButton = (Button) findViewById(R.id.cardButton); + cardButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + //Toast.makeText(getApplicationContext(), "click sur button", Toast.LENGTH_LONG).show(); + pickDeckList(); + } + }); + } - private String pickDeck() { - DialogFragment d = new DeckPickDialogue(this); + private String pickDeckGame() { + DialogFragment d = new DeckPickDialogueGame(this); d.show(getSupportFragmentManager(),"s"); + return "demodeck"; + } + + private String pickDeckList() { + DialogFragment d = new DeckPickDialogueList(this); + d.show(getSupportFragmentManager(),"s"); return "demodeck"; } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 64c06d0..7e03454 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -27,16 +27,16 @@ android:layout_width="400dp" android:layout_height="wrap_content" android:fontFamily="@font/alfa_slab_one" - android:text="Info Battlecard" + android:text="Le Choc des Histoires" android:textAlignment="center" android:textColor="#A6FF9800" - android:textSize="36sp" + android:textSize="30sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintHorizontal_bias="0.454" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.702" /> + app:layout_constraintVertical_bias="0.672" />