From 2836fb74305db7345cbb48e9a92d92c6ce9c51d5 Mon Sep 17 00:00:00 2001
From: Anuththara18 <anuththarajayakody18@gmial.com>
Date: Mon, 2 May 2022 21:53:24 +0530
Subject: [PATCH] Consent Form UI Modification
---
.../consentform/ConsentFormActivity.java | 25 +++++++++++++++--
.../SinhalaConsentFormActivity.java | 27 ++++++++++++++++---
.../main/res/layout/activity_consent_form.xml | 23 ++++++++--------
3 files changed, 58 insertions(+), 17 deletions(-)
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 da4e228..58ee8a9 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 a7be6cb..e7044ef 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 044a87f..4e3ac86 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"
--
2.24.1