Age Selection Screen UI Modification

app/src/main/java/com/anuththara18/attentionassessment/age/AgeActivity.java

@@ -6,14 +6,18 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
+import android.media.MediaPlayer;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.view.animation.TranslateAnimation;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -41,10 +45,10 @@ import java.util.HashMap;
 
 public class AgeActivity extends AppCompatActivity {
 
-    ImageButton right_btn, left_btn;
-    ImageView bunny_img;
-    TextView age_txt, next, previous, selectAge;
-    public static int age = 4;
+    ImageButton next, previous;
+    ImageView bunny_img4, bunny_img5, bunny_img6, bunny_img7, icon4, icon5, icon6, icon7;
+    TextView selectAge;
+    public static int age = 0;
     SharedPreferences sharedPreferences;
     int imageCheck;
     int width;
@@ -54,6 +58,8 @@ public class AgeActivity extends AppCompatActivity {
     public static final String DATABASE_NAME = "childData";
     SQLiteDatabase mDatabase;
 
+    MediaPlayer mp;
+
     private static final int CODE_GET_REQUEST = 1024;
     private static final int CODE_POST_REQUEST = 1025;
 
@@ -69,20 +75,22 @@ public class AgeActivity extends AppCompatActivity {
         decorView.setSystemUiVisibility(uiOptions);
         setContentView(R.layout.activity_age);
 
-        right_btn = (ImageButton)findViewById(R.id.right_btn);
-        left_btn = (ImageButton)findViewById(R.id.left_btn);
-        bunny_img = (ImageView)findViewById(R.id.bunny_img);
-        age_txt = (TextView)findViewById(R.id.age_txt);
-        next = (TextView)findViewById(R.id.next);
-        previous = (TextView)findViewById(R.id.previous);
+        bunny_img4 = (ImageView)findViewById(R.id.bunny_img4);
+        bunny_img5 = (ImageView)findViewById(R.id.bunny_img5);
+        bunny_img6 = (ImageView)findViewById(R.id.bunny_img6);
+        bunny_img7 = (ImageView)findViewById(R.id.bunny_img7);
+        icon4 = (ImageView)findViewById(R.id.icon4);
+        icon5 = (ImageView)findViewById(R.id.icon5);
+        icon6 = (ImageView)findViewById(R.id.icon6);
+        icon7 = (ImageView)findViewById(R.id.icon7);
+        next = (ImageButton)findViewById(R.id.next);
+        previous = (ImageButton)findViewById(R.id.previous);
         selectAge = (TextView)findViewById(R.id.selectAge);
         sharedPreferences = getSharedPreferences("ImageCheck", MODE_PRIVATE);
         imageCheck = sharedPreferences.getInt("ImageSet", 5);
 
         mDatabase = openOrCreateDatabase(DATABASE_NAME, MODE_PRIVATE, null);
 
-        next.setText(LanguageSetter.getresources().getString(R.string.next));
-        previous.setText(LanguageSetter.getresources().getString(R.string.previous));
         selectAge.setText(LanguageSetter.getresources().getString(R.string.age));
 
         DisplayMetrics displayMetrics = new DisplayMetrics();
@@ -92,6 +100,200 @@ public class AgeActivity extends AppCompatActivity {
 
         count = 1;
 
+        if (age == 4) {
+            bunny_img5.setImageAlpha(127);
+            bunny_img6.setImageAlpha(127);
+            bunny_img7.setImageAlpha(127);
+            icon5.setImageAlpha(127);
+            icon6.setImageAlpha(127);
+            icon7.setImageAlpha(127);
+            bunny_img4.setImageAlpha(255);
+            icon4.setImageAlpha(255);
+        }
+        else if (age == 5) {
+            bunny_img4.setImageAlpha(127);
+            bunny_img6.setImageAlpha(127);
+            bunny_img7.setImageAlpha(127);
+            icon4.setImageAlpha(127);
+            icon6.setImageAlpha(127);
+            icon7.setImageAlpha(127);
+            bunny_img5.setImageAlpha(255);
+            icon5.setImageAlpha(255);
+        }
+        else if (age == 6) {
+            bunny_img4.setImageAlpha(127);
+            bunny_img5.setImageAlpha(127);
+            bunny_img7.setImageAlpha(127);
+            icon4.setImageAlpha(127);
+            icon5.setImageAlpha(127);
+            icon7.setImageAlpha(127);
+            bunny_img6.setImageAlpha(255);
+            icon6.setImageAlpha(255);
+        }
+        else if (age == 7) {
+            bunny_img4.setImageAlpha(127);
+            bunny_img5.setImageAlpha(127);
+            bunny_img6.setImageAlpha(127);
+            icon4.setImageAlpha(127);
+            icon5.setImageAlpha(127);
+            icon6.setImageAlpha(127);
+            bunny_img7.setImageAlpha(255);
+            icon7.setImageAlpha(255);
+        }
+
+        final Handler handler = new Handler();
+        handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        Animation animZoomOut = AnimationUtils.loadAnimation(getApplicationContext(),R.anim.zoom_out);
+                        next.startAnimation(animZoomOut);
+                        handler.postDelayed(this, 750);
+
+                    }
+                });
+            }
+        }, 0);
+
+        bunny_img4.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img5.setImageAlpha(127);
+                bunny_img6.setImageAlpha(127);
+                bunny_img7.setImageAlpha(127);
+                icon5.setImageAlpha(127);
+                icon6.setImageAlpha(127);
+                icon7.setImageAlpha(127);
+                bunny_img4.setImageAlpha(255);
+                icon4.setImageAlpha(255);
+                age = 4;
+            }
+        });
+
+        icon4.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img5.setImageAlpha(127);
+                bunny_img6.setImageAlpha(127);
+                bunny_img7.setImageAlpha(127);
+                icon5.setImageAlpha(127);
+                icon6.setImageAlpha(127);
+                icon7.setImageAlpha(127);
+                bunny_img4.setImageAlpha(255);
+                icon4.setImageAlpha(255);
+                age = 4;
+            }
+        });
+
+        bunny_img5.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img4.setImageAlpha(127);
+                bunny_img6.setImageAlpha(127);
+                bunny_img7.setImageAlpha(127);
+                icon4.setImageAlpha(127);
+                icon6.setImageAlpha(127);
+                icon7.setImageAlpha(127);
+                bunny_img5.setImageAlpha(255);
+                icon5.setImageAlpha(255);
+                age = 5;
+            }
+        });
+
+        icon5.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img4.setImageAlpha(127);
+                bunny_img6.setImageAlpha(127);
+                bunny_img7.setImageAlpha(127);
+                icon4.setImageAlpha(127);
+                icon6.setImageAlpha(127);
+                icon7.setImageAlpha(127);
+                bunny_img5.setImageAlpha(255);
+                icon5.setImageAlpha(255);
+                age = 5;
+            }
+        });
+
+        bunny_img6.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img4.setImageAlpha(127);
+                bunny_img5.setImageAlpha(127);
+                bunny_img7.setImageAlpha(127);
+                icon4.setImageAlpha(127);
+                icon5.setImageAlpha(127);
+                icon7.setImageAlpha(127);
+                bunny_img6.setImageAlpha(255);
+                icon6.setImageAlpha(255);
+                age = 6;
+            }
+        });
+
+        icon6.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img4.setImageAlpha(127);
+                bunny_img5.setImageAlpha(127);
+                bunny_img7.setImageAlpha(127);
+                icon4.setImageAlpha(127);
+                icon5.setImageAlpha(127);
+                icon7.setImageAlpha(127);
+                bunny_img6.setImageAlpha(255);
+                icon6.setImageAlpha(255);
+                age = 6;
+            }
+        });
+
+        bunny_img7.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img4.setImageAlpha(127);
+                bunny_img5.setImageAlpha(127);
+                bunny_img6.setImageAlpha(127);
+                icon4.setImageAlpha(127);
+                icon5.setImageAlpha(127);
+                icon6.setImageAlpha(127);
+                bunny_img7.setImageAlpha(255);
+                icon7.setImageAlpha(255);
+                age = 7;
+            }
+        });
+
+        icon7.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mp = MediaPlayer.create(getApplicationContext(), R.raw.button_click);
+                mp.start();
+                bunny_img4.setImageAlpha(127);
+                bunny_img5.setImageAlpha(127);
+                bunny_img6.setImageAlpha(127);
+                icon4.setImageAlpha(127);
+                icon5.setImageAlpha(127);
+                icon6.setImageAlpha(127);
+                bunny_img7.setImageAlpha(255);
+                icon7.setImageAlpha(255);
+                age = 7;
+            }
+        });
+
+        /*
         right_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -126,26 +328,22 @@ public class AgeActivity extends AppCompatActivity {
             }
 
         });
+        */
 
         next.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+
