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

removing conflicts

This commit is contained in:
Priyatham 2020-03-30 12:41:34 +05:30
parent 680df4b109
commit f87213ff8b
7 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}
});

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

@ -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() {

2
app/src/main/java/com/example/alzapp/QuizDbHelper.java
View File

@ -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);
}

3
app/src/main/java/com/example/alzapp/QuizQuestionPage.java
View File

@ -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";

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

@ -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;
}
}

17
app/src/main/res/layout/activity_jumble.xml
View File

@ -76,24 +76,7 @@
/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/chronometer"
android:layout_centerHorizontal="true"
android:layout_marginBottom="-59dp"
android:text = "pause"
android:id="@+id/pause"
/>
<Button
android:id="@+id/resume"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/pause"
android:layout_centerHorizontal="true"
android:layout_marginBottom="-60dp"
android:text="resume" />
</RelativeLayout>

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

@ -89,24 +89,18 @@
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"
android:id="@+id/username_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="100dp"
android:layout_marginTop="40dp"
android:layout_marginEnd="400dp"
android:layout_marginBottom="35dp"
android:text="Username:"
android:textColor="@android:color/black"
android:textSize="20sp"
app:layout_constraintBottom_toTopOf="@+id/jumble"