From f87213ff8b57ed829056cc6e7f05cf425c641b6a Mon Sep 17 00:00:00 2001 From: Priyatham Date: Mon, 30 Mar 2020 12:41:34 +0530 Subject: [PATCH] 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 @@ /> -