diff --git a/app/src/main/java/com/iutlaval/myapplication/CardListActivity.java b/app/src/main/java/com/iutlaval/myapplication/CardListActivity.java
index 6c05a46..a626458 100644
--- a/app/src/main/java/com/iutlaval/myapplication/CardListActivity.java
+++ b/app/src/main/java/com/iutlaval/myapplication/CardListActivity.java
@@ -1,51 +1,60 @@
package com.iutlaval.myapplication;
+import android.app.SearchableInfo;
import android.content.Context;
+import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
-import android.text.method.LinkMovementMethod;
import android.text.util.Linkify;
import android.util.DisplayMetrics;
-import android.util.Log;
+import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
+import android.widget.Button;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import android.widget.ScrollView;
+import android.widget.SearchView;
import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
-import androidx.constraintlayout.widget.ConstraintLayout;
import com.iutlaval.myapplication.Game.Cards.Card;
import com.iutlaval.myapplication.Game.Cards.CardRegistery;
-import com.iutlaval.myapplication.Game.Cards.Mythes.Mythes_Perséphone;
import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
public class CardListActivity extends AppCompatActivity {
- TextView test;
- LinearLayout linearLayout;
- int inf;
- int sup;
- ImageView cardPicture;
+ private TextView deck;
+ private LinearLayout linearLayout;
+ private int inf;
+ private int sup;
+ private ImageView cardPicture;
+ private Button buttonHome;
private TextView cardName;
- private int screenHeight;
- private int screenWidth;
private TextView cardStats;
private TextView cardLink;
+
+ private int screenHeight;
+ private int screenWidth;
+
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_card_list);
- test = findViewById(R.id.textViewDeck);
+ deck = findViewById(R.id.textViewDeck);
linearLayout = findViewById(R.id.linearLayout);
-
+ buttonHome = findViewById(R.id.buttonHome);
+ buttonHome.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ returnHome();
+ }
+ });
//récupération de la taille de l'écran
WindowManager wm = (WindowManager) getSystemService(WINDOW_SERVICE);
@@ -59,7 +68,7 @@ public class CardListActivity extends AppCompatActivity {
String[] mTestArray = getResources().getStringArray(R.array.decks);
- test.setText(mTestArray[deckIndex]);
+ deck.setText("Vous êtes sur le deck : "+mTestArray[deckIndex]);
switch (deckIndex) {
case 0 :
@@ -79,8 +88,6 @@ public class CardListActivity extends AppCompatActivity {
}
public void showDeckCards(int inf, int sup) {
-
-
for(int i = inf; i < sup; i++) {
try {
Class c = CardRegistery.get(i);
@@ -88,7 +95,7 @@ public class CardListActivity extends AppCompatActivity {
Card card = (Card) con.newInstance(null, null);
cardPicture = new ImageView(this);
cardPicture.setBackgroundResource(card.getCardPicture());
- cardPicture.setLayoutParams(new ViewGroup.LayoutParams((int) (screenWidth / 1.2), (int) (screenHeight / 1.4)));
+ cardPicture.setLayoutParams(new ViewGroup.LayoutParams((int) (screenWidth / 1.2), (int) (screenHeight / 1.7)));
linearLayout.addView(cardPicture);
cardName = new TextView(this);
@@ -96,18 +103,24 @@ public class CardListActivity extends AppCompatActivity {
linearLayout.addView(cardName);
cardStats = new TextView(this);
- cardStats.setText("Attaque : "+card.getAttack()+" Vie : "+card.getHealth()+"\n");
+ cardStats.setText("Attaque : "+card.getAttack()+" Vie : "+card.getHealth()+"\n");
linearLayout.addView(cardStats);
+
cardLink = new TextView(this);
cardLink.setText("Lien : "+card.getWikipediaLink()+"\n\n\n");
Linkify.addLinks(cardLink, Linkify.ALL);
linearLayout.addView(cardLink);
-
- } catch (Exception e) {
+ }
+ catch (Exception e) {
e.printStackTrace();
}
}
}
+ public void returnHome() {
+ Intent mainActivity = new Intent(this, MainActivity.class);
+ startActivity(mainActivity);
+ }
+
}
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java
index 58d6a27..b4861b5 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Achille.java
@@ -63,7 +63,7 @@ public class Mythes_Achille extends Card {
*/
@Override
public String getName() {
- return null;
+ return "Achille, Roi des Myrmidons";
}
/**
diff --git a/app/src/main/res/layout/activity_card_list.xml b/app/src/main/res/layout/activity_card_list.xml
index 0fb3cc6..91d1fff 100644
--- a/app/src/main/res/layout/activity_card_list.xml
+++ b/app/src/main/res/layout/activity_card_list.xml
@@ -5,10 +5,32 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
+
+
+
+
+
+
+ android:orientation="vertical">
+
+
-
\ No newline at end of file