From a36bfccb241ad87436afdf7fbe6810e5422d33ed Mon Sep 17 00:00:00 2001 From: Priyatham Date: Wed, 25 Mar 2020 23:42:51 +0530 Subject: [PATCH 1/2] passing tile time to DB --- app/src/main/AndroidManifest.xml | 3 +- .../com/example/alzapp/QuickPlayMenu.java | 109 +++++++++++++----- .../com/example/alzapp/QuizQuestionPage.java | 8 +- .../example/alzapp/TileMatchingActivity.java | 73 +++++++++++- .../java/com/example/alzapp/TileSender.java | 28 +++++ .../res/layout/activity_quick_play_menu.xml | 8 ++ .../res/layout/activity_tile_matching.xml | 11 ++ 7 files changed, 199 insertions(+), 41 deletions(-) create mode 100644 app/src/main/java/com/example/alzapp/TileSender.java diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7cd613d..4b48a3c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:supportsRtl="true" android:theme="@style/AppTheme.NoActionBar"> + @@ -19,8 +20,6 @@ - - diff --git a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java index 77b6650..82b1e44 100644 --- a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java +++ b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java @@ -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 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); - } + + @@ -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 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); + + } + + + } + 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 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(); + } + } + }; + + TileSender tile_sender = new TileSender(username, tile_elapsed_millis, responseListener); + RequestQueue queue = Volley.newRequestQueue(QuickPlayMenu.this); + queue.add(tile_sender); + + } } diff --git a/app/src/main/java/com/example/alzapp/QuizQuestionPage.java b/app/src/main/java/com/example/alzapp/QuizQuestionPage.java index 8c02020..7e91b7f 100644 --- a/app/src/main/java/com/example/alzapp/QuizQuestionPage.java +++ b/app/src/main/java/com/example/alzapp/QuizQuestionPage.java @@ -7,11 +7,11 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; -import androidx.appcompat.app.AppCompatActivity; - import java.util.Collections; import java.util.List; +import androidx.appcompat.app.AppCompatActivity; + public class QuizQuestionPage extends AppCompatActivity { private TextView textViewQuestion; @@ -55,7 +55,9 @@ public class QuizQuestionPage extends AppCompatActivity { questionCountTotal = questionList.size(); Collections.shuffle(questionList); - showNextQuestion(); + //showNextQuestion(); + + } diff --git a/app/src/main/java/com/example/alzapp/TileMatchingActivity.java b/app/src/main/java/com/example/alzapp/TileMatchingActivity.java index 7175ae2..4b32905 100644 --- a/app/src/main/java/com/example/alzapp/TileMatchingActivity.java +++ b/app/src/main/java/com/example/alzapp/TileMatchingActivity.java @@ -1,21 +1,22 @@ package com.example.alzapp; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; - import android.content.DialogInterface; +import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.os.SystemClock; import android.view.View; import android.widget.Button; +import android.widget.Chronometer; import android.widget.ImageView; import android.widget.TextView; -import com.example.alzapp.R; - import java.util.Arrays; import java.util.Collections; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; + /******* Created on: 21/01/2020 @@ -31,6 +32,12 @@ public class TileMatchingActivity extends AppCompatActivity { ImageView i21,i22,i23,i24; ImageView i31,i32,i33,i34; ImageView i41,i42,i43,i44; + private Chronometer chronometer; + private long pauseOffset; + private boolean running; + private Button pauser; + private Button resumer; + private long elapsedMillis; Integer[] cardsArray={101,102,103,104,105,106,107,108,201,202,203,204,205,206,207,208}; @@ -46,6 +53,7 @@ public class TileMatchingActivity extends AppCompatActivity { setContentView(R.layout.activity_tile_matching); counter=(TextView) findViewById(R.id.counter1); + i11=(ImageView) findViewById(R.id.i11); i12=(ImageView) findViewById(R.id.i12); i13=(ImageView) findViewById(R.id.i13); @@ -88,6 +96,13 @@ public class TileMatchingActivity extends AppCompatActivity { frontCards(); + chronometer = findViewById(R.id.tile_time); + chronometer.setFormat("Time: %s"); + chronometer.setBase(SystemClock.elapsedRealtime()); + startChronometer(); + + + Collections.shuffle(Arrays.asList(cardsArray)); i11.setOnClickListener(new View.OnClickListener() { @@ -233,6 +248,26 @@ public class TileMatchingActivity extends AppCompatActivity { } }); + chronometer.setOnChronometerTickListener(new Chronometer.OnChronometerTickListener() { + @Override + public void onChronometerTick(Chronometer chronometer) { + if (checkEnd()) { + elapsedMillis = SystemClock.elapsedRealtime() - chronometer.getBase(); + //long minutes = TimeUnit.MILLISECONDS.toMinutes(elapsedMillis); + //long seconds = TimeUnit.MILLISECONDS.toSeconds(elapsedMillis); + + + Intent resultIntent = new Intent(); + resultIntent.putExtra("tile_elapsed_millis", elapsedMillis); + setResult(RESULT_OK, resultIntent); + finish(); + + + + } + } + }); + } @@ -476,7 +511,7 @@ public class TileMatchingActivity extends AppCompatActivity { checkEnd(); } - private void checkEnd(){ + private boolean checkEnd(){ if(i11.getVisibility()==View.INVISIBLE && i12.getVisibility()==View.INVISIBLE && i13.getVisibility()==View.INVISIBLE && @@ -503,6 +538,11 @@ public class TileMatchingActivity extends AppCompatActivity { finish(); } }); + return true; + + } + else{ + return false; } } @@ -525,4 +565,25 @@ public class TileMatchingActivity extends AppCompatActivity { img207=R.drawable.chicken; img208=R.drawable.cow; } + + public void startChronometer() { + if (!running) { + chronometer.setBase(SystemClock.elapsedRealtime() - pauseOffset); + chronometer.start(); + running = true; + } + } + + public void pauseChronometer() { + if (running) { + chronometer.stop(); + pauseOffset = SystemClock.elapsedRealtime() - chronometer.getBase(); + running = false; + } + } + + public void resetChronometer() { + chronometer.setBase(SystemClock.elapsedRealtime()); + pauseOffset = 0; + } } diff --git a/app/src/main/java/com/example/alzapp/TileSender.java b/app/src/main/java/com/example/alzapp/TileSender.java new file mode 100644 index 0000000..8cfa879 --- /dev/null +++ b/app/src/main/java/com/example/alzapp/TileSender.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 TileSender extends StringRequest { + private static final String REQUEST_URL = "https://eclectic-sweeps.000webhostapp.com/tile_sender.php"; + private Map params; + + TileSender(String username,long times , Response.Listener listener) { + super(Method.POST, REQUEST_URL, listener, null); + params = new HashMap<>(); + params.put("username", username); + params.put("tile",times+""); + + } + + @Override + public Map getParams() { + return params; + } + + + +} 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 5313e10..ee074c3 100644 --- a/app/src/main/res/layout/activity_quick_play_menu.xml +++ b/app/src/main/res/layout/activity_quick_play_menu.xml @@ -89,6 +89,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/jumble" tools:visibility="visible" /> + + + \ No newline at end of file From f87213ff8b57ed829056cc6e7f05cf425c641b6a Mon Sep 17 00:00:00 2001 From: Priyatham Date: Mon, 30 Mar 2020 12:41:34 +0530 Subject: [PATCH 2/2] removing conflicts --- .../java/com/example/alzapp/JumbleActivity.java | 15 +-------------- .../java/com/example/alzapp/QuickPlayMenu.java | 2 +- .../java/com/example/alzapp/QuizDbHelper.java | 2 +- .../com/example/alzapp/QuizQuestionPage.java | 17 +++++++++-------- .../com/example/alzapp/WelcomeActivity.java | 11 ++++++++--- app/src/main/res/layout/activity_jumble.xml | 17 ----------------- .../res/layout/activity_quick_play_menu.xml | 10 ++-------- 7 files changed, 22 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/example/alzapp/JumbleActivity.java b/app/src/main/java/com/example/alzapp/JumbleActivity.java index f79accd..719383f 100644 --- a/app/src/main/java/com/example/alzapp/JumbleActivity.java +++ b/app/src/main/java/com/example/alzapp/JumbleActivity.java @@ -46,8 +46,7 @@ public class JumbleActivity extends AppCompatActivity { - pauser = findViewById(R.id.pause); - resumer = findViewById(R.id.resume); + timer = findViewById(R.id.time); score_dis = findViewById(R.id.score); wordTv = findViewById(R.id.wordTv); @@ -105,19 +104,7 @@ public class JumbleActivity extends AppCompatActivity { } }); - pauser.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - pauseChronometer(); - } - }); - resumer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - startChronometer(); - } - }); diff --git a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java index 82b1e44..41294e9 100644 --- a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java +++ b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java @@ -49,7 +49,7 @@ public class QuickPlayMenu extends AppCompatActivity { Intent intent = getIntent(); username = intent.getStringExtra(login.EXTRA_TEXT); - game_times = findViewById(R.id.game_times); + game_times = findViewById(R.id.username_text); game_times.setText("username : "+ username); jumble.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/example/alzapp/QuizDbHelper.java b/app/src/main/java/com/example/alzapp/QuizDbHelper.java index 3bed53d..60a1944 100644 --- a/app/src/main/java/com/example/alzapp/QuizDbHelper.java +++ b/app/src/main/java/com/example/alzapp/QuizDbHelper.java @@ -66,7 +66,7 @@ public class QuizDbHelper extends SQLiteOpenHelper { addQuestion(q8); Question q9 = new Question("Total number of bones present in the human body is ", "204", "205", "206", 3); addQuestion(q9); - Question q10 = new Question("Novak Djokovic is a famous player associated with the game of ", "Basketball", "Tennis", "Cricket", 1); + Question q10 = new Question("Novak Djokovic is a famous player associated with the game of ", "Basketball", "Tennis", "Cricket", 2); addQuestion(q10); } diff --git a/app/src/main/java/com/example/alzapp/QuizQuestionPage.java b/app/src/main/java/com/example/alzapp/QuizQuestionPage.java index 7e0157f..2117f27 100644 --- a/app/src/main/java/com/example/alzapp/QuizQuestionPage.java +++ b/app/src/main/java/com/example/alzapp/QuizQuestionPage.java @@ -11,12 +11,13 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.TextView; import android.widget.Toast; -import androidx.appcompat.app.AppCompatActivity; import java.util.Collections; import java.util.List; import java.util.Locale; +import androidx.appcompat.app.AppCompatActivity; + public class QuizQuestionPage extends AppCompatActivity { public static final String EXTRA_SCORE = "extraScore"; @@ -168,21 +169,21 @@ public class QuizQuestionPage extends AppCompatActivity { } private void showSolution() { - /** rb1.setTextColor(Color.RED); - rb2.setTextColor(Color.RED); - rb3.setTextColor(Color.RED); **/ + /** rb1.setTextColor(Color.RED); + rb2.setTextColor(Color.RED); + rb3.setTextColor(Color.RED); **/ switch (currentQuestion.getAnswerNr()) { case 1: - // rb1.setTextColor(Color.GREEN); + // rb1.setTextColor(Color.GREEN); textViewQuestion.setText("Answer 1 is correct"); break; case 2: - // rb2.setTextColor(Color.GREEN); + // rb2.setTextColor(Color.GREEN); textViewQuestion.setText("Answer 2 is correct"); break; case 3: - // rb3.setTextColor(Color.GREEN); + // rb3.setTextColor(Color.GREEN); textViewQuestion.setText("Answer 3 is correct"); break; } @@ -207,7 +208,7 @@ public class QuizQuestionPage extends AppCompatActivity { finishQuiz(); } else { - Toast.makeText(this,"Press back again to finish",Toast.LENGTH_SHORT).show(); + Toast.makeText(this,"Press back again to finish",Toast.LENGTH_SHORT).show(); } backPressedTime = System.currentTimeMillis(); diff --git a/app/src/main/java/com/example/alzapp/WelcomeActivity.java b/app/src/main/java/com/example/alzapp/WelcomeActivity.java index beba791..0c61f28 100644 --- a/app/src/main/java/com/example/alzapp/WelcomeActivity.java +++ b/app/src/main/java/com/example/alzapp/WelcomeActivity.java @@ -1,11 +1,11 @@ package com.example.alzapp; -import androidx.appcompat.app.AppCompatActivity; - +import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; -import android.content.Intent; + +import androidx.appcompat.app.AppCompatActivity; /******* Created on: 21/01/2020 @@ -55,5 +55,10 @@ public class WelcomeActivity extends AppCompatActivity { + + } + @Override + public void onBackPressed() { + // Do Here what ever you want do on back press; } } diff --git a/app/src/main/res/layout/activity_jumble.xml b/app/src/main/res/layout/activity_jumble.xml index 70db044..669e074 100644 --- a/app/src/main/res/layout/activity_jumble.xml +++ b/app/src/main/res/layout/activity_jumble.xml @@ -76,24 +76,7 @@ /> -