diff --git a/app/src/main/java/com/example/alzapp/JumbleSender.java b/app/src/main/java/com/example/alzapp/JumbleSender.java new file mode 100644 index 0000000..78e9117 --- /dev/null +++ b/app/src/main/java/com/example/alzapp/JumbleSender.java @@ -0,0 +1,28 @@ +package com.example.alzapp; + +import com.android.volley.Response; +import com.android.volley.toolbox.StringRequest; + +import java.util.HashMap; +import java.util.Map; + +public class JumbleSender extends StringRequest { + + private static final String REQUEST_URL = "https://eclectic-sweeps.000webhostapp.com/jumble_sender.php"; + private Map params; + + JumbleSender(String username,long times , Response.Listener listener) { + super(Method.POST, REQUEST_URL, listener, null); + params = new HashMap<>(); + params.put("username", username); + params.put("jumble",times+""); + + } + + @Override + public Map getParams() { + return params; + } + + +} diff --git a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java index bc2ddcf..48dd90d 100644 --- a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java +++ b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java @@ -1,9 +1,18 @@ package com.example.alzapp; +import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; +import android.widget.TextView; + +import com.android.volley.RequestQueue; +import com.android.volley.Response; +import com.android.volley.toolbox.Volley; + +import org.json.JSONException; +import org.json.JSONObject; import androidx.appcompat.app.AppCompatActivity; @@ -22,6 +31,8 @@ public class QuickPlayMenu extends AppCompatActivity { private Button game3; private Button game4; private long jumble_elapsed_millis = 0; + private String username; + private TextView username_text; @@ -31,8 +42,12 @@ public class QuickPlayMenu extends AppCompatActivity { setContentView(R.layout.activity_quick_play_menu); - jumble = (Button) findViewById(R.id.jumble); - tilematch = (Button) findViewById(R.id.tilematch); + jumble = findViewById(R.id.jumble); + tilematch = findViewById(R.id.tilematch); + Intent intent = getIntent(); + username = intent.getStringExtra(login.EXTRA_TEXT); + username_text = findViewById(R.id.username); + username_text.setText("username : "+ username); jumble.setOnClickListener(new View.OnClickListener() { @Override @@ -62,6 +77,34 @@ 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); + } + diff --git a/app/src/main/java/com/example/alzapp/Registerequest.java b/app/src/main/java/com/example/alzapp/Registerequest.java index b5075a0..4914724 100644 --- a/app/src/main/java/com/example/alzapp/Registerequest.java +++ b/app/src/main/java/com/example/alzapp/Registerequest.java @@ -7,11 +7,11 @@ import java.util.HashMap; import java.util.Map; public class Registerequest extends StringRequest { - private static final String REGISTER_REQUEST_URL = "https://eclectic-sweeps.000webhostapp.com/registration_enc.php"; + private static final String REQUEST_URL = "https://eclectic-sweeps.000webhostapp.com/registration_enc.php"; private Map params; Registerequest(String firstname, String lastname, String username, String dob, String email, String password, String gender, int age, Response.Listener listener) { - super(Method.POST, REGISTER_REQUEST_URL, listener, null); + super(Method.POST, REQUEST_URL, listener, null); params = new HashMap<>(); params.put("username", username); params.put("password", password); diff --git a/app/src/main/java/com/example/alzapp/login.java b/app/src/main/java/com/example/alzapp/login.java index 79e1308..4167e06 100644 --- a/app/src/main/java/com/example/alzapp/login.java +++ b/app/src/main/java/com/example/alzapp/login.java @@ -1,17 +1,21 @@ package com.example.alzapp; -import androidx.appcompat.app.AppCompatActivity; -import android.widget.EditText; +import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; +import android.widget.EditText; import android.widget.TextView; -import org.json.*; -import java.lang.*; -import com.android.volley.*; -import com.android.volley.toolbox.*; -import android.app.AlertDialog; + +import com.android.volley.RequestQueue; +import com.android.volley.Response; +import com.android.volley.toolbox.Volley; + +import org.json.JSONException; +import org.json.JSONObject; + +import androidx.appcompat.app.AppCompatActivity; /******* Created on: 21/01/2020 @@ -21,6 +25,7 @@ import android.app.AlertDialog; ********/ public class login extends AppCompatActivity { + public static final String EXTRA_TEXT = "com.example.alzapp.EXTRA_TEXT"; private TextView signup; private Button signin; @Override @@ -73,11 +78,13 @@ public class login extends AppCompatActivity { boolean success = jsonResponse.getBoolean("success"); if (success) { - String username1 = jsonResponse.getString("username"); + String username = jsonResponse.getString("username"); - Intent intent = new Intent(login.this, UserAreaActivity.class); - intent.putExtra("name", username1); + Intent intent = new Intent(login.this, QuickPlayMenu.class); + intent.putExtra(EXTRA_TEXT, username); + startActivity(intent); + login.this.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 5053340..c3b49e4 100644 --- a/app/src/main/res/layout/activity_quick_play_menu.xml +++ b/app/src/main/res/layout/activity_quick_play_menu.xml @@ -24,16 +24,19 @@ app:layout_constraintTop_toTopOf="parent" /> - +