From 451e9326b53ea9efc7a688830e9378f8586e4470 Mon Sep 17 00:00:00 2001
From: Priyatham <priyathamsaichand@gmail.com>
Date: Mon, 23 Mar 2020 21:06:51 +0530
Subject: [PATCH] passing elapsedMillis

---
 .../com/example/alzapp/JumbleActivity.java    | 11 ++++--
 .../com/example/alzapp/QuickPlayMenu.java     | 34 ++++++++++++-------
 .../res/layout/activity_quick_play_menu.xml   |  3 ++
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/example/alzapp/JumbleActivity.java b/app/src/main/java/com/example/alzapp/JumbleActivity.java
index 6f4d861..a44d740 100644
--- a/app/src/main/java/com/example/alzapp/JumbleActivity.java
+++ b/app/src/main/java/com/example/alzapp/JumbleActivity.java
@@ -79,6 +79,8 @@ public class JumbleActivity extends AppCompatActivity {
                 }
             });
 
+        Intent intent = getIntent();
+        elapsedMillis = intent.getLongExtra("jumble_elapsed_millis", 0);
         chronometer = findViewById(R.id.chronometer);
         chronometer.setFormat("Time: %s");
         chronometer.setBase(SystemClock.elapsedRealtime());
@@ -92,8 +94,12 @@ public class JumbleActivity extends AppCompatActivity {
                     long seconds = TimeUnit.MILLISECONDS.toSeconds(elapsedMillis);
                     timer.setText("time : " + minutes + ":" + seconds);
 
-                    Intent intent = new Intent(JumbleActivity.this,QuickPlayMenu.class);
-                    startActivity(intent);
+                    Intent resultIntent = new Intent();
+                    resultIntent.putExtra("jumble_elapsed_millis", elapsedMillis);
+                    setResult(RESULT_OK, resultIntent);
+                    finish();
+
+
 
                 }
             }
@@ -114,6 +120,7 @@ public class JumbleActivity extends AppCompatActivity {
         });
 
 
+
         }
 
 
diff --git a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java
index 190204b..bc2ddcf 100644
--- a/app/src/main/java/com/example/alzapp/QuickPlayMenu.java
+++ b/app/src/main/java/com/example/alzapp/QuickPlayMenu.java
@@ -2,10 +2,8 @@ package com.example.alzapp;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.SystemClock;
 import android.view.View;
 import android.widget.Button;
-import android.widget.Chronometer;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -23,9 +21,8 @@ public class QuickPlayMenu extends AppCompatActivity {
     private Button tilematch;
     private Button game3;
     private Button game4;
-    private Chronometer chronometer;
-    private long pauseOffset;
-    private boolean running;
+    private long jumble_elapsed_millis = 0;
+
 
 
     @Override
@@ -33,14 +30,16 @@ public class QuickPlayMenu extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_quick_play_menu);
 
+
         jumble = (Button) findViewById(R.id.jumble);
         tilematch = (Button) findViewById(R.id.tilematch);
 
         jumble.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(QuickPlayMenu.this,JumbleActivity.class);
-                startActivity(intent);
+                Intent intent = new Intent(QuickPlayMenu.this, JumbleActivity.class);
+                intent.putExtra("jumble_elapsed_millis", jumble_elapsed_millis);
+                startActivityForResult(intent, 1);
 
             }
         });
@@ -65,12 +64,23 @@ public class QuickPlayMenu extends AppCompatActivity {
 
 
 
+
     }
-    public void startChronometer(View v) {
-        if (!running) {
-            chronometer.setBase(SystemClock.elapsedRealtime() - pauseOffset);
-            chronometer.start();
-            running = true;
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == 1) {
+            if (resultCode == RESULT_OK) {
+               jumble_elapsed_millis = data.getLongExtra("jumble_elapsed_millis", 0);
+
+
+
+            }
+            if (resultCode == RESULT_CANCELED) {
+
+
+            }
         }
     }
+
 }
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 5480918..5053340 100644
--- a/app/src/main/res/layout/activity_quick_play_menu.xml
+++ b/app/src/main/res/layout/activity_quick_play_menu.xml
@@ -84,4 +84,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/jumble"
         tools:visibility="visible" />
+
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file