Merge branch 'tmp'

# Conflicts:
#	app/src/main/java/com/example/alzapp/QuizQuestionPage.java
#	app/src/main/java/com/example/alzapp/TileMatchingActivity.java
#	app/src/main/res/layout/activity_tile_matching.xml
This commit is contained in:
Priyatham 2020-03-29 14:29:27 +05:30
commit 680df4b109
4 changed files with 116 additions and 32 deletions

View File

@ -12,6 +12,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme.NoActionBar">
<activity android:name=".QuickQuizStart"></activity>
<activity android:name=".QuizQuestionPage" />
<activity android:name=".UserAreaActivity" />
<activity android:name=".QuickPlayMenu" />
<activity android:name=".TileMatchingActivity" />
@ -19,8 +20,6 @@
<activity android:name=".JumbleActivity" />
<activity android:name=".login" />
<activity android:name=".registration" />
<activity android:name=".QuizQuestionPage" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

View File

@ -32,7 +32,8 @@ public class QuickPlayMenu extends AppCompatActivity {
private Button game4;
private long jumble_elapsed_millis = 0;
private String username;
private TextView username_text;
private TextView game_times;
private long tile_elapsed_millis = 0;
@ -48,8 +49,8 @@ public class QuickPlayMenu extends AppCompatActivity {
Intent intent = getIntent();
username = intent.getStringExtra(login.EXTRA_TEXT);
//username_text = findViewById(R.id.username);
//username_text.setText("username : "+ username);
game_times = findViewById(R.id.game_times);
game_times.setText("username : "+ username);
jumble.setOnClickListener(new View.OnClickListener() {
@Override
@ -65,7 +66,8 @@ public class QuickPlayMenu extends AppCompatActivity {
@Override
public void onClick(View v) {
Intent intent = new Intent(QuickPlayMenu.this,TileMatchingActivity.class);
startActivity(intent);
intent.putExtra("tile_elapsed_millis", tile_elapsed_millis);
startActivityForResult(intent, 2);
}
});
@ -89,33 +91,9 @@ public class QuickPlayMenu extends AppCompatActivity {
}
});
if(jumble_elapsed_millis != 0) {
Response.Listener<String> responseListener = new Response.Listener<String>() {
@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);
}
@ -127,7 +105,78 @@ public class QuickPlayMenu extends AppCompatActivity {
if (requestCode == 1) {
if (resultCode == RESULT_OK) {
jumble_elapsed_millis = data.getLongExtra("jumble_elapsed_millis", 0);
game_times.setText("username : "+ username+ " " + jumble_elapsed_millis);
if(jumble_elapsed_millis != 0) {
Response.Listener<String> responseListener = new Response.Listener<String>() {
@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);
}
}
if (resultCode == RESULT_CANCELED) {
}
}
if (requestCode == 2) {
if (resultCode == RESULT_OK) {
tile_elapsed_millis = data.getLongExtra("tile_elapsed_millis", 0);
game_times.setText("username : "+ username+ " " + tile_elapsed_millis);
if(tile_elapsed_millis!= 0) {
Response.Listener<String> responseListener = new Response.Listener<String>() {
@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();
}
}
};
TileSender tile_sender = new TileSender(username, tile_elapsed_millis, responseListener);
RequestQueue queue = Volley.newRequestQueue(QuickPlayMenu.this);
queue.add(tile_sender);
}
}

View File

@ -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 TileSender extends StringRequest {
private static final String REQUEST_URL = "https://eclectic-sweeps.000webhostapp.com/tile_sender.php";
private Map<String, String> params;
TileSender(String username,long times , Response.Listener<String> listener) {
super(Method.POST, REQUEST_URL, listener, null);
params = new HashMap<>();
params.put("username", username);
params.put("tile",times+"");
}
@Override
public Map<String, String> getParams() {
return params;
}
}

View File

@ -89,6 +89,14 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/jumble"
tools:visibility="visible" />
<TextView
android:id="@+id/game_times"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="50dp" />
<TextView
android:id="@+id/username"