Focused Attention - Adding levels 3, 4 & 5

app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
         </activity>
         <activity
             android:name=".details.ParentDetailsActivity"
-            android:screenOrientation="landscape"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.NoActionBar"
             android:windowSoftInputMode="adjustPan|stateHidden"></activity>
         <activity
@@ -68,6 +68,10 @@
             android:name=".sustained.BirdChoosingActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
+        <activity
+            android:name=".focused.AnimalChoosingActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
         <activity
             android:name=".dividedattention.DACompleteScreen"
             android:screenOrientation="portrait"

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

@@ -133,12 +133,7 @@ public class AgeActivity extends AppCompatActivity {
                 //saveDataToOnlineDB();
                 createTable();
                 saveDataToLocalDB();
-
-                if (LanguageActivity.text.equals("English")) {
-                    startActivity(new Intent(AgeActivity.this, ConsentFormActivity.class));
-                } else {
-                    startActivity(new Intent(AgeActivity.this, SinhalaConsentFormActivity.class));
-                }
+                startActivity(new Intent(AgeActivity.this, ParentDetailsActivity.class));
 
                  /*if(imageCheck==1) {
                     Intent navInt = new Intent(getApplicationContext(), NavigationDrawerActivity.class);

app/src/main/java/com/anuththara18/attentionassessment/alternating/AlternatingAttentionGame1.java

@@ -72,14 +72,14 @@ public class AlternatingAttentionGame1 extends AppCompatActivity {
             R.drawable.motor_piggy,
             R.drawable.waving_dog,
             R.drawable.dancing_cat,
-            R.drawable.blue_bird2_gif,
+            R.drawable.walking_unicorn,
             R.drawable.yellow_bird_gif};
 
     Integer[] right_images = { R.drawable.dancing_star,
             R.drawable.blowing_crab,
             R.drawable.swimming_fish,
             R.drawable.blue_fishy,
-            R.drawable.blue_bird2_gif,
+            R.drawable.brown_octopus,
             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};
@@ -151,7 +151,7 @@ public class AlternatingAttentionGame1 extends AppCompatActivity {
                         //imageView2.setVisibility(View.INVISIBLE);
                         imageView2.setImageResource(0);
                         imageView1.setVisibility(View.VISIBLE);
-                        if (leftcount > 3 ){
+                        if (leftcount > 4 ){
                             leftcount = 0;
                         }
                         imageView1.setImageResource(left_images[leftcount]);
@@ -172,7 +172,7 @@ public class AlternatingAttentionGame1 extends AppCompatActivity {
                         //imageView1.setVisibility(View.INVISIBLE);
                         imageView1.setImageResource(0);
                         imageView2.setVisibility(View.VISIBLE);
-                        if (rightcount > 3 ){
+                        if (rightcount > 4 ){
                             rightcount = 0;
                         }
                         imageView2.setImageResource(right_images[rightcount]);

app/src/main/java/com/anuththara18/attentionassessment/details/ParentDetailsActivity.java

@@ -15,6 +15,8 @@ import android.widget.Toast;
 
 import com.anuththara18.attentionassessment.R;
 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.language.LanguageActivity;
 import com.anuththara18.attentionassessment.language.LanguageSetter;
@@ -24,8 +26,8 @@ import java.util.regex.Pattern;
 
 public class ParentDetailsActivity extends AppCompatActivity {
 
-    TextView name, email, contact, next, previous, opt1, opt2, opt3;
-    EditText childName, parentEmail, parentContact;
+    TextView name, email, contact, next, previous, opt1, opt2, opt3, req, diag;
+    EditText childName, parentEmail, parentContact, diagnosis;
     public static String child_name, parent_email, parent_contact;
 
     @Override
@@ -48,6 +50,9 @@ public class ParentDetailsActivity extends AppCompatActivity {
         opt1 = findViewById(R.id.opt1);
         opt2 = findViewById(R.id.opt2);
         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);
         parentEmail  = findViewById(R.id.parentEmail);
@@ -61,6 +66,8 @@ public class ParentDetailsActivity extends AppCompatActivity {
         opt1.setText(LanguageSetter.getresources().getString(R.string.optional));
         opt2.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();
         parent_email = parentEmail.getText().toString();
@@ -69,7 +76,7 @@ public class ParentDetailsActivity extends AppCompatActivity {
         previous.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(ParentDetailsActivity.this, LanguageActivity.class);
+                Intent intent = new Intent(ParentDetailsActivity.this, AgeActivity.class);
                 startActivity(intent);
             }
         });
@@ -86,8 +93,11 @@ public class ParentDetailsActivity extends AppCompatActivity {
                     parentContact.setError("Enter Valid Number\nEg: 0771234567");
                 }
                 else {
-                    Intent intent = new Intent(ParentDetailsActivity.this, GenderActivity.class);
-                    startActivity(intent);
+                   if (LanguageActivity.text.equals("English")) {
+                       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

+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/gender/GenderActivity.java

@@ -103,7 +103,7 @@ public class GenderActivity extends AppCompatActivity {
         previous.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(GenderActivity.this, ParentDetailsActivity.class);
+                Intent intent = new Intent(GenderActivity.this, LanguageActivity.class);
                 startActivity(intent);
             }
         });

app/src/main/java/com/anuththara18/attentionassessment/home/MainFragment.java

@@ -16,6 +16,7 @@ import com.anuththara18.attentionassessment.R;
 import com.anuththara18.attentionassessment.alternating.AlternatingAttentionGame1;
 import com.anuththara18.attentionassessment.dividedattention.DividedAttentionGame1;
 import com.anuththara18.attentionassessment.focused.FocusedAttentionGame1;
+import com.anuththara18.attentionassessment.map.Map1Activity;
 import com.anuththara18.attentionassessment.map.Map2Activity;
 import com.anuththara18.attentionassessment.sustained.BirdChoosingActivity;
 
@@ -52,7 +53,7 @@ public class MainFragment extends Fragment {
             @Override
             public void onClick(View view) {
                 mp.start();
-                Intent intent = new Intent(getContext(), FocusedAttentionGame1.class);
+                Intent intent = new Intent(getContext(), Map1Activity.class);
                 startActivity(intent);
             }
         });

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

@@ -94,7 +94,7 @@ public class LanguageActivity extends AppCompatActivity {
                     Toast.makeText(getApplicationContext(), "Please select a language", Toast.LENGTH_SHORT).show();
                 }
                 else {
-                    Intent intent = new Intent(LanguageActivity.this, ParentDetailsActivity.class);
+                    Intent intent = new Intent(LanguageActivity.this, GenderActivity.class);
                     startActivity(intent);
                 }
             }

app/src/main/java/com/anuththara18/attentionassessment/map/Map1Activity.java

@@ -2,11 +2,16 @@ package com.anuththara18.attentionassessment.map;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ImageButton;
 
 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 {
 
@@ -29,6 +34,9 @@ public class Map1Activity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 level = 1;
+                Intent intent = new Intent(getApplicationContext(), FocusedAttentionGame2.class);
+                finish();
+                startActivity(intent);
             }
         });
 
@@ -36,6 +44,9 @@ public class Map1Activity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 level = 2;
+                Intent intent = new Intent(getApplicationContext(), FocusedAttentionGame2.class);
+                finish();
+                startActivity(intent);
             }
         });
 
@@ -43,6 +54,9 @@ public class Map1Activity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 level = 3;
+                Intent intent = new Intent(getApplicationContext(), AnimalChoosingActivity.class);
+                finish();
+                startActivity(intent);
             }
         });
 
@@ -50,6 +64,9 @@ public class Map1Activity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 level = 4;
+                Intent intent = new Intent(getApplicationContext(), AnimalChoosingActivity.class);
+                finish();
+                startActivity(intent);
             }
         });
 
@@ -57,6 +74,9 @@ public class Map1Activity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 level = 5;
+                Intent intent = new Intent(getApplicationContext(), AnimalChoosingActivity.class);
+                finish();
+                startActivity(intent);
             }
         });
 

app/src/main/java/com/anuththara18/attentionassessment/selective/SelectiveAttentionGame1.java

@@ -415,7 +415,7 @@ public class SelectiveAttentionGame1 extends AppCompatActivity {
 
                     GVAdapter2 adapter = new GVAdapter2(getApplicationContext(), gridModelArrayList);
                     gridView.setAdapter(adapter);
-
+                    gridView.setEnabled(false);
                     saveDataToOnlineDB();
                     createTable();
                     saveDataToLocalDB();

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

@@ -55,7 +55,7 @@
         android:id="@+id/imageView1"
         android:layout_width="200dp"
         android:layout_height="200dp"
-        android:src="@drawable/red_angry_bird"
+        android:src="@drawable/walking_unicorn"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/imageView6"
         app:layout_constraintHorizontal_bias="0.5"
@@ -66,7 +66,7 @@
         android:id="@+id/imageView2"
         android:layout_width="200dp"
         android:layout_height="200dp"
-        android:src="@drawable/blowing_crab"
+        android:src="@drawable/brown_octopus"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

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

+<?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

@@ -4,14 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg1"
+    android:background="@drawable/bg5"
     tools:context=".details.ParentDetailsActivity">
 
     <TextView
         android:id="@+id/previous"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="25dp"
         android:drawableStart="@drawable/icon_left"
         android:drawableTint="@color/black"
         android:fontFamily="@font/poppins_medium"
@@ -27,7 +27,7 @@
         android:id="@+id/next"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="25dp"
         android:drawableEnd="@drawable/icon_right"
         android:drawableTint="@color/black"
         android:fontFamily="@font/poppins_medium"
@@ -53,6 +53,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="25dp"
             android:orientation="horizontal" >
 
             <TextView
@@ -83,14 +84,14 @@
         android:layout_height="wrap_content"
         android:hint="Child Name"
         android:textColorHint="#575757"
-        android:fontFamily="@font/poppins_bold"
+        android:fontFamily="@font/poppins_medium"
         android:textColor="@color/black"
-        android:textSize="18sp"
-        android:textStyle="bold" />
+        android:textSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:orientation="horizontal" >
 
         <TextView
@@ -123,14 +124,14 @@
             android:layout_height="wrap_content"
             android:hint="xxxxx@gmail.com"
             android:textColorHint="#575757"
-            android:fontFamily="@font/poppins_bold"
+            android:fontFamily="@font/poppins_medium"
             android:textColor="@color/black"
-            android:textSize="18sp"
-            android:textStyle="bold" />
+            android:textSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
         android:orientation="horizontal" >
 
         <TextView
@@ -162,11 +163,50 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="0771234567"
-            android:fontFamily="@font/poppins_bold"
+            android:fontFamily="@font/poppins_medium"
             android:textColorHint="#575757"
             android:textColor="@color/black"
-            android:textSize="18sp"
-            android:textStyle="bold" />
+            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: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>
 
@@ -174,8 +214,8 @@
         android:id="@+id/imageView"
         android:layout_width="match_parent"
         android:layout_height="110dp"
-        android:layout_marginBottom="-8dp"
-        android:src="@drawable/grass1"
+        android:layout_marginBottom="-15dp"
+        android:src="@drawable/grass2"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="1.0"

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

@@ -19,7 +19,9 @@
     <string name="parentEmail">විද්යුත් තැපෑල් ලිපිනය:</string>
     <string name="parentContact">දුරකතන අංකය :</string>
     <string name="optional">* විකල්ප</string>
+    <string name="req">* අවශ්යයි</string>
     <string name="send">දත්ත යවන්න</string>
+    <string name="diagnosis">ඔබේ දරුවා අවධානය යොමු කිරීමේ දුර්වලතාවයකින් පෙළෙනවාද?</string>
 
     <string name="select">තෝරන්න</string>
     <string name="birdselect">ඔබ වඩාත්ම කැමති චරිතය තෝරන්න</string>

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

@@ -18,7 +18,9 @@
     <string name="parentEmail">Email :</string>
     <string name="parentContact">Contact Number :</string>
     <string name="optional">* Optional</string>
+    <string name="req">* Required</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="birdselect">Pick your favourite character</string>