From 1937c989622ae02fd4c66eb7633dafd9006b8a6e Mon Sep 17 00:00:00 2001
From: Matheus Horstmann <mch15@inf.ufpr.br>
Date: Wed, 22 Feb 2017 09:58:51 -0300
Subject: [PATCH] Add progress bar
Signed-off-by: Matheus Horstmann <mch15@inf.ufpr.br>
---
.../agendador/agendador/SignupActivity.java | 42 +
.../agendador/presenters/SignupPresenter.java | 6 +-
.../agendador/agendador/views/SignupView.java | 2 +
app/src/main/res/layout/activity_signup.xml | 1096 +++++++++--------
4 files changed, 604 insertions(+), 542 deletions(-)
diff --git a/app/src/main/java/br/ufpr/c3sl/agendador/agendador/SignupActivity.java b/app/src/main/java/br/ufpr/c3sl/agendador/agendador/SignupActivity.java
index e863e5e..8d5b793 100644
--- a/app/src/main/java/br/ufpr/c3sl/agendador/agendador/SignupActivity.java
+++ b/app/src/main/java/br/ufpr/c3sl/agendador/agendador/SignupActivity.java
@@ -11,6 +11,7 @@ import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.ProgressBar;
import android.widget.TextView;
import java.util.HashMap;
@@ -279,6 +280,47 @@ public class SignupActivity extends AppCompatActivity implements SignupView {
return values;
}
+ @Override
+ public void setProgressBar(boolean enabled) {
+ ProgressBar pb_login = (ProgressBar) findViewById(R.id.pb_signupact);
+
+
+ if (enabled) {
+ pb_login.setVisibility(View.VISIBLE);
+ et_name.setEnabled(false);
+ et_birthday.setEnabled(false);
+ et_cep.setEnabled(false);
+ et_address.setEnabled(false);
+ et_neighborhood.setEnabled(false);
+ et_city.setEnabled(false);
+ et_state.setEnabled(false);
+ et_email.setEnabled(false);
+ et_password_confirm.setEnabled(false);
+ et_phone.setEnabled(false);
+ et_rg.setEnabled(false);
+ et_cpf.setEnabled(false);
+ et_password.setEnabled(false);
+ btn_signup.setEnabled(false);
+ } else {
+ pb_login.setVisibility(View.INVISIBLE);
+ et_name.setEnabled(true);
+ et_birthday.setEnabled(true);
+ et_cep.setEnabled(true);
+ et_address.setEnabled(true);
+ et_neighborhood.setEnabled(true);
+ et_city.setEnabled(true);
+ et_state.setEnabled(true);
+ et_email.setEnabled(true);
+ et_password_confirm.setEnabled(true);
+ et_phone.setEnabled(true);
+ et_rg.setEnabled(true);
+ et_cpf.setEnabled(true);
+ et_password.setEnabled(true);
+ btn_signup.setEnabled(true);
+ }
+ }
+
+
}
diff --git a/app/src/main/java/br/ufpr/c3sl/agendador/agendador/presenters/SignupPresenter.java b/app/src/main/java/br/ufpr/c3sl/agendador/agendador/presenters/SignupPresenter.java
index b6994fd..41cbfca 100644
--- a/app/src/main/java/br/ufpr/c3sl/agendador/agendador/presenters/SignupPresenter.java
+++ b/app/src/main/java/br/ufpr/c3sl/agendador/agendador/presenters/SignupPresenter.java
@@ -58,6 +58,7 @@ public class SignupPresenter extends BasePresenter<SignupView> {
body.get("password_confirmation"), body.get("name"), body.get("phone1"), body.get("rg"), body.get("cep"));
Call<AccountOutput> listCall = service.signUp(user);
+ signupPresenter.view().setProgressBar(true);
listCall.enqueue(new Callback<AccountOutput>() {
@@ -67,13 +68,15 @@ public class SignupPresenter extends BasePresenter<SignupView> {
int status = response.code();
AccountOutput accountOutput = response.body();
+
switch (status) {
case 422:
// TODO: Add error message
+ signupPresenter.view().setProgressBar(false);
break;
case 201:
+ signupPresenter.view().setProgressBar(false);
onSuccessfulSignUp(accountOutput, headers);
-
Intent intent = new Intent(context, HomeActivity.class);
context.startActivity(intent);
break;
@@ -84,6 +87,7 @@ public class SignupPresenter extends BasePresenter<SignupView> {
@Override
public void onFailure(Call<AccountOutput> call, Throwable t) {
+ signupPresenter.view().setProgressBar(true);
}
});
diff --git a/app/src/main/java/br/ufpr/c3sl/agendador/agendador/views/SignupView.java b/app/src/main/java/br/ufpr/c3sl/agendador/agendador/views/SignupView.java
index 1f6e4de..2c69a9d 100644
--- a/app/src/main/java/br/ufpr/c3sl/agendador/agendador/views/SignupView.java
+++ b/app/src/main/java/br/ufpr/c3sl/agendador/agendador/views/SignupView.java
@@ -11,6 +11,8 @@ public interface SignupView {
boolean validateData();
+ void setProgressBar(boolean enabled);
+
}
diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
index 1520c62..d166852 100644
--- a/app/src/main/res/layout/activity_signup.xml
+++ b/app/src/main/res/layout/activity_signup.xml
@@ -1,580 +1,594 @@
<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <RelativeLayout
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/colorGray">
-
- <ImageView
- android:layout_width="120dp"
- android:layout_height="112dp"
- android:layout_marginTop="40dp"
- android:src="@drawable/img_signupact_logo"
- android:id="@+id/img_signupact"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true" />
-
- <TextView
- android:id="@+id/tv_signup_obligatory_field"
- android:layout_width="wrap_content"
+ <ScrollView android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <RelativeLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/img_signupact"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="18dp"
- android:textColor="@color/colorGreen"
- android:text="@string/obligatory_field_singup"
- android:textSize="14sp"/>
- <LinearLayout
- android:id="@+id/ll_signupact_name_container"
- android:layout_below="@+id/tv_signup_obligatory_field"
- android:layout_width="290dp"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="10dp"
- android:layout_marginStart="50dp"
- android:background="@drawable/white_container_shape">
- <FrameLayout
+ android:background="@color/colorGray">
+
+ <ImageView
+ android:layout_width="120dp"
+ android:layout_height="112dp"
+ android:layout_marginTop="40dp"
+ android:src="@drawable/img_signupact_logo"
+ android:id="@+id/img_signupact"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true" />
+
+ <TextView
+ android:id="@+id/tv_signup_obligatory_field"
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
- <TextView
- android:id="@+id/tv_signup_name"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/img_signupact"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="18dp"
+ android:textColor="@color/colorGreen"
+ android:text="@string/obligatory_field_singup"
+ android:textSize="14sp"/>
+ <LinearLayout
+ android:id="@+id/ll_signupact_name_container"
+ android:layout_below="@+id/tv_signup_obligatory_field"
+ android:layout_width="290dp"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
+ android:layout_marginStart="50dp"
+ android:background="@drawable/white_container_shape">
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/singup_name"
- android:textColor="@color/colorGreen"
- android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_name_warning"
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/singup_name"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_name_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/signup_null_name"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+
+
+ <EditText
+ android:id="@+id/et_signup_name"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:inputType="textCapWords"
+ android:textSize="16sp"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_cpf_container"
+ android:layout_below="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/signup_null_name"
- android:visibility="invisible"/>
-
- </FrameLayout>
-
-
- <EditText
- android:id="@+id/et_signup_name"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:inputType="textCapWords"
- android:textSize="16sp"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_cpf_container"
- android:layout_below="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
- <TextView
- android:id="@+id/tv_signup_cpf"
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_cpf"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/singup_cpf"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_cpf_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/invalid_cpf"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+
+
+ <EditText
+ android:id="@+id/et_signup_cpf"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:textSize="16sp"
+ android:inputType="number"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_rg_container"
+ android:layout_below="@+id/ll_signupact_cpf_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/singup_cpf"
- android:textColor="@color/colorGreen"
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_rg"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/signup_rg"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_rg_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/invalid_rg"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+
+
+ <EditText
+ android:id="@+id/et_signup_rg"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_cpf_warning"
+ android:inputType="number"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_birthday_container"
+ android:layout_below="@+id/ll_signupact_rg_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
+
+
+
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/invalid_cpf"
- android:visibility="invisible"/>
-
- </FrameLayout>
-
-
- <EditText
- android:id="@+id/et_signup_cpf"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:textSize="16sp"
- android:inputType="number"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_rg_container"
- android:layout_below="@+id/ll_signupact_cpf_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_birthday"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/birthdate"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_birthday_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/invalid_birthdate"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+ <EditText
+ android:id="@+id/et_signup_birthday"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:textSize="16sp"
+ android:inputType="date"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/ll_signupact_cep_container"
+ android:layout_below="@+id/ll_signupact_birthday_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
<TextView
- android:id="@+id/tv_signup_rg"
+ android:id="@+id/tv_signup_cep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/signup_rg"
+ android:text="@string/cep"
android:textColor="@color/colorGreen"
android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_rg_warning"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/invalid_rg"
- android:visibility="invisible"/>
-
- </FrameLayout>
-
-
- <EditText
- android:id="@+id/et_signup_rg"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:textSize="16sp"
- android:inputType="number"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_birthday_container"
- android:layout_below="@+id/ll_signupact_rg_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
-
-
-
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
+ android:layout_gravity="center"
+ android:layout_marginRight="10dp"
+ android:layout_marginLeft="10dp"/>
+ <EditText
+ android:id="@+id/et_signup_cep"
+ android:focusable="false"
+ android:inputType="number"
+ android:maxLines="1"
+ android:textColor="@color/colorDisabled"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:layout_gravity="center"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/ll_signupact_address_container"
+ android:layout_below="@+id/ll_signupact_cep_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
<TextView
- android:id="@+id/tv_signup_birthday"
+ android:id="@+id/tv_signup_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/birthdate"
+ android:text="@string/address"
android:textColor="@color/colorGreen"
android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_birthday_warning"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/invalid_birthdate"
- android:visibility="invisible"/>
-
- </FrameLayout>
- <EditText
- android:id="@+id/et_signup_birthday"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:textSize="16sp"
- android:inputType="date"/>
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/ll_signupact_cep_container"
- android:layout_below="@+id/ll_signupact_birthday_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <TextView
- android:id="@+id/tv_signup_cep"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/cep"
- android:textColor="@color/colorGreen"
- android:textSize="16sp"
- android:layout_gravity="center"
- android:layout_marginRight="10dp"
- android:layout_marginLeft="10dp"/>
- <EditText
- android:id="@+id/et_signup_cep"
- android:focusable="false"
- android:inputType="number"
- android:maxLines="1"
- android:textColor="@color/colorDisabled"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:textSize="16sp"
- android:layout_gravity="center"/>
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/ll_signupact_address_container"
- android:layout_below="@+id/ll_signupact_cep_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <TextView
- android:id="@+id/tv_signup_address"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/address"
- android:textColor="@color/colorGreen"
- android:textSize="16sp"
- android:layout_gravity="center"
- android:layout_marginRight="10dp"
- android:layout_marginLeft="10dp"/>
- <EditText
- android:id="@+id/et_signup_address"
- android:focusable="false"
- android:inputType="text"
- android:maxLines="1"
- android:textColor="@color/colorDisabled"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:textSize="16sp"
- android:layout_gravity="center"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_neighborhood_container"
- android:layout_below="@+id/ll_signupact_address_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <TextView
- android:id="@+id/tv_signup_neighborhood"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/neighborhood"
- android:textColor="@color/colorGreen"
- android:textSize="16sp"
- android:layout_gravity="center"
- android:layout_marginRight="10dp"
- android:layout_marginLeft="10dp"/>
- <EditText
- android:id="@+id/et_signup_neighborhood"
- android:layout_width="match_parent"
- android:focusable="false"
- android:inputType="text"
- android:maxLines="1"
- android:textColor="@color/colorDisabled"
- android:layout_height="match_parent"
- android:textSize="16sp"
- android:layout_gravity="center"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_city_container"
- android:layout_below="@+id/ll_signupact_neighborhood_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <TextView
- android:id="@+id/tv_signup_city"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/city"
- android:textColor="@color/colorGreen"
- android:textSize="16sp"
- android:layout_gravity="center"
- android:layout_marginRight="10dp"
- android:layout_marginLeft="10dp"/>
- <EditText
- android:id="@+id/et_signup_city"
- android:layout_width="95dp"
- android:layout_height="match_parent"
- android:textSize="16sp"
- android:focusable="false"
- android:inputType="text"
- android:maxLines="1"
- android:textColor="@color/colorDisabled"
- android:layout_gravity="center"/>
- <TextView
- android:id="@+id/tv_signup_state"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/state"
- android:textColor="@color/colorGreen"
- android:textSize="16sp"
- android:layout_gravity="center"
-
- android:layout_marginRight="5dp"
- android:layout_marginLeft="5dp"/>
- <EditText
- android:id="@+id/et_signup_state"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:textSize="16sp"
- android:focusable="false"
- android:inputType="text"
- android:textColor="@color/colorDisabled"
- android:maxLines="1"
- android:layout_gravity="center"/>
-
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_phone_container"
- android:layout_below="@+id/ll_signupact_city_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
+ android:layout_gravity="center"
+ android:layout_marginRight="10dp"
+ android:layout_marginLeft="10dp"/>
+ <EditText
+ android:id="@+id/et_signup_address"
+ android:focusable="false"
+ android:inputType="text"
+ android:maxLines="1"
+ android:textColor="@color/colorDisabled"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:layout_gravity="center"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_neighborhood_container"
+ android:layout_below="@+id/ll_signupact_address_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
<TextView
- android:id="@+id/tv_signup_phone"
+ android:id="@+id/tv_signup_neighborhood"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/signup_phone"
+ android:text="@string/neighborhood"
android:textColor="@color/colorGreen"
android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_phone_warning"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/signup_invalid_phone"
- android:visibility="invisible"/>
-
- </FrameLayout>
-
-
- <EditText
- android:id="@+id/et_signup_phone"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:textSize="16sp"
- android:inputType="phone"/>
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/ll_signupact_email_container"
- android:layout_below="@+id/ll_signupact_phone_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
+ android:layout_gravity="center"
+ android:layout_marginRight="10dp"
+ android:layout_marginLeft="10dp"/>
+ <EditText
+ android:id="@+id/et_signup_neighborhood"
+ android:layout_width="match_parent"
+ android:focusable="false"
+ android:inputType="text"
+ android:maxLines="1"
+ android:textColor="@color/colorDisabled"
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:layout_gravity="center"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_city_container"
+ android:layout_below="@+id/ll_signupact_neighborhood_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
<TextView
- android:id="@+id/tv_signup_email"
+ android:id="@+id/tv_signup_city"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/signup_email"
+ android:text="@string/city"
android:textColor="@color/colorGreen"
android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_email_warning"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/invalid_email"
- android:visibility="invisible"/>
-
- </FrameLayout>
-
-
- <EditText
- android:id="@+id/et_signup_email"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:textSize="16sp"
- android:inputType="textEmailAddress"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_password_container"
- android:layout_below="@+id/ll_signupact_email_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
-
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
+ android:layout_gravity="center"
+ android:layout_marginRight="10dp"
+ android:layout_marginLeft="10dp"/>
+ <EditText
+ android:id="@+id/et_signup_city"
+ android:layout_width="95dp"
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:focusable="false"
+ android:inputType="text"
+ android:maxLines="1"
+ android:textColor="@color/colorDisabled"
+ android:layout_gravity="center"/>
<TextView
- android:id="@+id/tv_signup_password"
+ android:id="@+id/tv_signup_state"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="@string/signup_password"
+ android:text="@string/state"
android:textColor="@color/colorGreen"
android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_password_warning"
+ android:layout_gravity="center"
+
+ android:layout_marginRight="5dp"
+ android:layout_marginLeft="5dp"/>
+ <EditText
+ android:id="@+id/et_signup_state"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:focusable="false"
+ android:inputType="text"
+ android:textColor="@color/colorDisabled"
+ android:maxLines="1"
+ android:layout_gravity="center"/>
+
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_phone_container"
+ android:layout_below="@+id/ll_signupact_city_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/invalid_password"
- android:visibility="invisible"/>
-
- </FrameLayout>
-
- <EditText
- android:id="@+id/et_signup_password"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:textSize="16sp"
- android:layout_gravity="center"
- android:inputType="textPassword"/>
- </LinearLayout>
- <LinearLayout
- android:id="@+id/ll_signupact_password_confirm_container"
- android:layout_below="@+id/ll_signupact_password_container"
- android:layout_alignEnd="@+id/ll_signupact_name_container"
- android:layout_height="45dp"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="3dp"
- android:layout_alignStart="@id/ll_signupact_name_container"
- android:background="@drawable/white_container_shape"
- android:layout_width="wrap_content">
-
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center">
- <TextView
- android:id="@+id/tv_signup_confirm_password"
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_phone"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/signup_phone"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_phone_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/signup_invalid_phone"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+
+
+ <EditText
+ android:id="@+id/et_signup_phone"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:textSize="16sp"
+ android:inputType="phone"/>
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/ll_signupact_email_container"
+ android:layout_below="@+id/ll_signupact_phone_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/singup_confirmPassword"
- android:textColor="@color/colorGreen"
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_email"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/signup_email"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_email_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/invalid_email"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+
+
+ <EditText
+ android:id="@+id/et_signup_email"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
android:textSize="16sp"
- android:layout_gravity="center_vertical"
- android:layout_marginRight="12dp"
- android:layout_marginLeft="12dp"/>
-
- <TextView
- android:id="@+id/tv_signup_confirm_password_warning"
+ android:inputType="textEmailAddress"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_password_container"
+ android:layout_below="@+id/ll_signupact_email_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
+
+ <FrameLayout
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom"
- android:textSize="12sp"
- android:layout_marginStart="5dp"
- android:textColor="@color/colorRed"
- android:text="@string/invalid_password"
- android:visibility="invisible"/>
-
- </FrameLayout>
- <EditText
- android:id="@+id/et_signup_password_confirm"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:textSize="16sp"
- android:layout_gravity="center"
- android:inputType="textPassword"/>
- </LinearLayout>
-
- <Button
- android:id="@+id/btn_signup_back"
- android:textColor="@color/colorBlack"
- android:text="@string/back"
- android:layout_width="80dp"
- android:layout_height="48dp"
- android:layout_below="@+id/ll_signupact_password_confirm_container"
- android:background="@drawable/white_button_shape"
- android:layout_marginStart="40dp"
- android:layout_marginTop="20dp"/>
-
- <Button
- android:id="@+id/btn_signup_signup"
- android:layout_width="100dp"
- android:layout_height="48dp"
- android:textColor="@color/colorBlack"
- android:text="@string/signup"
- android:background="@drawable/green_button_shape"
- android:layout_alignBaseline="@+id/btn_signup_back"
- android:layout_alignBottom="@+id/btn_signup_back"
- android:layout_alignParentRight="true"
- android:layout_marginRight="40dp"
- android:layout_marginBottom="23dp"/>
-
- </RelativeLayout>
-</ScrollView>
\ No newline at end of file
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_password"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/signup_password"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_password_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/invalid_password"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+
+ <EditText
+ android:id="@+id/et_signup_password"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:layout_gravity="center"
+ android:inputType="textPassword"/>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/ll_signupact_password_confirm_container"
+ android:layout_below="@+id/ll_signupact_password_container"
+ android:layout_alignEnd="@+id/ll_signupact_name_container"
+ android:layout_height="45dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="3dp"
+ android:layout_alignStart="@id/ll_signupact_name_container"
+ android:background="@drawable/white_container_shape"
+ android:layout_width="wrap_content">
+
+ <FrameLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center">
+ <TextView
+ android:id="@+id/tv_signup_confirm_password"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/singup_confirmPassword"
+ android:textColor="@color/colorGreen"
+ android:textSize="16sp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="12dp"
+ android:layout_marginLeft="12dp"/>
+
+ <TextView
+ android:id="@+id/tv_signup_confirm_password_warning"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom"
+ android:textSize="12sp"
+ android:layout_marginStart="5dp"
+ android:textColor="@color/colorRed"
+ android:text="@string/invalid_password"
+ android:visibility="invisible"/>
+
+ </FrameLayout>
+ <EditText
+ android:id="@+id/et_signup_password_confirm"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:textSize="16sp"
+ android:layout_gravity="center"
+ android:inputType="textPassword"/>
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/btn_signup_back"
+ android:textColor="@color/colorBlack"
+ android:text="@string/back"
+ android:layout_width="80dp"
+ android:layout_height="48dp"
+ android:layout_below="@+id/ll_signupact_password_confirm_container"
+ android:background="@drawable/white_button_shape"
+ android:layout_marginStart="40dp"
+ android:layout_marginTop="20dp"/>
+
+ <Button
+ android:id="@+id/btn_signup_signup"
+ android:layout_width="100dp"
+ android:layout_height="48dp"
+ android:textColor="@color/colorBlack"
+ android:text="@string/signup"
+ android:background="@drawable/green_button_shape"
+ android:layout_alignBaseline="@+id/btn_signup_back"
+ android:layout_alignBottom="@+id/btn_signup_back"
+ android:layout_alignParentRight="true"
+ android:layout_marginRight="40dp"
+ android:layout_marginBottom="23dp"/>
+
+ </RelativeLayout>
+ </ScrollView>
+ <ProgressBar
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:id="@+id/pb_signupact"
+ android:layout_centerHorizontal="true"
+ android:indeterminate="true"
+ android:indeterminateTintMode="src_atop"
+ android:indeterminateTint="@color/colorGreen"
+ android:layout_centerVertical="true"
+ android:visibility="invisible"
+ />
+</RelativeLayout>
\ No newline at end of file
--
GitLab