diff --git a/app/src/main/java/com/anuththara18/attentionassessment/consentform/ConsentFormActivity.java b/app/src/main/java/com/anuththara18/attentionassessment/consentform/ConsentFormActivity.java index da4e2287e80b154d622535f9bd90ba6538b29339..58ee8a976dacd504e9eb77cc216b5a063e4c252e 100644 --- a/app/src/main/java/com/anuththara18/attentionassessment/consentform/ConsentFormActivity.java +++ b/app/src/main/java/com/anuththara18/attentionassessment/consentform/ConsentFormActivity.java @@ -3,9 +3,13 @@ package com.anuththara18.attentionassessment.consentform; import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.os.Handler; import android.view.View; import android.view.WindowManager; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.Button; +import android.widget.ImageButton; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; @@ -25,7 +29,8 @@ public class ConsentFormActivity extends AppCompatActivity { RecyclerView recyclerView; List<ConsentForm> consentFormList; private Boolean[] chkArr; - TextView textView, next; + TextView textView; + ImageButton next; @Override protected void onCreate(Bundle savedInstanceState) { @@ -43,6 +48,22 @@ public class ConsentFormActivity extends AppCompatActivity { textView = findViewById(R.id.textView); next = findViewById(R.id.next); + 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); + if (ParentDetailsActivity.nav == 0) { next.setVisibility(View.INVISIBLE); next.setEnabled(false); @@ -53,7 +74,6 @@ public class ConsentFormActivity extends AppCompatActivity { } textView.setText(LanguageSetter.getresources().getString(R.string.consentForm)); - next.setText(LanguageSetter.getresources().getString(R.string.proceed)); initData(); initRecyclerView(); @@ -61,6 +81,7 @@ public class ConsentFormActivity extends AppCompatActivity { next.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + finish(); Intent intent = new Intent(getApplicationContext(), GetParentsConsentActivity.class); startActivity(intent); } diff --git a/app/src/main/java/com/anuththara18/attentionassessment/consentform/SinhalaConsentFormActivity.java b/app/src/main/java/com/anuththara18/attentionassessment/consentform/SinhalaConsentFormActivity.java index a7be6cb6777ed7d97552d36b5e066f94c539c63d..e7044ef44c2c7e26deb9839373781e47ed791be6 100644 --- a/app/src/main/java/com/anuththara18/attentionassessment/consentform/SinhalaConsentFormActivity.java +++ b/app/src/main/java/com/anuththara18/attentionassessment/consentform/SinhalaConsentFormActivity.java @@ -3,8 +3,12 @@ package com.anuththara18.attentionassessment.consentform; import android.content.Intent; import android.os.Build; import android.os.Bundle; +import android.os.Handler; import android.view.View; import android.view.WindowManager; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; +import android.widget.ImageButton; import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; @@ -22,7 +26,8 @@ public class SinhalaConsentFormActivity extends AppCompatActivity { RecyclerView recyclerView; List<ConsentForm> consentFormList; private Boolean[] chkArr; - TextView textView, next; + TextView textView; + ImageButton next; @Override protected void onCreate(Bundle savedInstanceState) { @@ -41,15 +46,31 @@ public class SinhalaConsentFormActivity extends AppCompatActivity { next = findViewById(R.id.next); textView.setText(LanguageSetter.getresources().getString(R.string.consentForm)); - next.setText(LanguageSetter.getresources().getString(R.string.proceed)); + + 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); initData(); initRecyclerView(); - TextView next = findViewById(R.id.next); + next = findViewById(R.id.next); next.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + finish(); Intent intent = new Intent(getApplicationContext(), GetParentsConsentActivity.class); startActivity(intent); } diff --git a/app/src/main/res/layout/activity_consent_form.xml b/app/src/main/res/layout/activity_consent_form.xml index 044a87fd8d9e69911c1df2d8212e0ba9209be714..4e3ac86d6f0bef99e56f4b526c909ecf15450bd2 100644 --- a/app/src/main/res/layout/activity_consent_form.xml +++ b/app/src/main/res/layout/activity_consent_form.xml @@ -9,20 +9,19 @@ android:background="#F6F6F6" tools:context=".consentform.ConsentFormActivity"> - <TextView + <ImageButton android:id="@+id/next" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="20dp" - android:drawableEnd="@drawable/icon_right" - android:drawableTint="@color/black" - android:gravity="right" - android:paddingRight="30dp" - android:text="@string/proceed" - android:textColor="@color/black" - android:textSize="16dp" /> + android:layout_width="50dp" + android:layout_height="50dp" + android:layout_marginRight="25dp" + android:layout_marginTop="25dp" + android:layout_gravity="right" + android:background="@drawable/right_btn" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + - <TextView + <TextView android:id="@+id/textView" android:layout_width="match_parent" android:layout_height="wrap_content"