+                if (age == 0) {
+                    Toast.makeText(getApplicationContext(), LanguageSetter.getresources().getString(R.string.agenull), Toast.LENGTH_SHORT).show();
+                }
+                else {
                     //saveDataToOnlineDB();
                     createTable();
                     saveDataToLocalDB();
+                    finish();
                     startActivity(new Intent(AgeActivity.this, ParentDetailsActivity.class));
-
-                 /*if(imageCheck==1) {
-                    Intent navInt = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
-                    startActivity(navInt);
-
-                }
-                else{
-
                 }
-                     */
-
-                //startActivity(new Intent(AgeActivity.this, NavigationDrawerActivity.class));
             }
         });
 
@@ -188,6 +386,7 @@ public class AgeActivity extends AppCompatActivity {
 
     /*************************************************************************************************/
 
+    /*
     public void setAge() {
         if ( count == 1 ) {
             age = 4;
@@ -215,6 +414,8 @@ public class AgeActivity extends AppCompatActivity {
         }
     }
 
+     */
+
     /*************************************************************************************************/
 
     /*

app/src/main/java/com/anuththara18/attentionassessment/gender/GenderActivity.java

@@ -17,6 +17,7 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.anuththara18.attentionassessment.R;
 import com.anuththara18.attentionassessment.age.AgeActivity;
@@ -30,7 +31,7 @@ public class GenderActivity extends AppCompatActivity {
     ImageView girl_img, boy_img;
     TextView boy_txt, girl_txt, selectGender;
 
-    public static int gender = 2;
+    public static int gender = 0;
 
     int click = 1;
     MediaPlayer mp;
@@ -60,11 +61,18 @@ public class GenderActivity extends AppCompatActivity {
         boy_txt.setText(LanguageSetter.getresources().getString(R.string.boy));
         selectGender.setText(LanguageSetter.getresources().getString(R.string.gender));
 
-        // initially
+        if (gender == 1) {
+            boy_img.setImageAlpha(127);
+            boy_txt.setAlpha(0.5f);
+            girl_img.setImageAlpha(255);
+            girl_txt.setAlpha(1f);
+        }
+        else if (gender == 2) {
             girl_img.setImageAlpha(127);
             girl_txt.setAlpha(0.5f);
             boy_img.setImageAlpha(255);
             boy_txt.setAlpha(1f);
+        }
 
         final Handler handler = new Handler();
         handler.postDelayed(new Runnable() {
@@ -173,10 +181,16 @@ public class GenderActivity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
 
+                if (gender == 0) {
+                    Toast.makeText(getApplicationContext(), LanguageSetter.getresources().getString(R.string.gendernull), Toast.LENGTH_SHORT).show();
+                }
+                else{
                     finish();
                     Intent intent = new Intent(GenderActivity.this, AgeActivity.class);
                     startActivity(intent);
                 }
+
+            }
         });
 
         previous.setOnClickListener(new View.OnClickListener() {

app/src/main/java/com/anuththara18/attentionassessment/language/LanguageActivity.java

@@ -64,6 +64,19 @@ public class LanguageActivity extends AppCompatActivity {
 
         int bt_notes_blink = 0;
 
+        if (text.equals("English")){
+            sinhala_btn.setImageAlpha(127);
+            sinhala_txt_btn.setAlpha(0.5f);
+            english_btn.setImageAlpha(255);
+            english_txt.setAlpha(1f);
+        }
+        else if (text.equals("සිංහල")){
+            english_btn.setImageAlpha(127);
+            english_txt.setAlpha(0.5f);
+            sinhala_btn.setImageAlpha(255);
+            sinhala_txt_btn.setAlpha(1f);
+        }
+
         final Handler handler = new Handler();
         handler.postDelayed(new Runnable() {
             @Override

app/src/main/res/layout/activity_age.xml

@@ -7,22 +7,26 @@
     android:background="@drawable/bg2"
     tools:context=".age.AgeActivity">
 
-    <TextView
+    <ImageButton
         android:id="@+id/previous"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:drawableStart="@drawable/icon_left"
-        android:drawableTint="@color/black"
-        android:fontFamily="@font/poppins_medium"
-        android:gravity="center"
-        android:paddingLeft="30dp"
-        android:text="@string/previous"
-        android:textColor="@color/black"
-        android:textSize="16dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/left_btn"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageButton
+        android:id="@+id/next"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="20dp"
+        android:background="@drawable/right_btn"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
         android:id="@+id/selectAge"
         android:layout_width="wrap_content"
@@ -40,76 +44,89 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/next"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
-        android:drawableEnd="@drawable/icon_right"
-        android:drawableTint="@color/black"
-        android:fontFamily="@font/poppins_medium"
-        android:gravity="center"
-        android:paddingRight="30dp"
-        android:text="@string/next"
-        android:textColor="@color/black"
-        android:textSize="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
+    <ImageView
+        android:id="@+id/bunny_img4"
+        android:layout_width="200dp"
+        android:layout_height="170dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="70dp"
+        android:src="@drawable/age_bunny"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="match_parent"
-        android:layout_height="125dp"
-        android:layout_marginBottom="-8dp"
-        android:src="@drawable/stick"
+        android:id="@+id/bunny_img5"
+        android:layout_width="200dp"
+        android:layout_height="170dp"
+        android:layout_marginStart="180dp"
+        android:layout_marginBottom="10dp"
+        android:src="@drawable/age_bunny2"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
-        android:id="@+id/bunny_img"
-        android:layout_width="220dp"
-        android:layout_height="190dp"
-        android:layout_marginStart="40dp"
-        android:layout_marginBottom="108dp"
+        android:id="@+id/bunny_img6"
+        android:layout_width="200dp"
+        android:layout_height="170dp"
+        android:layout_marginStart="350dp"
         android:src="@drawable/age_bunny"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:layout_marginTop="75dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/age_txt"
-        android:layout_width="54dp"
-        android:layout_height="113dp"
-        android:layout_marginStart="128dp"
+    <ImageView
+        android:id="@+id/bunny_img7"
+        android:layout_width="200dp"
+        android:layout_height="170dp"
+        android:layout_marginEnd="10dp"
         android:layout_marginBottom="10dp"
-        android:fontFamily="@font/poppins_bold"
-        android:text="4"
-        android:textColor="@color/black"
-        android:textSize="78dp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/bunny_img"
-        app:layout_constraintStart_toStartOf="@+id/bunny_img" />
-
-    <ImageButton
-        android:id="@+id/right_btn"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_marginEnd="18dp"
-        android:layout_marginBottom="25dp"
-        android:background="@drawable/right_btn"
+        android:src="@drawable/age_bunny2"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <ImageButton
-        android:id="@+id/left_btn"
+    <ImageView
+        android:id="@+id/icon4"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:layout_marginEnd="20dp"
+        android:src="@drawable/icon4"
+        app:layout_constraintBottom_toBottomOf="@+id/bunny_img4"
+        app:layout_constraintEnd_toEndOf="@+id/bunny_img4"
+        app:layout_constraintTop_toTopOf="@+id/bunny_img4"
+        app:layout_constraintVertical_bias="0.811" />
+
+    <ImageView
+        android:id="@+id/icon5"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_marginStart="18dp"
-        android:layout_marginBottom="25dp"
-        android:background="@drawable/left_btn"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        android:layout_marginStart="35dp"
+        android:src="@drawable/icon5"
+        app:layout_constraintBottom_toBottomOf="@+id/bunny_img5"
+        app:layout_constraintStart_toStartOf="@+id/bunny_img5"
+        app:layout_constraintTop_toTopOf="@+id/bunny_img5"
+        app:layout_constraintVertical_bias="0.741" />
+
+    <ImageView
+        android:id="@+id/icon6"
+        android:layout_width="85dp"
+        android:layout_height="85dp"
+        android:layout_marginEnd="16dp"
+        android:src="@drawable/icon6"
+        app:layout_constraintBottom_toBottomOf="@+id/bunny_img6"
+        app:layout_constraintEnd_toEndOf="@+id/bunny_img6"
+        app:layout_constraintTop_toTopOf="@+id/bunny_img6"
+        app:layout_constraintVertical_bias="0.847" />
+
+    <ImageView
+        android:id="@+id/icon7"
+        android:layout_width="55dp"
+        android:layout_height="55dp"
+        android:layout_marginStart="28dp"
+        android:src="@drawable/icon7"
+        app:layout_constraintBottom_toBottomOf="@+id/bunny_img7"
+        app:layout_constraintStart_toStartOf="@+id/bunny_img7"
+        app:layout_constraintTop_toTopOf="@+id/bunny_img7"
+        app:layout_constraintVertical_bias="0.765" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/values-si/strings(si).xml

@@ -40,6 +40,8 @@
     <string name="consentForm">පර්යේෂණ අධ්‍යයනයකට සහභාගී වීමට කැමැත්ත දක්වන පෝරමය</string>
     <string name="clear">මකා දමන්න</string>
     <string name="save">සුරකින්න</string>
+    <string name="agenull">කරුණාකර වයස තෝරන්න</string>
+    <string name="gendernull">කරුණාකර ස්ත්‍රී පුරුෂ භාවය තෝරන්න</string>
 
     <!-- Login Screen -->
     <string name="welcome">ආයුබෝවන්!</string>

app/src/main/res/values/strings.xml

@@ -39,6 +39,8 @@
     <string name="consentForm">Consent Form To Participate in a Research Study</string>
     <string name="clear">Clear</string>
     <string name="save">Save</string>
+    <string name="agenull">Please select the age</string>
+    <string name="gendernull">Please select the gender</string>
 
     <!-- Login Screen -->
     <string name="welcome">Welcome!</string>