priyatham
/
alzapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

passing elapsedMillis

This commit is contained in:
Priyatham 2020-03-23 21:06:51 +05:30
parent 9cbaf5148e
commit 451e9326b5
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/example/alzapp/JumbleActivity.java
View File

@ -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 = findViewById(R.id.chronometer);
chronometer.setFormat("Time: %s"); chronometer.setFormat("Time: %s");
chronometer.setBase(SystemClock.elapsedRealtime()); chronometer.setBase(SystemClock.elapsedRealtime());
@ -92,8 +94,12 @@ public class JumbleActivity extends AppCompatActivity {
long seconds = TimeUnit.MILLISECONDS.toSeconds(elapsedMillis); long seconds = TimeUnit.MILLISECONDS.toSeconds(elapsedMillis);
timer.setText("time : " + minutes + ":" + seconds); timer.setText("time : " + minutes + ":" + seconds);
Intent intent = new Intent(JumbleActivity.this,QuickPlayMenu.class); Intent resultIntent = new Intent();
startActivity(intent); resultIntent.putExtra("jumble_elapsed_millis", elapsedMillis);
setResult(RESULT_OK, resultIntent);
finish();
} }
} }
@ -114,6 +120,7 @@ public class JumbleActivity extends AppCompatActivity {
}); });
} }

34
app/src/main/java/com/example/alzapp/QuickPlayMenu.java
View File

@ -2,10 +2,8 @@ package com.example.alzapp;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.SystemClock;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.Chronometer;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@ -23,9 +21,8 @@ public class QuickPlayMenu extends AppCompatActivity {
private Button tilematch; private Button tilematch;
private Button game3; private Button game3;
private Button game4; private Button game4;
private Chronometer chronometer; private long jumble_elapsed_millis = 0;
private long pauseOffset;
private boolean running;
@Override @Override
@ -33,14 +30,16 @@ public class QuickPlayMenu extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_quick_play_menu); setContentView(R.layout.activity_quick_play_menu);
jumble = (Button) findViewById(R.id.jumble); jumble = (Button) findViewById(R.id.jumble);
tilematch = (Button) findViewById(R.id.tilematch); tilematch = (Button) findViewById(R.id.tilematch);
jumble.setOnClickListener(new View.OnClickListener() { jumble.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intent = new Intent(QuickPlayMenu.this,JumbleActivity.class); Intent intent = new Intent(QuickPlayMenu.this, JumbleActivity.class);
startActivity(intent); 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) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (!running) { super.onActivityResult(requestCode, resultCode, data);
chronometer.setBase(SystemClock.elapsedRealtime() - pauseOffset);
chronometer.start(); if (requestCode == 1) {
running = true; if (resultCode == RESULT_OK) {
jumble_elapsed_millis = data.getLongExtra("jumble_elapsed_millis", 0);
}
if (resultCode == RESULT_CANCELED) {
}
} }
} }
} }

3
app/src/main/res/layout/activity_quick_play_menu.xml
View File

@ -84,4 +84,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/jumble" app:layout_constraintTop_toBottomOf="@+id/jumble"
tools:visibility="visible" /> tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>