Sign Up and Sign In Button Configured

app/src/main/java/com/mapps/seproject/LoginActivity.java

@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -82,6 +83,8 @@ public class LoginActivity extends AppCompatActivity  implements View.OnClickLis
         progressDialog.setMessage("Logging IN");
         progressDialog.show();
 
+        try {
+
             firebaseAuth.signInWithEmailAndPassword(mail, pass)
                     .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
                         @Override
@@ -95,9 +98,7 @@ public class LoginActivity extends AppCompatActivity  implements View.OnClickLis
                                 progressDialog.hide();
 
 
-                        }
-
-                        else    {
+                            } else {
 
 
                                 progressDialog.hide();                                      // Unsuccessful Log In
@@ -108,10 +109,18 @@ public class LoginActivity extends AppCompatActivity  implements View.OnClickLis
                             }
 
 
+                        }
+                    });
+        }
+
+
+        catch (Exception e) {
+
+            e.printStackTrace();
+            Log.i("Login Fail: ",e.toString());
 
 
         }
-                });
 
     }
 

app/src/main/java/com/mapps/seproject/RegisterActivity.java

@@ -6,6 +6,7 @@ import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -33,7 +34,10 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
         setContentView(R.layout.activity_register);
 
 
+
         firebaseAuth = FirebaseAuth.getInstance();
+
+
         if(firebaseAuth.getCurrentUser() != null)   {
 
             finish();
@@ -91,6 +95,7 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
         progress.show();
 
 
+        try {
 
             firebaseAuth.createUserWithEmailAndPassword(mail, pass)                                    // Create New Entry
                     .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
@@ -104,11 +109,11 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
                                 progress.hide();
 
 
-                        }
+                            } else {
 
-                        else {
 
                                 Toast.makeText(RegisterActivity.this, "Failed to Register", Toast.LENGTH_SHORT).show();
+                                progress.hide();
                                 //task.getException().getMessage();
 
                             }
@@ -117,6 +122,16 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
                         }
                     });
 
+        }
+
+        catch (Exception e) {
+
+                e.printStackTrace();
+                Log.i("Registration Fail: ",e.toString());
+
+
+        }
+
 
 
     }

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

@@ -9,25 +9,36 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.mapps.seproject.LoginActivity">
-    <Button
-        android:text="Login"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/bLogin"
-        android:layout_above="@+id/textRegister"
-        android:layout_alignParentStart="true"
-        android:layout_marginBottom="49dp" />
 
     <TextView
-        android:text="Register Here"
+        android:text="Sign Up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/textRegister"
         android:textSize="24sp"
+        android:layout_marginBottom="90dp"
+        android:background="@color/common_google_signin_btn_text_dark_disabled"
+        android:textColor="@color/common_google_signin_btn_text_dark_focused"
         android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginEnd="94dp"
-        android:layout_marginBottom="131dp" />
+        android:layout_centerHorizontal="true" />
+
+    <TextView
+        android:text="Don't have an account?"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="22dp"
+        android:id="@+id/textView"
+        android:layout_above="@+id/textRegister"
+        android:layout_centerHorizontal="true" />
+
+    <Button
+        android:text="Login"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/bLogin"
+        android:layout_marginBottom="38dp"
+        android:layout_above="@+id/textView"
+        android:layout_alignParentStart="true" />
 
     <EditText
         android:layout_width="match_parent"
@@ -36,7 +47,7 @@
         android:ems="10"
         android:id="@+id/etLoginPassword"
         android:hint="Password"
-        android:layout_marginBottom="32dp"
+        android:layout_marginBottom="30dp"
         android:layout_above="@+id/bLogin"
         android:layout_alignParentStart="true" />
 
@@ -47,7 +58,7 @@
         android:ems="10"
         android:id="@+id/etLoginEmail"
         android:hint="E-Mail Id"
-        android:layout_marginBottom="22dp"
+        android:layout_marginBottom="21dp"
         android:layout_above="@+id/etLoginPassword"
         android:layout_alignParentStart="true" />
 

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

@@ -42,13 +42,25 @@
         android:layout_alignParentStart="true" />
 
     <TextView
-        android:text="Login Here"
+        android:text="Already have an account?"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
+        android:id="@+id/tvHaveAccountReg"
+        android:layout_below="@+id/bRegister"
         android:layout_centerHorizontal="true"
+        android:layout_marginTop="51dp" />
+
+    <TextView
+        android:text="Sign In"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:id="@+id/textLogin"
-        android:textSize="24sp" />
+        android:textSize="24sp"
+        android:textColor="@color/common_google_signin_btn_text_dark_focused"
+        android:background="@color/common_google_signin_btn_text_light_disabled"
+        android:layout_marginTop="36dp"
+        android:layout_alignTop="@+id/tvHaveAccountReg"
+        android:layout_centerHorizontal="true" />
 
 
 </RelativeLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimary">#3f51b5</color>
     <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorAccent">#ff4081</color>
 </resources>