From 46dd96581c55b38dce02a79f88702c65e1623a17 Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 20 Feb 2020 22:14:13 +0100 Subject: [PATCH] Navigate to flashcard with difficulty --- app/src/main/AndroidManifest.xml | 1 + .../stod/projectandroid/DialogFragment.java | 54 ++++++++++++++++++- .../com/stod/projectandroid/HomeActivity.java | 18 +++++-- .../QuestionFlascardActivity.java | 3 ++ .../activity_list_questions_recycler_view.xml | 19 +++++-- 5 files changed, 87 insertions(+), 8 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1b23741..f13d52d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ + diff --git a/app/src/main/java/com/stod/projectandroid/DialogFragment.java b/app/src/main/java/com/stod/projectandroid/DialogFragment.java index 1d54e2f..c1699dc 100644 --- a/app/src/main/java/com/stod/projectandroid/DialogFragment.java +++ b/app/src/main/java/com/stod/projectandroid/DialogFragment.java @@ -3,9 +3,16 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; +import android.content.Intent; import android.os.Bundle; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Log; + +public class DialogFragment extends androidx.fragment.app.DialogFragment implements Parcelable { + + private String selection = ""; -public class DialogFragment extends androidx.fragment.app.DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState){ AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); @@ -16,15 +23,60 @@ public void onClick(DialogInterface dialog, int which) { // The 'which' argument contains the index position // of the selected item if (which == 0) { + setSelection("easy"); } else if (which == 1) { + setSelection("medium"); + } else if (which == 2) { + setSelection("hard"); } + + Log.i(HomeActivity.ACCESSIBILITY_SERVICE, selection+""); + Intent intent = new Intent(); + intent.putExtra("selection", selection); + + } }); //Create the alert and return it return builder.create(); } + + public DialogFragment(String selection) { + this.selection = selection; + } + public String getSelection() { + return selection; + } + + public void setSelection(String selection) { + this.selection = selection; + } + + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(selection); + } + + @Override + public int describeContents() { + return 0; + } + + public static final Creator CREATOR = new Creator() { + @Override + public DialogFragment createFromParcel(Parcel in) { + return new DialogFragment(in.readString()); + } + + @Override + public DialogFragment[] newArray(int size) { + return new DialogFragment[size]; + } + }; + } diff --git a/app/src/main/java/com/stod/projectandroid/HomeActivity.java b/app/src/main/java/com/stod/projectandroid/HomeActivity.java index f931ef2..7a1a3ef 100644 --- a/app/src/main/java/com/stod/projectandroid/HomeActivity.java +++ b/app/src/main/java/com/stod/projectandroid/HomeActivity.java @@ -2,6 +2,7 @@ import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -10,6 +11,7 @@ import android.widget.TextView; public class HomeActivity extends AppCompatActivity { + public String selec; @Override protected void onCreate(Bundle savedInstanceState) { @@ -21,19 +23,28 @@ protected void onCreate(Bundle savedInstanceState) { final Button solutions = findViewById(R.id.solutions); final ImageView pokeball = findViewById(R.id.pokeball); final TextView title = findViewById(R.id.title); - demarrer.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - DialogFragment newFragment = new DialogFragment(); + + DialogFragment newFragment = new DialogFragment(""); 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"); + } + Log.i(HomeActivity.ACCESSIBILITY_SERVICE, selec+" test"); } }); apropos.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + Log.i("HomeActivity", "Click"); } @@ -45,6 +56,7 @@ public void onClick(View v) { Log.i("HomeActivity", "Click"); } }); + } } diff --git a/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java b/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java index 91a027e..3ef6ffa 100644 --- a/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java +++ b/app/src/main/java/com/stod/projectandroid/QuestionFlascardActivity.java @@ -34,7 +34,10 @@ protected void onCreate(Bundle savedInstanceState) { //pokemon = getIntent().getParcelableExtra("pokemon"); Intent intent = getIntent(); + difficulty = intent.getStringExtra("selection"); compteur = intent.getIntExtra("numQuestion",1); + Log.i(QuestionFlascardActivity.ACCESSIBILITY_SERVICE, difficulty); + numQuestion = compteur; final TextView noQuestion = findViewById(R.id.noQuestionText); noQuestion.setText("Question "+numQuestion); 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 3509b84..370ccee 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 @@ -1,6 +1,17 @@ - + - \ No newline at end of file + + \ No newline at end of file