Basic Registration System

SESHealth/app/src/main/java/yourteamnumber/seshealthpatient/Activities/RegisterActivity.java

@@ -16,7 +16,10 @@
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
+<<<<<<< HEAD
+=======
 import com.google.firebase.database.FirebaseDatabase;
+>>>>>>> 217178c7480954f25ed7aac41ba391a3300879f5
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -26,6 +29,15 @@ public class RegisterActivity extends AppCompatActivity {
 
     private EditText register_usernameET;
     private EditText register_passwordET;
+<<<<<<< HEAD
+
+    private Button register_btn;
+
+    private TextView textView4;
+    private TextView textView5;
+
+    private FirebaseAuth firebaseAuth;
+=======
     private EditText  register_passwordET2;
 
 
@@ -36,6 +48,7 @@ public class RegisterActivity extends AppCompatActivity {
 
     private FirebaseAuth firebaseAuth;
     private FirebaseDatabase database;
+>>>>>>> 217178c7480954f25ed7aac41ba391a3300879f5
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -46,7 +59,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
         register_usernameET = (EditText) findViewById(R.id.register_usernameET);
         register_passwordET = (EditText) findViewById(R.id.register_passwordET);
+<<<<<<< HEAD
+=======
         register_passwordET2 = (EditText) findViewById(R.id.register_passwordET2);
+>>>>>>> 217178c7480954f25ed7aac41ba391a3300879f5
 
         register_btn = (Button) findViewById(R.id.register_btn);
 
@@ -78,6 +94,21 @@ public void onClick(View v) {
     }
 
     @OnClick(R.id.register_btn)
+<<<<<<< HEAD
+    public void registerUser(){
+        String email = register_usernameET.getText().toString().trim();
+        String password = register_passwordET.getText().toString().trim();
+        firebaseAuth.createUserWithEmailAndPassword(email, password).addOnCompleteListener(this, new OnCompleteListener<AuthResult>() {
+            @Override
+            public void onComplete(@NonNull Task<AuthResult> task) {
+                if(task.isSuccessful())
+                {
+                    Toast.makeText(RegisterActivity.this, "Registered!" , Toast.LENGTH_SHORT); //Debug this
+                }
+            }
+        });
+
+=======
     public void registerUser() {
         String email = register_usernameET.getText().toString().trim();
         String password = register_passwordET.getText().toString().trim();
@@ -108,6 +139,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                 }
             });
         }
+>>>>>>> 217178c7480954f25ed7aac41ba391a3300879f5
     }
 
     @OnClick(R.id.textView4)