diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store index c5079b0..5247983 100644 Binary files a/app/src/main/.DS_Store and b/app/src/main/.DS_Store differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1b23741..4c11757 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,13 +5,21 @@ + android:theme="@style/AppTheme" + android:networkSecurityConfig="@xml/network_security_config" + > + + + + + @@ -19,9 +27,6 @@ - - - \ No newline at end of file diff --git a/app/src/main/java/com/stod/projectandroid/AnswersQuestions.java b/app/src/main/java/com/stod/projectandroid/AnswersQuestions.java index db39b85..634392f 100644 --- a/app/src/main/java/com/stod/projectandroid/AnswersQuestions.java +++ b/app/src/main/java/com/stod/projectandroid/AnswersQuestions.java @@ -1,11 +1,46 @@ package com.stod.projectandroid; -public class AnswersQuestions { +import android.os.Parcel; +import android.os.Parcelable; + +import com.google.gson.annotations.SerializedName; + +public class AnswersQuestions implements Parcelable { public String sentence; + + public boolean isRight; public AnswersQuestions(String sentence, boolean isRight) { this.sentence = sentence; this.isRight = isRight; } + + protected AnswersQuestions(Parcel in) { + sentence = in.readString(); + isRight = in.readByte() != 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(sentence); + dest.writeByte((byte) (isRight ? 1 : 0)); + } + + @Override + public int describeContents() { + return 0; + } + + public static final Creator CREATOR = new Creator() { + @Override + public AnswersQuestions createFromParcel(Parcel in) { + return new AnswersQuestions(in); + } + + @Override + public AnswersQuestions[] newArray(int size) { + return new AnswersQuestions[size]; + } + }; } diff --git a/app/src/main/java/com/stod/projectandroid/DialogFragment.java b/app/src/main/java/com/stod/projectandroid/DialogFragment.java index 1d54e2f..c5181ac 100644 --- a/app/src/main/java/com/stod/projectandroid/DialogFragment.java +++ b/app/src/main/java/com/stod/projectandroid/DialogFragment.java @@ -3,9 +3,60 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; +import android.content.Intent; import android.os.Bundle; +import android.util.Log; +import android.widget.RadioButton; + +import com.stod.projectandroid.api.AnswersData; +import com.stod.projectandroid.api.AnwsersDifficultyWrapper; +import com.stod.projectandroid.api.ExchangeApi; + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.List; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; +import androidx.annotation.DrawableRes; +import androidx.appcompat.app.AppCompatActivity; + +import android.content.DialogInterface; +import android.content.Intent; +import android.content.res.Resources; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.ImageView; +import android.widget.RadioButton; +import android.widget.RadioGroup; +import android.widget.TextView; + +import com.stod.projectandroid.api.AnswersData; +import com.stod.projectandroid.api.AnwsersDifficultyWrapper; +import com.stod.projectandroid.api.ExchangeApi; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; public class DialogFragment extends androidx.fragment.app.DialogFragment { + + public interface OnSelectListener { + void onDifficultySelected(String difficulty); + } + + public OnSelectListener listener; + @Override public Dialog onCreateDialog(Bundle savedInstanceState){ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); @@ -15,16 +66,28 @@ public Dialog onCreateDialog(Bundle savedInstanceState){ public void onClick(DialogInterface dialog, int which) { // The 'which' argument contains the index position // of the selected item - if (which == 0) { - - } else if (which == 1) { - - } else if (which == 2) { + String difficulty = ""; + switch (which) { + case 0: + difficulty = "easy"; + break; + case 1: + difficulty = "medium"; + break; + case 2: + difficulty = "hard"; + break; } + listener.onDifficultySelected(difficulty); + } }); //Create the alert and return it return builder.create(); } + + + + //END HTTP REQUEST } diff --git a/app/src/main/java/com/stod/projectandroid/HomeActivity.java b/app/src/main/java/com/stod/projectandroid/HomeActivity.java index f931ef2..ccc6397 100644 --- a/app/src/main/java/com/stod/projectandroid/HomeActivity.java +++ b/app/src/main/java/com/stod/projectandroid/HomeActivity.java @@ -2,15 +2,31 @@ import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; -public class HomeActivity extends AppCompatActivity { +import com.stod.projectandroid.api.AnswersData; +import com.stod.projectandroid.api.AnwsersDifficultyWrapper; +import com.stod.projectandroid.api.ExchangeApi; + +import java.util.ArrayList; +import java.util.List; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + +public class HomeActivity extends AppCompatActivity { + public static final String TAG = "HomeActivity"; + public String selec; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -26,25 +42,91 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onClick(View v) { DialogFragment newFragment = new DialogFragment(); + newFragment.listener = new DialogFragment.OnSelectListener() { + @Override + public void onDifficultySelected(String difficulty) { + Log.i(TAG, "onDifficultySelected: " + difficulty) ; + builFlashcard(difficulty); + } + }; newFragment.show(getSupportFragmentManager(), "difficulty"); Log.i("HomeActivity", "Click"); + selec = getIntent().getParcelableExtra("selection"); + + if(selec != null) { + Intent intent = new Intent(HomeActivity.this, QuestionFlascardActivity.class); + intent.putExtra("selection", selec+""); + startActivityForResult(intent, 1); + Log.i("HomeActivity", "navigation flashCard"); + } + } }); + apropos.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Log.i("HomeActivity", "Click"); - + Intent intent = new Intent(HomeActivity.this, About.class); + startActivity(intent); } }); + solutions.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { Log.i("HomeActivity", "Click"); + + Intent intent = new Intent(HomeActivity.this, ListQuestionsRecyclerView.class); + startActivity(intent); + + } + }); + } + + public ArrayList builFlashcard(String difficulty) { + ArrayList lstFlashcard = new ArrayList<>(); + + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://gryt.tech:8080/") + .addConverterFactory(GsonConverterFactory.create()) + .build(); + + ExchangeApi api = retrofit.create(ExchangeApi.class); + + Call> call = api.getQuestions(difficulty); + + // Exécution de la requête en asynchrone + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + for (AnwsersDifficultyWrapper a : response.body()) { + String resPokemon = a.asset.substring(0, a.asset.lastIndexOf(".")); + String resType = a.asset_type; + String resAnimated = a.detail_image; + String difficulty = a.difficulty; + AnswersData[] answers = a.answers; + ArrayList answersPurposeList = new ArrayList(); + + for (AnswersData i : a.answers) { + answersPurposeList.add(new AnswersQuestions(i.sentence, i.isRight)); + } + lstFlashcard.add(new Questions(resPokemon, resType, resAnimated, difficulty, answersPurposeList)); + } + Intent intent = new Intent(HomeActivity.this, QuestionFlascardActivity.class); + intent.putExtra("difficulty", difficulty); + intent.putExtra("numberQuestions", lstFlashcard.size()); + intent.putParcelableArrayListExtra("listFlashCard", lstFlashcard); + startActivity(intent); + } + + @Override + public void onFailure(Call> call, Throwable t) { + Log.e("CurrencyListActivity", "onFailure: ", t); } }); + return lstFlashcard; } } diff --git a/app/src/main/java/com/stod/projectandroid/ListQuestionsRecyclerView.java b/app/src/main/java/com/stod/projectandroid/ListQuestionsRecyclerView.java index a8d97f1..ffa57a1 100644 --- a/app/src/main/java/com/stod/projectandroid/ListQuestionsRecyclerView.java +++ b/app/src/main/java/com/stod/projectandroid/ListQuestionsRecyclerView.java @@ -12,7 +12,8 @@ import com.stod.projectandroid.api.ExchangeApi; import com.stod.projectandroid.api.AnswersData; import com.stod.projectandroid.api.AnswersWrapper; -import com.stod.projectandroid.api.AnwsersDifficultyWrapper; + + import java.util.ArrayList; import java.util.List; @@ -63,21 +64,20 @@ protected void onCreate(Bundle savedInstanceState) { String difficulty = ""; // Création de la requête - Call> call = api.getQuestions(difficulty); - + Call> call = api.getAllQuestions(); // Exécution de la requête en asynchrone - call.enqueue(new Callback>() { + call.enqueue(new Callback>() { @Override - public void onResponse(Call> call, Response> response) { - for (AnwsersDifficultyWrapper a: response.body()) { + public void onResponse(Call> call, Response> response) { + for (AnswersWrapper a : response.body()) { String resPokemon = a.asset; String resType = a.asset_type; String resAnimated = a.detail_image; String difficulty = a.difficulty; AnswersData[] answers = a.answers; - List answersPurposeList = new ArrayList(); + ArrayList answersPurposeList = new ArrayList(); int resourceId = Resources.getSystem().getIdentifier(resPokemon, "drawable", "com.stod.projectandroid"); @@ -86,15 +86,13 @@ public void onResponse(Call> call, Response> call, Throwable t) { + public void onFailure(Call> call, Throwable t) { Log.e("CurrencyListActivity", "onFailure: ", t); } }); diff --git a/app/src/main/java/com/stod/projectandroid/Pokemon.java b/app/src/main/java/com/stod/projectandroid/Pokemon.java deleted file mode 100644 index 6bb3dd6..0000000 --- a/app/src/main/java/com/stod/projectandroid/Pokemon.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.stod.projectandroid; - -import androidx.annotation.DrawableRes; - -import java.lang.reflect.Array; - -public class Pokemon { - - @DrawableRes public int imageId; - public String nom; - public int pokemonId; - public String difficulty; - public Array responses; - - - -} diff --git a/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java b/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java index f7999a1..8838e50 100644 --- a/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java +++ b/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java @@ -6,6 +6,7 @@ import android.content.DialogInterface; import android.content.Intent; +import android.content.res.Resources; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -15,16 +16,31 @@ import android.widget.RadioGroup; import android.widget.TextView; -public class QuestionFlascardActivity extends AppCompatActivity { - private Pokemon pokemon; - private String goodAnswer; - private String difficulty; +import com.stod.projectandroid.api.AnswersData; +import com.stod.projectandroid.api.AnwsersDifficultyWrapper; +import com.stod.projectandroid.api.ExchangeApi; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + +public class QuestionFlascardActivity extends AppCompatActivity implements View.OnClickListener { + + private static final String TAG = "QuestionFlascardActivi"; + //private QuestionsAdapter adapter; + private List questions = new ArrayList<>(); + private int compteur; private int numQuestion; - - private String nom; - @DrawableRes - public int imageId; + private String namePokPurpose; + private AnswersQuestions goodAnswer; + private int nbOfGoodAnswers; @Override @@ -32,62 +48,110 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_question_flascard); - //pokemon = getIntent().getParcelableExtra("pokemon"); + ArrayList listFlashCard = getIntent().getParcelableArrayListExtra("listFlashCard"); Intent intent = getIntent(); - compteur = intent.getIntExtra("numQuestion",1); + compteur = intent.getIntExtra("numQuestion", 1); + nbOfGoodAnswers = intent.getIntExtra("nbOfGoodAnswers", 0); numQuestion = compteur; + int numberQuestions = intent.getIntExtra("numberQuestions", 0); final TextView noQuestion = findViewById(R.id.noQuestionText); - noQuestion.setText("Question "+numQuestion); - compteur+=1; - nom="bulbizare"; - imageId=R.drawable.pikachu; - final ImageView pokemonImage = findViewById(R.id.pokemonImageView); - pokemonImage.setImageResource(imageId); - goodAnswer = nom; + final ImageView pokemonImage = findViewById(R.id.pokemonImageView); final Button validate = findViewById(R.id.validateButton); final RadioGroup radioGroup = findViewById(R.id.answerRadioGroup); - + + Questions quest = listFlashCard.get(compteur); + + + int resourceId = getResources().getIdentifier(quest.getResPokemon(), "drawable", "com.stod.projectandroid"); + + + pokemonImage.setImageResource(resourceId); + List responses = quest.getAnswers(); + + + for (AnswersQuestions answQuest : responses) { + RadioButton rb = new RadioButton(QuestionFlascardActivity.this); + rb.setText(answQuest.sentence); + namePokPurpose = rb.getText().toString(); + rb.setTag(answQuest); + + radioGroup.addView(rb); + + if (answQuest.isRight) { + goodAnswer = answQuest; + Log.i(TAG, goodAnswer + ""); + } + + } + noQuestion.setText("Question " + numQuestion + " sur " + numberQuestions); + + validate.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { int idButtonChecked = radioGroup.getCheckedRadioButtonId(); RadioButton selectedButton = findViewById(idButtonChecked); - String value = selectedButton.getText().toString(); + AnswersQuestions value = (AnswersQuestions) selectedButton.getTag(); Log.i(QuestionFlascardActivity.ACCESSIBILITY_SERVICE, value + ""); - if(value.contains("RadioButton3")){ + if (value.isRight) { new AlertDialog.Builder(QuestionFlascardActivity.this) .setTitle("Bonne réponse") - .setMessage("La bonne réponse était "+ nom) + .setMessage("La bonne réponse est " + goodAnswer.sentence) .setCancelable(true) .setPositiveButton("ok", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - Intent intent2 = new Intent(QuestionFlascardActivity.this, QuestionFlascardActivity.class); - intent2.putExtra("numQuestion", compteur); - startActivity(intent2); - finish(); - + Log.i(TAG, "compteur : " + compteur + " et numberQuestions : " + numberQuestions); + if (compteur - 1 < numberQuestions) { + compteur += 1; + Intent intent2 = new Intent(QuestionFlascardActivity.this, QuestionFlascardActivity.class); + intent2.putExtra("numQuestion", compteur); + intent2.putExtra("numberQuestions", listFlashCard.size()); + intent2.putParcelableArrayListExtra("listFlashCard", listFlashCard); + startActivity(intent2); + finish(); + } else if (compteur - 1 == numberQuestions) { + Intent intent2 = new Intent(QuestionFlascardActivity.this, activity_results.class); + intent2.putExtra("numQuestion", compteur); + intent2.putExtra("numberQuestions", listFlashCard.size()); + intent2.putExtra("nbOfGoodAnswers", nbOfGoodAnswers); + intent2.putParcelableArrayListExtra("listFlashCard", listFlashCard); + startActivity(intent2); + finish(); + } } }).show(); Log.i(QuestionFlascardActivity.ACCESSIBILITY_SERVICE, "Bonne reponse"); - } - else{ + } else { new AlertDialog.Builder(QuestionFlascardActivity.this) .setTitle("Mauvaise réponse") - .setMessage("La bonne réponse était "+ nom) + .setMessage("La bonne réponse était " + goodAnswer.sentence) .setCancelable(true) .setPositiveButton("ok", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - Intent intent2 = new Intent(QuestionFlascardActivity.this, QuestionFlascardActivity.class); - intent2.putExtra("numQuestion", compteur); - startActivity(intent2); - finish(); + Log.i(TAG, "compteur : " + compteur + " et numberQuestions : " + numberQuestions); + if (compteur < numberQuestions) { + compteur += 1; + Intent intent2 = new Intent(QuestionFlascardActivity.this, QuestionFlascardActivity.class); + intent2.putExtra("numQuestion", compteur); + intent2.putExtra("numberQuestions", listFlashCard.size()); + intent2.putParcelableArrayListExtra("listFlashCard", listFlashCard); + startActivity(intent2); + finish(); + } else if (compteur - 1 == numberQuestions) { + Intent intent2 = new Intent(QuestionFlascardActivity.this, activity_results.class); + intent2.putExtra("numQuestion", compteur); + intent2.putExtra("numberQuestions", listFlashCard.size()); + intent2.putParcelableArrayListExtra("listFlashCard", listFlashCard); + startActivity(intent2); + finish(); + } } }).show(); Log.i(QuestionFlascardActivity.ACCESSIBILITY_SERVICE, "Bonne reponse"); @@ -97,4 +161,11 @@ public void onClick(DialogInterface dialog, int which) { }); } + + + @Override + public void onClick(View v) { + Log.d(TAG, " Name " + ((RadioButton) v).getText() + " Id is " + v.getId()); + + } } diff --git a/app/src/main/java/com/stod/projectandroid/Questions.java b/app/src/main/java/com/stod/projectandroid/Questions.java index 65305ed..19993cb 100644 --- a/app/src/main/java/com/stod/projectandroid/Questions.java +++ b/app/src/main/java/com/stod/projectandroid/Questions.java @@ -14,15 +14,14 @@ public class Questions implements Parcelable { - - private final int resPokemon; + private final String resPokemon; private final String resType; private final String resAnimated; private final String difficulty; - private List answers; + private ArrayList answers; - public Questions(int resPokemon, String resType, String resAnimated, String difficulty, List answers) { + public Questions(String resPokemon, String resType, String resAnimated, String difficulty, ArrayList answers) { this.resPokemon = resPokemon; this.resType = resType; this.resAnimated = resAnimated; @@ -30,19 +29,22 @@ public Questions(int resPokemon, String resType, String resAnimated, String diff this.answers = answers; } + protected Questions(Parcel in) { - resPokemon = in.readInt(); + resPokemon = in.readString(); resType = in.readString(); resAnimated = in.readString(); difficulty = in.readString(); + answers = in.createTypedArrayList(AnswersQuestions.CREATOR); } @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(resPokemon); + dest.writeString(resPokemon); dest.writeString(resType); dest.writeString(resAnimated); dest.writeString(difficulty); + dest.writeTypedList(answers); } @Override @@ -62,7 +64,7 @@ public Questions[] newArray(int size) { } }; - public int getResPokemon() { + public String getResPokemon() { return resPokemon; } @@ -78,7 +80,7 @@ public String getDifficulty() { return difficulty; } - public List getAnswers() { + public ArrayList getAnswers() { return answers; } } diff --git a/app/src/main/java/com/stod/projectandroid/QuestionsAdapter.java b/app/src/main/java/com/stod/projectandroid/QuestionsAdapter.java index 380ea24..f6c831d 100644 --- a/app/src/main/java/com/stod/projectandroid/QuestionsAdapter.java +++ b/app/src/main/java/com/stod/projectandroid/QuestionsAdapter.java @@ -1,6 +1,7 @@ package com.stod.projectandroid; import androidx.recyclerview.widget.RecyclerView; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -11,8 +12,7 @@ import java.util.List; -public class QuestionsAdapter extends RecyclerView.Adapter { - +public class QuestionsAdapter extends RecyclerView.Adapter { private final List questions; @@ -22,15 +22,14 @@ public QuestionsAdapter(List questions) { } - static class ViewHolder extends RecyclerView.ViewHolder { final TextView questionTextView; - final ImageView flag; + final ImageView pofpokemon; public ViewHolder(@NonNull View itemView) { super(itemView); - flag = itemView.findViewById(R.id.imageView); + pofpokemon = itemView.findViewById(R.id.imageView); questionTextView = itemView.findViewById(R.id.questionTextView); } } @@ -56,10 +55,11 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public void onBindViewHolder(@NonNull ViewHolder holder, int position) { // on récupère la donnée associée à cet index Questions question = questions.get(position); + String questionPurpose = "Quel est ce pokémon ?"; // on met à jour l'UI en passant par le ViewHolder - //holder.flag.setImageResource(question.i); - //holder.questionTextView.setText(question.questionTextView + ""); + holder.pofpokemon.setImageResource(R.drawable.p_of_pokemon); + holder.questionTextView.setText(questionPurpose); } @Override diff --git a/app/src/main/java/com/stod/projectandroid/api/AnswersData.java b/app/src/main/java/com/stod/projectandroid/api/AnswersData.java index e296007..79ca717 100644 --- a/app/src/main/java/com/stod/projectandroid/api/AnswersData.java +++ b/app/src/main/java/com/stod/projectandroid/api/AnswersData.java @@ -1,6 +1,9 @@ package com.stod.projectandroid.api; +import com.google.gson.annotations.SerializedName; + public class AnswersData { public String sentence; + @SerializedName("is_right") public boolean isRight; } diff --git a/app/src/main/java/com/stod/projectandroid/api/AnswersWrapper.java b/app/src/main/java/com/stod/projectandroid/api/AnswersWrapper.java index a21b30b..e85e089 100644 --- a/app/src/main/java/com/stod/projectandroid/api/AnswersWrapper.java +++ b/app/src/main/java/com/stod/projectandroid/api/AnswersWrapper.java @@ -7,6 +7,6 @@ public class AnswersWrapper { public String asset_type; public String detail_image; public String difficulty; - public List answers; + public AnswersData[] answers; } diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..2408e30 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/p_of_pokemon.png b/app/src/main/res/drawable/p_of_pokemon.png new file mode 100644 index 0000000..1bdb881 Binary files /dev/null and b/app/src/main/res/drawable/p_of_pokemon.png differ diff --git a/app/src/main/res/drawable/pokeball.png b/app/src/main/res/drawable/pokeball.png new file mode 100644 index 0000000..fdc161c Binary files /dev/null and b/app/src/main/res/drawable/pokeball.png differ diff --git a/app/src/main/res/layout/activity_list_questions_recycler_view.xml b/app/src/main/res/layout/activity_list_questions_recycler_view.xml index 7242676..bda3a67 100644 --- a/app/src/main/res/layout/activity_list_questions_recycler_view.xml +++ b/app/src/main/res/layout/activity_list_questions_recycler_view.xml @@ -5,12 +5,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".ListQuestionsRecyclerView"> + + app:layout_constraintTop_toTopOf="parent" + tools:listitem="@layout/item_question" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_question_flascard.xml b/app/src/main/res/layout/activity_question_flascard.xml index eeabde2..a2df905 100644 --- a/app/src/main/res/layout/activity_question_flascard.xml +++ b/app/src/main/res/layout/activity_question_flascard.xml @@ -51,7 +51,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/questionText"> - - - + android:text="RadioButton3" />--> @@ -92,4 +86,6 @@ app:layout_constraintStart_toStartOf="parent" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_question.xml b/app/src/main/res/layout/item_question.xml index abbcd67..3fabfa3 100644 --- a/app/src/main/res/layout/item_question.xml +++ b/app/src/main/res/layout/item_question.xml @@ -12,7 +12,7 @@ android:layout_height="108dp" android:layout_marginStart="80dp" android:layout_marginLeft="80dp" - android:text="TextView" + android:text="Qui est ce Pokemon ?" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml new file mode 100644 index 0000000..1fcd150 --- /dev/null +++ b/app/src/main/res/xml/network_security_config.xml @@ -0,0 +1,6 @@ + + + + gryt.tech + +