diff --git a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java index a985726..b5bd3c9 100644 --- a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java +++ b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java @@ -28,7 +28,7 @@ public class QuickPlayMenu extends AppCompatActivity { private Button jumble; private Button tilematch; - private Button game3; + private Button quiz; private Button game4; private long jumble_elapsed_millis = 0; private String username; @@ -44,10 +44,12 @@ public class QuickPlayMenu extends AppCompatActivity { jumble = findViewById(R.id.jumble); tilematch = findViewById(R.id.tilematch); + quiz = (Button) findViewById(R.id.quiz); + Intent intent = getIntent(); username = intent.getStringExtra(login.EXTRA_TEXT); - username_text = findViewById(R.id.username); - username_text.setText("username : "+ username + " " + jumble_elapsed_millis); + //username_text = findViewById(R.id.username); + //username_text.setText("username : "+ username); jumble.setOnClickListener(new View.OnClickListener() { @Override @@ -68,6 +70,16 @@ public class QuickPlayMenu extends AppCompatActivity { } }); + + quiz.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(QuickPlayMenu.this,QuizStartingPage.class); + startActivity(intent); + + } + }); + Button back = (Button) findViewById(R.id.back); back.setOnClickListener(new View.OnClickListener() { @@ -77,7 +89,33 @@ public class QuickPlayMenu extends AppCompatActivity { } }); + if(jumble_elapsed_millis != 0) { + Response.Listener responseListener = new Response.Listener() { + @Override + public void onResponse(String response) { + try { + JSONObject jsonResponse = new JSONObject(response); + boolean success = jsonResponse.getBoolean("success"); + if (success) { + Intent intent = new Intent(QuickPlayMenu.this, UserAreaActivity.class); + startActivity(intent); + } else { + AlertDialog.Builder builder = new AlertDialog.Builder(QuickPlayMenu.this); + builder.setMessage("Register Failed") + .setNegativeButton("Retry", null) + .create() + .show(); + } + } catch (JSONException e) { + e.printStackTrace(); + } + } + }; + JumbleSender jumble_sender = new JumbleSender(username, jumble_elapsed_millis, responseListener); + RequestQueue queue = Volley.newRequestQueue(QuickPlayMenu.this); + queue.add(jumble_sender); + } @@ -89,35 +127,7 @@ public class QuickPlayMenu extends AppCompatActivity { if (requestCode == 1) { if (resultCode == RESULT_OK) { jumble_elapsed_millis = data.getLongExtra("jumble_elapsed_millis", 0); - username_text.setText("username : "+ username + " " + jumble_elapsed_millis); - if(jumble_elapsed_millis != 0) { - - Response.Listener responseListener = new Response.Listener() { - @Override - public void onResponse(String response) { - try { - JSONObject jsonResponse = new JSONObject(response); - boolean success = jsonResponse.getBoolean("success"); - if (success) { - Intent intent = new Intent(QuickPlayMenu.this, UserAreaActivity.class); - startActivity(intent); - } else { - AlertDialog.Builder builder = new AlertDialog.Builder(QuickPlayMenu.this); - builder.setMessage("game time save Failed") - .setNegativeButton("Retry", null) - .create() - .show(); - } - } catch (JSONException e) { - e.printStackTrace(); - } - } - }; - JumbleSender jumble_sender = new JumbleSender(username, jumble_elapsed_millis, responseListener); - RequestQueue queue = Volley.newRequestQueue(QuickPlayMenu.this); - queue.add(jumble_sender); - } } diff --git a/app/src/main/java/com/example/alzapp/QuizQuestionPage.java b/app/src/main/java/com/example/alzapp/QuizQuestionPage.java new file mode 100644 index 0000000..3c2ef16 --- /dev/null +++ b/app/src/main/java/com/example/alzapp/QuizQuestionPage.java @@ -0,0 +1,15 @@ +package com.example.alzapp; + +import android.os.Bundle; + +import androidx.appcompat.app.AppCompatActivity; + +public class QuizQuestionPage extends AppCompatActivity { + + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_quiz_question_page); + + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/alzapp/QuizStartingPage.java b/app/src/main/java/com/example/alzapp/QuizStartingPage.java new file mode 100644 index 0000000..322f4a1 --- /dev/null +++ b/app/src/main/java/com/example/alzapp/QuizStartingPage.java @@ -0,0 +1,32 @@ +package com.example.alzapp; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import androidx.appcompat.app.AppCompatActivity; + +public class QuizStartingPage extends AppCompatActivity { + + + private Button quizStart; + + @Override + + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_quiz_question_page); + + quizStart = (Button) findViewById(R.id.start_quiz); + quizStart.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(QuizStartingPage.this, QuizQuestionPage.class); + startActivity(intent); + } + }); + } + + +} diff --git a/app/src/main/res/layout/activity_quick_play_menu.xml b/app/src/main/res/layout/activity_quick_play_menu.xml index c3b49e4..8a9c4af 100644 --- a/app/src/main/res/layout/activity_quick_play_menu.xml +++ b/app/src/main/res/layout/activity_quick_play_menu.xml @@ -58,19 +58,6 @@ app:layout_constraintTop_toBottomOf="@+id/tilematch" tools:visibility="visible" /> - -