From f6928b2b20ea78353326619f46f3ae856ccb438b Mon Sep 17 00:00:00 2001
From: melvinabraham <melvin.abraham1996@gmail.com>
Date: Mon, 24 Apr 2017 03:27:42 +0530
Subject: [PATCH] Reverted and added name field
---
.../com/mapps/seproject/MainActivity.java | 8 +++++---
.../com/mapps/seproject/RegisterActivity.java | 3 ++-
.../main/java/com/mapps/seproject/User.java | 5 +++--
app/src/main/res/layout/activity_register.xml | 20 +++++++++++++++----
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/mapps/seproject/MainActivity.java b/app/src/main/java/com/mapps/seproject/MainActivity.java
index a4ad21b..1253b2f 100644
--- a/app/src/main/java/com/mapps/seproject/MainActivity.java
+++ b/app/src/main/java/com/mapps/seproject/MainActivity.java
@@ -9,6 +9,7 @@ import android.support.annotation.IdRes;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
+import android.widget.EditText;
import android.widget.Toast;
import com.google.firebase.auth.FirebaseAuth;
@@ -28,7 +29,7 @@ public class MainActivity extends AppCompatActivity {
FragmentManager fragmentManager;
FragmentTransaction fragmentTransaction;
FirebaseAuth firebaseAuth;
-
+ EditText getname;
int flag = 0;
FirebaseDatabase database = FirebaseDatabase.getInstance();
DatabaseReference myRef = database.getReference("message");
@@ -50,7 +51,8 @@ public class MainActivity extends AppCompatActivity {
mDatabase.child(userId).setValue(user);
*/
- mDatabase.addValueEventListener(new ValueEventListener() {
+ getname = RegisterActivity.name;
+ mDatabase.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(DataSnapshot dataSnapshot) {
@@ -79,7 +81,7 @@ public class MainActivity extends AppCompatActivity {
if(flag == 0) {
userId = mDatabase.push().getKey();
- User user = new User(data);
+ User user = new User(data,getname.getText().toString());
mDatabase.child(userId).setValue(user);
Log.e("E","new");
}
diff --git a/app/src/main/java/com/mapps/seproject/RegisterActivity.java b/app/src/main/java/com/mapps/seproject/RegisterActivity.java
index 89f7f84..26ff3c8 100644
--- a/app/src/main/java/com/mapps/seproject/RegisterActivity.java
+++ b/app/src/main/java/com/mapps/seproject/RegisterActivity.java
@@ -20,6 +20,7 @@ import com.google.firebase.auth.FirebaseAuth;
public class RegisterActivity extends AppCompatActivity implements View.OnClickListener{
+ static EditText name;
EditText email;
EditText password;
Button b;
@@ -84,7 +85,7 @@ public class RegisterActivity extends AppCompatActivity implements View.OnClickL
progress.setMessage("Registering"); // Progress Bar
progress.show();
-
+ name = (EditText) findViewById(R.id.etName);
try {
firebaseAuth.createUserWithEmailAndPassword(mail, pass) // Create New Entry
diff --git a/app/src/main/java/com/mapps/seproject/User.java b/app/src/main/java/com/mapps/seproject/User.java
index 7232a42..8c60ddd 100644
--- a/app/src/main/java/com/mapps/seproject/User.java
+++ b/app/src/main/java/com/mapps/seproject/User.java
@@ -6,7 +6,7 @@ package com.mapps.seproject;
public class User {
-
+ public String name;
public String email;
@@ -16,9 +16,10 @@ public class User {
}
- public User(String email) {
+ public User(String email,String name) {
this.email = email;
+ this.name = name;
}
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 02e5ac2..3796aa3 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -37,8 +37,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/bRegister"
- android:layout_marginTop="28dp"
- android:layout_below="@+id/etRegPassword"
+ android:layout_marginTop="53dp"
+ android:layout_below="@+id/etName"
android:layout_alignParentStart="true" />
<TextView
@@ -46,9 +46,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvHaveAccountReg"
+ android:layout_marginTop="32dp"
android:layout_below="@+id/bRegister"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="51dp" />
+ android:layout_centerHorizontal="true" />
<TextView
android:text="Sign In"
@@ -61,5 +61,17 @@
android:layout_alignTop="@+id/tvHaveAccountReg"
android:layout_centerHorizontal="true" />
+ <EditText
+ android:id="@+id/etName"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/etRegPassword"
+ android:layout_marginTop="15dp"
+ android:ems="10"
+ android:hint="Name"
+ android:inputType="textPersonName" />
+
</RelativeLayout>
--
GitLab