Skip to content

R
Research-Project
Commit 51b2ac8f authored by Anuththara18's avatar Anuththara18
Browse files
Options

Focused Attention - Adding levels 3, 4 & 5

parent 6c3b6c11
Show whitespace changes
Inline Side-by-side
Showing with 693 additions and 89 deletions
app/src/main/AndroidManifest.xml
View file @ 51b2ac8f
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</activity> </activity>
<activity <activity
android:name=".details.ParentDetailsActivity" android:name=".details.ParentDetailsActivity"
android:screenOrientation="landscape" android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar" android:theme="@style/Theme.AppCompat.NoActionBar"
android:windowSoftInputMode="adjustPan|stateHidden"></activity> android:windowSoftInputMode="adjustPan|stateHidden"></activity>
<activity <activity
...@@ -68,6 +68,10 @@ ...@@ -68,6 +68,10 @@
android:name=".sustained.BirdChoosingActivity" android:name=".sustained.BirdChoosingActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar"></activity> android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".focused.AnimalChoosingActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity <activity
android:name=".dividedattention.DACompleteScreen" android:name=".dividedattention.DACompleteScreen"
android:screenOrientation="portrait" android:screenOrientation="portrait"
......
app/src/main/java/com/anuththara18/attentionassessment/age/AgeActivity.java
View file @ 51b2ac8f
...@@ -133,12 +133,7 @@ public class AgeActivity extends AppCompatActivity { ...@@ -133,12 +133,7 @@ public class AgeActivity extends AppCompatActivity {
//saveDataToOnlineDB(); //saveDataToOnlineDB();
createTable(); createTable();
saveDataToLocalDB(); saveDataToLocalDB();
startActivity(new Intent(AgeActivity.this, ParentDetailsActivity.class));
if (LanguageActivity.text.equals("English")) {
startActivity(new Intent(AgeActivity.this, ConsentFormActivity.class));
} else {
startActivity(new Intent(AgeActivity.this, SinhalaConsentFormActivity.class));
}
/*if(imageCheck==1) { /*if(imageCheck==1) {
Intent navInt = new Intent(getApplicationContext(), NavigationDrawerActivity.class); Intent navInt = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
......
app/src/main/java/com/anuththara18/attentionassessment/alternating/AlternatingAttentionGame1.java
View file @ 51b2ac8f
...@@ -72,14 +72,14 @@ public class AlternatingAttentionGame1 extends AppCompatActivity { ...@@ -72,14 +72,14 @@ public class AlternatingAttentionGame1 extends AppCompatActivity {
R.drawable.motor_piggy, R.drawable.motor_piggy,
R.drawable.waving_dog, R.drawable.waving_dog,
R.drawable.dancing_cat, R.drawable.dancing_cat,
R.drawable.blue_bird2_gif, R.drawable.walking_unicorn,
R.drawable.yellow_bird_gif}; R.drawable.yellow_bird_gif};
Integer[] right_images = { R.drawable.dancing_star, Integer[] right_images = { R.drawable.dancing_star,
R.drawable.blowing_crab, R.drawable.blowing_crab,
R.drawable.swimming_fish, R.drawable.swimming_fish,
R.drawable.blue_fishy, R.drawable.blue_fishy,
R.drawable.blue_bird2_gif, R.drawable.brown_octopus,
R.drawable.yellow_bird_gif}; R.drawable.yellow_bird_gif};
//Integer[] sequence1 = { 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0}; //Integer[] sequence1 = { 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 0};
...@@ -151,7 +151,7 @@ public class AlternatingAttentionGame1 extends AppCompatActivity { ...@@ -151,7 +151,7 @@ public class AlternatingAttentionGame1 extends AppCompatActivity {
//imageView2.setVisibility(View.INVISIBLE); //imageView2.setVisibility(View.INVISIBLE);
imageView2.setImageResource(0); imageView2.setImageResource(0);
imageView1.setVisibility(View.VISIBLE); imageView1.setVisibility(View.VISIBLE);
if (leftcount > 3 ){ if (leftcount > 4 ){
leftcount = 0; leftcount = 0;
} }
imageView1.setImageResource(left_images[leftcount]); imageView1.setImageResource(left_images[leftcount]);
...@@ -172,7 +172,7 @@ public class AlternatingAttentionGame1 extends AppCompatActivity { ...@@ -172,7 +172,7 @@ public class AlternatingAttentionGame1 extends AppCompatActivity {
//imageView1.setVisibility(View.INVISIBLE); //imageView1.setVisibility(View.INVISIBLE);
imageView1.setImageResource(0); imageView1.setImageResource(0);
imageView2.setVisibility(View.VISIBLE); imageView2.setVisibility(View.VISIBLE);
if (rightcount > 3 ){ if (rightcount > 4 ){
rightcount = 0; rightcount = 0;
} }
imageView2.setImageResource(right_images[rightcount]); imageView2.setImageResource(right_images[rightcount]);
......
app/src/main/java/com/anuththara18/attentionassessment/details/ParentDetailsActivity.java
View file @ 51b2ac8f
...@@ -15,6 +15,8 @@ import android.widget.Toast; ...@@ -15,6 +15,8 @@ import android.widget.Toast;
import com.anuththara18.attentionassessment.R; import com.anuththara18.attentionassessment.R;
import com.anuththara18.attentionassessment.age.AgeActivity; import com.anuththara18.attentionassessment.age.AgeActivity;
import com.anuththara18.attentionassessment.consentform.ConsentFormActivity;
import com.anuththara18.attentionassessment.consentform.SinhalaConsentFormActivity;
import com.anuththara18.attentionassessment.gender.GenderActivity; import com.anuththara18.attentionassessment.gender.GenderActivity;
import com.anuththara18.attentionassessment.language.LanguageActivity; import com.anuththara18.attentionassessment.language.LanguageActivity;
import com.anuththara18.attentionassessment.language.LanguageSetter; import com.anuththara18.attentionassessment.language.LanguageSetter;
...@@ -24,8 +26,8 @@ import java.util.regex.Pattern; ...@@ -24,8 +26,8 @@ import java.util.regex.Pattern;
public class ParentDetailsActivity extends AppCompatActivity { public class ParentDetailsActivity extends AppCompatActivity {
TextView name, email, contact, next, previous, opt1, opt2, opt3; TextView name, email, contact, next, previous, opt1, opt2, opt3, req, diag;
EditText childName, parentEmail, parentContact; EditText childName, parentEmail, parentContact, diagnosis;
public static String child_name, parent_email, parent_contact; public static String child_name, parent_email, parent_contact;
@Override @Override
...@@ -48,6 +50,9 @@ public class ParentDetailsActivity extends AppCompatActivity { ...@@ -48,6 +50,9 @@ public class ParentDetailsActivity extends AppCompatActivity {
opt1 = findViewById(R.id.opt1); opt1 = findViewById(R.id.opt1);
opt2 = findViewById(R.id.opt2); opt2 = findViewById(R.id.opt2);
opt3 = findViewById(R.id.opt3); opt3 = findViewById(R.id.opt3);
req = findViewById(R.id.req);
diagnosis = findViewById(R.id.diagnosis);
diag = findViewById(R.id.diag);
childName = findViewById(R.id.childName); childName = findViewById(R.id.childName);
parentEmail = findViewById(R.id.parentEmail); parentEmail = findViewById(R.id.parentEmail);
...@@ -61,6 +66,8 @@ public class ParentDetailsActivity extends AppCompatActivity { ...@@ -61,6 +66,8 @@ public class ParentDetailsActivity extends AppCompatActivity {
opt1.setText(LanguageSetter.getresources().getString(R.string.optional)); opt1.setText(LanguageSetter.getresources().getString(R.string.optional));
opt2.setText(LanguageSetter.getresources().getString(R.string.optional)); opt2.setText(LanguageSetter.getresources().getString(R.string.optional));
opt3.setText(LanguageSetter.getresources().getString(R.string.optional)); opt3.setText(LanguageSetter.getresources().getString(R.string.optional));
req.setText(LanguageSetter.getresources().getString(R.string.req));
diag.setText(LanguageSetter.getresources().getString(R.string.diagnosis));
child_name = childName.getText().toString(); child_name = childName.getText().toString();
parent_email = parentEmail.getText().toString(); parent_email = parentEmail.getText().toString();
...@@ -69,7 +76,7 @@ public class ParentDetailsActivity extends AppCompatActivity { ...@@ -69,7 +76,7 @@ public class ParentDetailsActivity extends AppCompatActivity {
previous.setOnClickListener(new View.OnClickListener() { previous.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Intent intent = new Intent(ParentDetailsActivity.this, LanguageActivity.class); Intent intent = new Intent(ParentDetailsActivity.this, AgeActivity.class);
startActivity(intent); startActivity(intent);
} }
}); });
...@@ -86,8 +93,11 @@ public class ParentDetailsActivity extends AppCompatActivity { ...@@ -86,8 +93,11 @@ public class ParentDetailsActivity extends AppCompatActivity {
parentContact.setError("Enter Valid Number\nEg: 0771234567"); parentContact.setError("Enter Valid Number\nEg: 0771234567");
} }
else { else {
Intent intent = new Intent(ParentDetailsActivity.this, GenderActivity.class); if (LanguageActivity.text.equals("English")) {
startActivity(intent); startActivity(new Intent(ParentDetailsActivity.this, ConsentFormActivity.class));
} else {
startActivity(new Intent(ParentDetailsActivity.this, SinhalaConsentFormActivity.class));
}
} }
} }
}); });
......
app/src/main/java/com/anuththara18/attentionassessment/focused/AnimalChoosingActivity.java 0 → 100644
View file @ 51b2ac8f
package com.anuththara18.attentionassessment.focused;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.view.WindowManager;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import androidx.cardview.widget.CardView;
import com.anuththara18.attentionassessment.R;
import com.anuththara18.attentionassessment.language.LanguageSetter;
import com.anuththara18.attentionassessment.sustained.SustainedAttentionGame1;
public class AnimalChoosingActivity extends AppCompatActivity {
TextView textView8;
CardView bird1, bird2, bird3, bird4, bird5, bird6;
ImageButton imageButton;
LinearLayout l1, l2, l3, l4, l5, l6;
public static Integer birdSelected = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (Build.VERSION.SDK_INT < 16) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
}
View decorView = getWindow().getDecorView();
int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN;
decorView.setSystemUiVisibility(uiOptions);
setContentView(R.layout.activity_animal_choosing);
textView8 = findViewById(R.id.textview8);
bird1 = findViewById(R.id.bird1);
bird2 = findViewById(R.id.bird2);
bird3 = findViewById(R.id.bird3);
bird4 = findViewById(R.id.bird4);
bird5 = findViewById(R.id.bird5);
bird6 = findViewById(R.id.bird6);
imageButton = findViewById(R.id.imageButton);
l1 = findViewById(R.id.l1);
l2 = findViewById(R.id.l2);
l3 = findViewById(R.id.l3);
l4 = findViewById(R.id.l4);
l5 = findViewById(R.id.l5);
l6 = findViewById(R.id.l6);
//textView8.setText(LanguageSetter.getresources().getString(R.string.birdselect));
bird1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
birdSelected = 0;
l1.setBackgroundResource(R.drawable.selected_gridview_background);
l2.setBackgroundResource(R.drawable.gridview_background);
l3.setBackgroundResource(R.drawable.gridview_background);
l4.setBackgroundResource(R.drawable.gridview_background);
l6.setBackgroundResource(R.drawable.gridview_background);
l5.setBackgroundResource(R.drawable.gridview_background);
}
});
bird2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
birdSelected = 1;
l2.setBackgroundResource(R.drawable.selected_gridview_background);
l1.setBackgroundResource(R.drawable.gridview_background);
l3.setBackgroundResource(R.drawable.gridview_background);
l4.setBackgroundResource(R.drawable.gridview_background);
l6.setBackgroundResource(R.drawable.gridview_background);
l5.setBackgroundResource(R.drawable.gridview_background);
//Toast.makeText(getApplicationContext(), "yellow", Toast.LENGTH_SHORT).show();
}
});
bird3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
birdSelected = 4;
l3.setBackgroundResource(R.drawable.selected_gridview_background);
l2.setBackgroundResource(R.drawable.gridview_background);
l1.setBackgroundResource(R.drawable.gridview_background);
l4.setBackgroundResource(R.drawable.gridview_background);
l6.setBackgroundResource(R.drawable.gridview_background);
l5.setBackgroundResource(R.drawable.gridview_background);
}
});
bird4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
birdSelected = 9;
l2.setBackgroundResource(R.drawable.gridview_background);
l3.setBackgroundResource(R.drawable.gridview_background);
l1.setBackgroundResource(R.drawable.gridview_background);
l6.setBackgroundResource(R.drawable.gridview_background);
l5.setBackgroundResource(R.drawable.gridview_background);
l4.setBackgroundResource(R.drawable.selected_gridview_background);
}
});
bird5.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
birdSelected = 5;
l2.setBackgroundResource(R.drawable.gridview_background);
l3.setBackgroundResource(R.drawable.gridview_background);
l1.setBackgroundResource(R.drawable.gridview_background);
l4.setBackgroundResource(R.drawable.gridview_background);
l6.setBackgroundResource(R.drawable.gridview_background);
l5.setBackgroundResource(R.drawable.selected_gridview_background);
}
});
bird6.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
birdSelected = 8;
l2.setBackgroundResource(R.drawable.gridview_background);
l3.setBackgroundResource(R.drawable.gridview_background);
l1.setBackgroundResource(R.drawable.gridview_background);
l5.setBackgroundResource(R.drawable.gridview_background);
l4.setBackgroundResource(R.drawable.gridview_background);
l6.setBackgroundResource(R.drawable.selected_gridview_background);
}
});
imageButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if(birdSelected == 0) {
Toast.makeText(getApplicationContext(), LanguageSetter.getresources().getString(R.string.birdselect), Toast.LENGTH_SHORT).show();
}
else {
Intent intent = new Intent(AnimalChoosingActivity.this, FocusedAttentionGame1.class);
startActivity(intent);
}
}
});
}
}
\ No newline at end of file
app/src/main/java/com/anuththara18/attentionassessment/focused/FocusedAttentionGame1.java
View file @ 51b2ac8f
...@@ -34,6 +34,7 @@ import com.anuththara18.attentionassessment.db.RequestHandler; ...@@ -34,6 +34,7 @@ import com.anuththara18.attentionassessment.db.RequestHandler;
import com.anuththara18.attentionassessment.gender.GenderActivity; import com.anuththara18.attentionassessment.gender.GenderActivity;
import com.anuththara18.attentionassessment.home.NavigationDrawerActivity; import com.anuththara18.attentionassessment.home.NavigationDrawerActivity;
import com.anuththara18.attentionassessment.language.LanguageSetter; import com.anuththara18.attentionassessment.language.LanguageSetter;
import com.anuththara18.attentionassessment.map.Map1Activity;
import com.anuththara18.attentionassessment.sustained.SustainedAttentionGame1; import com.anuththara18.attentionassessment.sustained.SustainedAttentionGame1;
import org.json.JSONException; import org.json.JSONException;
...@@ -108,7 +109,7 @@ public class FocusedAttentionGame1 extends AppCompatActivity { ...@@ -108,7 +109,7 @@ public class FocusedAttentionGame1 extends AppCompatActivity {
red_btn = (ImageButton) findViewById(R.id.red_btn); red_btn = (ImageButton) findViewById(R.id.red_btn);
textView = (TextView) findViewById(R.id.textView); textView = (TextView) findViewById(R.id.textView);
textView.setText(LanguageSetter.getresources().getString(R.string.focg1)); //textView.setText(LanguageSetter.getresources().getString(R.string.focg1));
mp = MediaPlayer.create(getApplicationContext(), R.raw.focused); mp = MediaPlayer.create(getApplicationContext(), R.raw.focused);
mp.start(); mp.start();
...@@ -138,7 +139,6 @@ public class FocusedAttentionGame1 extends AppCompatActivity { ...@@ -138,7 +139,6 @@ public class FocusedAttentionGame1 extends AppCompatActivity {
@Override @Override
public void run() { public void run() {
if ( i <= count ) { // 41 times if ( i <= count ) { // 41 times
if ( i % 2 != 0 ) { if ( i % 2 != 0 ) {
...@@ -182,6 +182,126 @@ public class FocusedAttentionGame1 extends AppCompatActivity { ...@@ -182,6 +182,126 @@ public class FocusedAttentionGame1 extends AppCompatActivity {
} }
rand = getRandomElement(unpickedNumbers); rand = getRandomElement(unpickedNumbers);
if ( Map1Activity.level == 3 ) {
if ( i == 2 || i == 14 || i == 26 || i == 38 ) {
imageView.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 4 || i == 16 || i == 28 || i == 40 ) {
imageView2.setVisibility(View.VISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView2.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 6 || i == 18 || i == 30 ) {
imageView3.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView3.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 8 || i == 20 || i == 32 ) {
imageView4.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView4.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 10 || i == 22 || i == 34 ) {
imageView5.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView5.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 12 || i == 24 || i == 36 ) {
imageView6.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView6.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
}
else if ( Map1Activity.level == 4 ) {
if ( i == 2 || i == 14 || i == 26 || i == 38 ) {
imageView.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 4 || i == 16 || i == 28 || i == 40 ) {
imageView2.setVisibility(View.VISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView2.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 6 || i == 18 || i == 30 ) {
imageView3.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView3.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 8 || i == 20 || i == 32 ) {
imageView4.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView4.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 10 || i == 22 || i == 34 ) {
imageView5.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView6.setVisibility(View.INVISIBLE);
imageView5.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
else if ( i == 12 || i == 24 || i == 36 ) {
imageView6.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE);
imageView3.setVisibility(View.INVISIBLE);
imageView4.setVisibility(View.INVISIBLE);
imageView5.setVisibility(View.INVISIBLE);
imageView.setVisibility(View.INVISIBLE);
imageView6.setImageResource(images[AnimalChoosingActivity.birdSelected]);
}
}
else if ( Map1Activity.level == 5 ) {
if ( i == 2 || i == 14 || i == 26 || i == 38 ) { if ( i == 2 || i == 14 || i == 26 || i == 38 ) {
imageView.setVisibility(View.VISIBLE); imageView.setVisibility(View.VISIBLE);
imageView2.setVisibility(View.INVISIBLE); imageView2.setVisibility(View.INVISIBLE);
...@@ -237,6 +357,8 @@ public class FocusedAttentionGame1 extends AppCompatActivity { ...@@ -237,6 +357,8 @@ public class FocusedAttentionGame1 extends AppCompatActivity {
imageView6.setImageResource(images[rand]); imageView6.setImageResource(images[rand]);
} }
}
imageView.setEnabled(true); imageView.setEnabled(true);
imageView2.setEnabled(true); imageView2.setEnabled(true);
imageView3.setEnabled(true); imageView3.setEnabled(true);
......
app/src/main/java/com/anuththara18/attentionassessment/gender/GenderActivity.java
View file @ 51b2ac8f
...@@ -103,7 +103,7 @@ public class GenderActivity extends AppCompatActivity { ...@@ -103,7 +103,7 @@ public class GenderActivity extends AppCompatActivity {
previous.setOnClickListener(new View.OnClickListener() { previous.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Intent intent = new Intent(GenderActivity.this, ParentDetailsActivity.class); Intent intent = new Intent(GenderActivity.this, LanguageActivity.class);
startActivity(intent); startActivity(intent);
} }
}); });
......
app/src/main/java/com/anuththara18/attentionassessment/home/MainFragment.java
View file @ 51b2ac8f
...@@ -16,6 +16,7 @@ import com.anuththara18.attentionassessment.R; ...@@ -16,6 +16,7 @@ import com.anuththara18.attentionassessment.R;
import com.anuththara18.attentionassessment.alternating.AlternatingAttentionGame1; import com.anuththara18.attentionassessment.alternating.AlternatingAttentionGame1;
import com.anuththara18.attentionassessment.dividedattention.DividedAttentionGame1; import com.anuththara18.attentionassessment.dividedattention.DividedAttentionGame1;
import com.anuththara18.attentionassessment.focused.FocusedAttentionGame1; import com.anuththara18.attentionassessment.focused.FocusedAttentionGame1;
import com.anuththara18.attentionassessment.map.Map1Activity;
import com.anuththara18.attentionassessment.map.Map2Activity; import com.anuththara18.attentionassessment.map.Map2Activity;
import com.anuththara18.attentionassessment.sustained.BirdChoosingActivity; import com.anuththara18.attentionassessment.sustained.BirdChoosingActivity;
...@@ -52,7 +53,7 @@ public class MainFragment extends Fragment { ...@@ -52,7 +53,7 @@ public class MainFragment extends Fragment {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
mp.start(); mp.start();
Intent intent = new Intent(getContext(), FocusedAttentionGame1.class); Intent intent = new Intent(getContext(), Map1Activity.class);
startActivity(intent); startActivity(intent);
} }
}); });
......
app/src/main/java/com/anuththara18/attentionassessment/language/LanguageActivity.java
View file @ 51b2ac8f
...@@ -94,7 +94,7 @@ public class LanguageActivity extends AppCompatActivity { ...@@ -94,7 +94,7 @@ public class LanguageActivity extends AppCompatActivity {
Toast.makeText(getApplicationContext(), "Please select a language", Toast.LENGTH_SHORT).show(); Toast.makeText(getApplicationContext(), "Please select a language", Toast.LENGTH_SHORT).show();
} }
else { else {
Intent intent = new Intent(LanguageActivity.this, ParentDetailsActivity.class); Intent intent = new Intent(LanguageActivity.this, GenderActivity.class);
startActivity(intent); startActivity(intent);
} }
} }
......
app/src/main/java/com/anuththara18/attentionassessment/map/Map1Activity.java
View file @ 51b2ac8f
...@@ -2,11 +2,16 @@ package com.anuththara18.attentionassessment.map; ...@@ -2,11 +2,16 @@ package com.anuththara18.attentionassessment.map;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
import android.widget.ImageButton; import android.widget.ImageButton;
import com.anuththara18.attentionassessment.R; import com.anuththara18.attentionassessment.R;
import com.anuththara18.attentionassessment.focused.AnimalChoosingActivity;
import com.anuththara18.attentionassessment.focused.FocusedAttentionGame1;
import com.anuththara18.attentionassessment.focused.FocusedAttentionGame2;
import com.anuththara18.attentionassessment.selective.SelectiveAttentionGame1;
public class Map1Activity extends AppCompatActivity { public class Map1Activity extends AppCompatActivity {
...@@ -29,6 +34,9 @@ public class Map1Activity extends AppCompatActivity { ...@@ -29,6 +34,9 @@ public class Map1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
level = 1; level = 1;
Intent intent = new Intent(getApplicationContext(), FocusedAttentionGame2.class);
finish();
startActivity(intent);
} }
}); });
...@@ -36,6 +44,9 @@ public class Map1Activity extends AppCompatActivity { ...@@ -36,6 +44,9 @@ public class Map1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
level = 2; level = 2;
Intent intent = new Intent(getApplicationContext(), FocusedAttentionGame2.class);
finish();
startActivity(intent);
} }
}); });
...@@ -43,6 +54,9 @@ public class Map1Activity extends AppCompatActivity { ...@@ -43,6 +54,9 @@ public class Map1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
level = 3; level = 3;
Intent intent = new Intent(getApplicationContext(), AnimalChoosingActivity.class);
finish();
startActivity(intent);
} }
}); });
...@@ -50,6 +64,9 @@ public class Map1Activity extends AppCompatActivity { ...@@ -50,6 +64,9 @@ public class Map1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
level = 4; level = 4;
Intent intent = new Intent(getApplicationContext(), AnimalChoosingActivity.class);
finish();
startActivity(intent);
} }
}); });
...@@ -57,6 +74,9 @@ public class Map1Activity extends AppCompatActivity { ...@@ -57,6 +74,9 @@ public class Map1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
level = 5; level = 5;
Intent intent = new Intent(getApplicationContext(), AnimalChoosingActivity.class);
finish();
startActivity(intent);
} }
}); });
......
app/src/main/java/com/anuththara18/attentionassessment/selective/SelectiveAttentionGame1.java
View file @ 51b2ac8f
...@@ -415,7 +415,7 @@ public class SelectiveAttentionGame1 extends AppCompatActivity { ...@@ -415,7 +415,7 @@ public class SelectiveAttentionGame1 extends AppCompatActivity {
GVAdapter2 adapter = new GVAdapter2(getApplicationContext(), gridModelArrayList); GVAdapter2 adapter = new GVAdapter2(getApplicationContext(), gridModelArrayList);
gridView.setAdapter(adapter); gridView.setAdapter(adapter);
gridView.setEnabled(false);
saveDataToOnlineDB(); saveDataToOnlineDB();
createTable(); createTable();
saveDataToLocalDB(); saveDataToLocalDB();
......
app/src/main/res/layout/activity_alternating_attention_game1.xml
View file @ 51b2ac8f
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
android:id="@+id/imageView1" android:id="@+id/imageView1"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="200dp"
android:src="@drawable/red_angry_bird" android:src="@drawable/walking_unicorn"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView6" app:layout_constraintEnd_toStartOf="@+id/imageView6"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
android:id="@+id/imageView2" android:id="@+id/imageView2"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="200dp" android:layout_height="200dp"
android:src="@drawable/blowing_crab" android:src="@drawable/brown_octopus"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
......
app/src/main/res/layout/activity_animal_choosing.xml 0 → 100644
View file @ 51b2ac8f
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg5"
tools:context=".focused.AnimalChoosingActivity">
<ImageButton
android:id="@+id/cross_btn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="9dp"
android:layout_marginTop="14dp"
android:background="@drawable/cross_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/help_btn"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="9dp"
android:background="@drawable/question_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textview8"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textAlignment="center"
android:layout_marginStart="30dp"
android:layout_marginTop="45dp"
android:layout_marginEnd="30dp"
android:fontFamily="@font/poppins_bold"
android:text="@string/birdselect"
android:textColor="@color/black"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview8">
<androidx.cardview.widget.CardView
android:id="@+id/bird1"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
app:cardCornerRadius="8dp"
app:cardElevation="8dp">
<LinearLayout
android:id="@+id/l1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gridview_background"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/monkey" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/bird2"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
app:cardCornerRadius="8dp"
app:cardElevation="8dp">
<LinearLayout
android:id="@+id/l2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gridview_background"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/baby_zebra" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout1">
<androidx.cardview.widget.CardView
android:id="@+id/bird3"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
app:cardCornerRadius="8dp"
app:cardElevation="8dp">
<LinearLayout
android:id="@+id/l3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gridview_background"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/giraffe" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/bird4"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
app:cardCornerRadius="8dp"
app:cardElevation="8dp">
<LinearLayout
android:id="@+id/l4"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gridview_background"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/dog" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="10dp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
<androidx.cardview.widget.CardView
android:id="@+id/bird5"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
app:cardCornerRadius="8dp"
app:cardElevation="8dp">
<LinearLayout
android:id="@+id/l5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gridview_background"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dp"
android:src="@drawable/cow" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/bird6"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
app:cardCornerRadius="8dp"
app:cardElevation="8dp">
<LinearLayout
android:id="@+id/l6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/gridview_background"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/lion" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<ImageButton
android:id="@+id/imageButton"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_gravity="center"
android:layout_marginBottom="30dp"
android:background="@drawable/complete"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_parent_details.xml
View file @ 51b2ac8f
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/bg1" android:background="@drawable/bg5"
tools:context=".details.ParentDetailsActivity"> tools:context=".details.ParentDetailsActivity">
<TextView <TextView
android:id="@+id/previous" android:id="@+id/previous"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="25dp"
android:drawableStart="@drawable/icon_left" android:drawableStart="@drawable/icon_left"
android:drawableTint="@color/black" android:drawableTint="@color/black"
android:fontFamily="@font/poppins_medium" android:fontFamily="@font/poppins_medium"
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
android:id="@+id/next" android:id="@+id/next"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="25dp"
android:drawableEnd="@drawable/icon_right" android:drawableEnd="@drawable/icon_right"
android:drawableTint="@color/black" android:drawableTint="@color/black"
android:fontFamily="@font/poppins_medium" android:fontFamily="@font/poppins_medium"
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <TextView
...@@ -83,14 +84,14 @@ ...@@ -83,14 +84,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="Child Name" android:hint="Child Name"
android:textColorHint="#575757" android:textColorHint="#575757"
android:fontFamily="@font/poppins_bold" android:fontFamily="@font/poppins_medium"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" android:textSize="18sp" />
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <TextView
...@@ -123,14 +124,14 @@ ...@@ -123,14 +124,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="xxxxx@gmail.com" android:hint="xxxxx@gmail.com"
android:textColorHint="#575757" android:textColorHint="#575757"
android:fontFamily="@font/poppins_bold" android:fontFamily="@font/poppins_medium"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" android:textSize="18sp" />
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<TextView <TextView
...@@ -162,20 +163,59 @@ ...@@ -162,20 +163,59 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="0771234567" android:hint="0771234567"
android:fontFamily="@font/poppins_bold" android:fontFamily="@font/poppins_medium"
android:textColorHint="#575757" android:textColorHint="#575757"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="18sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal" >
<TextView
android:id="@+id/diag"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:text="@string/diagnosis"
android:layout_marginTop="5dp"
android:textColor="@color/black"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView
android:id="@+id/req"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/poppins_bold"
android:layout_marginLeft="20dp"
android:text="@string/req"
android:layout_marginTop="5dp"
android:textColor="@color/red"
android:textSize="15sp" />
</LinearLayout>
<EditText
android:id="@+id/diagnosis"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Yes / No"
android:fontFamily="@font/poppins_medium"
android:textColorHint="#575757"
android:textColor="@color/black"
android:textSize="18sp" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="110dp" android:layout_height="110dp"
android:layout_marginBottom="-8dp" android:layout_marginBottom="-15dp"
android:src="@drawable/grass1" android:src="@drawable/grass2"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0" app:layout_constraintHorizontal_bias="1.0"
......
app/src/main/res/values-si/strings(si).xml
View file @ 51b2ac8f
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
<string name="parentEmail">විද්යුත් තැපෑල් ලිපිනය:</string> <string name="parentEmail">විද්යුත් තැපෑල් ලිපිනය:</string>
<string name="parentContact">දුරකතන අංකය :</string> <string name="parentContact">දුරකතන අංකය :</string>
<string name="optional">* විකල්ප</string> <string name="optional">* විකල්ප</string>
<string name="req">* අවශ්යයි</string>
<string name="send">දත්ත යවන්න</string> <string name="send">දත්ත යවන්න</string>
<string name="diagnosis">ඔබේ දරුවා අවධානය යොමු කිරීමේ දුර්වලතාවයකින් පෙළෙනවාද?</string>
<string name="select">තෝරන්න</string> <string name="select">තෝරන්න</string>
<string name="birdselect">ඔබ වඩාත්ම කැමති චරිතය තෝරන්න</string> <string name="birdselect">ඔබ වඩාත්ම කැමති චරිතය තෝරන්න</string>
......
app/src/main/res/values/strings.xml
View file @ 51b2ac8f
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
<string name="parentEmail">Email :</string> <string name="parentEmail">Email :</string>
<string name="parentContact">Contact Number :</string> <string name="parentContact">Contact Number :</string>
<string name="optional">* Optional</string> <string name="optional">* Optional</string>
<string name="req">* Required</string>
<string name="send">Send Data</string> <string name="send">Send Data</string>
<string name="diagnosis">Is your child suffering from any attention impairements?</string>
<string name="select">Select the</string> <string name="select">Select the</string>
<string name="birdselect">Pick your favourite character</string> <string name="birdselect">Pick your favourite character</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment