Commit 7116bc49 authored by Anuththara18's avatar Anuththara18

Divided Attention Animal Clicks Modified & Game Map Stars Modified

parent 71fe4d66
...@@ -102,6 +102,7 @@ public class GetSignatureActivity extends AppCompatActivity { ...@@ -102,6 +102,7 @@ public class GetSignatureActivity extends AppCompatActivity {
GetParentsConsentActivity.fingerprintImageView.setImageBitmap(bitmap); GetParentsConsentActivity.fingerprintImageView.setImageBitmap(bitmap);
GetParentsConsentActivity.flag2 = 1; GetParentsConsentActivity.flag2 = 1;
GetParentsConsentActivity.btnGetSignature.setText(LanguageSetter.getresources().getString(R.string.changeSignature)); GetParentsConsentActivity.btnGetSignature.setText(LanguageSetter.getresources().getString(R.string.changeSignature));
GetParentsConsentActivity.btnGetSignature.setBackgroundColor(Color.GRAY);
GetParentsConsentActivity.red_circle.setVisibility(View.VISIBLE); GetParentsConsentActivity.red_circle.setVisibility(View.VISIBLE);
//Toast.makeText(getApplicationContext(), "Signature Recorded", Toast.LENGTH_SHORT).show(); //Toast.makeText(getApplicationContext(), "Signature Recorded", Toast.LENGTH_SHORT).show();
finish(); finish();
......
...@@ -3,6 +3,7 @@ package com.anuththara18.attentionassessment.dividedattention; ...@@ -3,6 +3,7 @@ package com.anuththara18.attentionassessment.dividedattention;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.app.Activity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
...@@ -15,6 +16,8 @@ import android.util.Log; ...@@ -15,6 +16,8 @@ import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
...@@ -373,6 +376,8 @@ public class DividedAttentionGame1 extends AppCompatActivity { ...@@ -373,6 +376,8 @@ public class DividedAttentionGame1 extends AppCompatActivity {
sq2.setOnClickListener(new View.OnClickListener() { sq2.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Animation animZoomOut = AnimationUtils.loadAnimation(getApplicationContext(),R.anim.blink);
sq2.startAnimation(animZoomOut);
mp2 = MediaPlayer.create(getApplicationContext(), R.raw.button_click); mp2 = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
mp2.start(); mp2.start();
clickedTime = System.currentTimeMillis(); clickedTime = System.currentTimeMillis();
......
...@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity; ...@@ -4,6 +4,7 @@ import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
...@@ -178,10 +179,9 @@ public class Map1Activity extends AppCompatActivity { ...@@ -178,10 +179,9 @@ public class Map1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
level = 1; level = 1;
//imageButton1.setBackgroundColor(Color.RED);
mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click); mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
mp.start(); mp.start();
Animation animZoomOut = AnimationUtils.loadAnimation(getApplicationContext(),R.anim.zoom_out);
imageButton5.startAnimation(animZoomOut);
Intent intent = new Intent(getApplicationContext(), IntroductoryVideoLandscapeActivity.class); Intent intent = new Intent(getApplicationContext(), IntroductoryVideoLandscapeActivity.class);
finish(); finish();
startActivity(intent); startActivity(intent);
...@@ -204,6 +204,7 @@ public class Map1Activity extends AppCompatActivity { ...@@ -204,6 +204,7 @@ public class Map1Activity extends AppCompatActivity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
level = 3; level = 3;
//imageButton3.setImageAlpha(127);
mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click); mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
mp.start(); mp.start();
Intent intent = new Intent(getApplicationContext(), IntroductoryVideoPortraitActivity.class); Intent intent = new Intent(getApplicationContext(), IntroductoryVideoPortraitActivity.class);
......
...@@ -188,8 +188,6 @@ public class Map2Activity extends AppCompatActivity { ...@@ -188,8 +188,6 @@ public class Map2Activity extends AppCompatActivity {
level = 1; level = 1;
mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click); mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
mp.start(); mp.start();
Animation animZoomOut = AnimationUtils.loadAnimation(getApplicationContext(),R.anim.zoom_out);
imageButton5.startAnimation(animZoomOut);
Intent intent = new Intent(getApplicationContext(), IntroductoryVideoPortraitActivity.class); Intent intent = new Intent(getApplicationContext(), IntroductoryVideoPortraitActivity.class);
finish(); finish();
startActivity(intent); startActivity(intent);
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
android:toAlpha="1.0" android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:duration="600" android:duration="600"
android:repeatMode="reverse" />
android:repeatCount="infinite"/> </set>
</set>
\ No newline at end of file <!--android:repeatMode="reverse"
android:repeatCount="infinite"-->
\ No newline at end of file
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="18dp" android:textSize="18dp"
android:textStyle="normal" android:textStyle="bold"
android:fontFamily="@font/poppins_bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fingerprintImageView" /> app:layout_constraintTop_toBottomOf="@+id/fingerprintImageView" />
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
android:layout_width="90dp" android:layout_width="90dp"
android:layout_height="81.95dp" android:layout_height="81.95dp"
android:background="@drawable/num1" android:background="@drawable/num1"
android:elevation="20dp"
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.464" app:layout_constraintHorizontal_bias="0.464"
...@@ -23,7 +22,7 @@ ...@@ -23,7 +22,7 @@
<ImageButton <ImageButton
android:id="@+id/star1" android:id="@+id/star1"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -31,7 +30,7 @@ ...@@ -31,7 +30,7 @@
app:layout_constraintHorizontal_bias="0.470" app:layout_constraintHorizontal_bias="0.470"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.029" /> app:layout_constraintVertical_bias="0.049" />
<ImageButton <ImageButton
android:id="@+id/imageButton2" android:id="@+id/imageButton2"
...@@ -48,7 +47,7 @@ ...@@ -48,7 +47,7 @@
<ImageButton <ImageButton
android:id="@+id/star2" android:id="@+id/star2"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -73,7 +72,7 @@ ...@@ -73,7 +72,7 @@
<ImageButton <ImageButton
android:id="@+id/star3" android:id="@+id/star3"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -81,7 +80,7 @@ ...@@ -81,7 +80,7 @@
app:layout_constraintHorizontal_bias="0.250" app:layout_constraintHorizontal_bias="0.250"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.480" /> app:layout_constraintVertical_bias="0.465" />
<ImageButton <ImageButton
android:id="@+id/imageButton4" android:id="@+id/imageButton4"
...@@ -98,7 +97,7 @@ ...@@ -98,7 +97,7 @@
<ImageButton <ImageButton
android:id="@+id/star4" android:id="@+id/star4"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -106,7 +105,7 @@ ...@@ -106,7 +105,7 @@
app:layout_constraintHorizontal_bias="0.782" app:layout_constraintHorizontal_bias="0.782"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.615" /> app:layout_constraintVertical_bias="0.595" />
<ImageButton <ImageButton
android:id="@+id/imageButton5" android:id="@+id/imageButton5"
...@@ -125,7 +124,7 @@ ...@@ -125,7 +124,7 @@
<ImageButton <ImageButton
android:id="@+id/star5" android:id="@+id/star5"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:translationZ="5dp" android:translationZ="5dp"
android:elevation="15dp" android:elevation="15dp"
...@@ -135,6 +134,6 @@ ...@@ -135,6 +134,6 @@
app:layout_constraintHorizontal_bias="0.472" app:layout_constraintHorizontal_bias="0.472"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.830" /> app:layout_constraintVertical_bias="0.795" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<ImageButton <ImageButton
android:id="@+id/star2" android:id="@+id/star2"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:layout_marginTop="-20dp" android:layout_marginTop="-20dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
app:layout_constraintHorizontal_bias="0.764" app:layout_constraintHorizontal_bias="0.764"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.225" /> app:layout_constraintVertical_bias="0.236" />
<ImageButton <ImageButton
android:id="@+id/imageButton3" android:id="@+id/imageButton3"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<ImageButton <ImageButton
android:id="@+id/star3" android:id="@+id/star3"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:layout_marginTop="-20dp" android:layout_marginTop="-20dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
app:layout_constraintHorizontal_bias="0.705" app:layout_constraintHorizontal_bias="0.705"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.433" /> app:layout_constraintVertical_bias="0.427" />
<ImageButton <ImageButton
android:id="@+id/imageButton4" android:id="@+id/imageButton4"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<ImageButton <ImageButton
android:id="@+id/star4" android:id="@+id/star4"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:layout_marginTop="-20dp" android:layout_marginTop="-20dp"
android:visibility="invisible" android:visibility="invisible"
android:background="@drawable/stars" android:background="@drawable/stars"
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
app:layout_constraintHorizontal_bias="0.315" app:layout_constraintHorizontal_bias="0.315"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.625" /> app:layout_constraintVertical_bias="0.605" />
<ImageButton <ImageButton
android:id="@+id/imageButton5" android:id="@+id/imageButton5"
...@@ -115,20 +115,22 @@ ...@@ -115,20 +115,22 @@
<ImageButton <ImageButton
android:id="@+id/star5" android:id="@+id/star5"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
android:elevation="15dp"
android:translationZ="5dp"
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.590" app:layout_constraintHorizontal_bias="0.599"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.800" /> app:layout_constraintVertical_bias="0.775" />
<ImageButton <ImageButton
android:id="@+id/star1" android:id="@+id/star1"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="101.95dp" android:layout_height="50dp"
android:background="@drawable/stars" android:background="@drawable/stars"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -137,6 +139,6 @@ ...@@ -137,6 +139,6 @@
app:layout_constraintHorizontal_bias="0.472" app:layout_constraintHorizontal_bias="0.472"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.000" /> app:layout_constraintVertical_bias="0.030" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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