Ajout de la partie "Liste de cartes" disponible depuis l'accueil.

Avec :
- Image
- Nb Attaque et Nb PVs
- Lien clickable
(reste qu'à ajouter une barre de recherche)
This commit is contained in:
Adrien
2020-12-21 17:31:37 +01:00
parent fa290c58fc
commit 9e7fd48e91
6 changed files with 47 additions and 25 deletions
@@ -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);
}
}
@@ -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);
}
}
/**
@@ -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";
}