Sign up/in func added

shvmsaini · Sep 12, 2021 · 1305a25 · 1305a25
1 parent fd988eb
commit 1305a25
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 63 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,7 +19,7 @@ android {
 
  buildTypes {
  release {
- minifyEnabled false
+ minifyEnabled true
  proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
  }
  }
@@ -34,10 +34,12 @@ android {
 
 dependencies {
  // firebase dependencies
+ implementation platform('com.google.firebase:firebase-bom:28.4.0')
+ implementation 'com.google.android.gms:play-services-auth:19.2.0'
  implementation 'com.google.firebase:firebase-database'
  implementation 'com.google.firebase:firebase-analytics'
- implementation 'com.google.firebase:firebase-auth:21.0.1'
- implementation platform('com.google.firebase:firebase-bom:28.4.0')
+ implementation 'com.google.firebase:firebase-auth'
+
  //other dependencies
  implementation 'androidx.appcompat:appcompat:1.3.1'
  implementation 'com.google.android.material:material:1.4.0'

diff --git a/app/google-services.json b/app/google-services.json
@@ -1,63 +1,33 @@
 {
  "project_info": {
- "project_number": "347055043748",
- "firebase_url": "https://flashchatandroid-d2088.firebaseio.com",
- "project_id": "flashchatandroid-d2088",
- "storage_bucket": "flashchatandroid-d2088.appspot.com"
+ "project_number": "538271072906",
+ "project_id": "agrobuy-5506c",
+ "storage_bucket": "agrobuy-5506c.appspot.com"
  },
  "client": [
  {
  "client_info": {
- "mobilesdk_app_id": "1:347055043748:android:bd4a9ec01666fa13ea6231",
+ "mobilesdk_app_id": "1:538271072906:android:39f7997034288f0473e373",
  "android_client_info": {
  "package_name": "com.agrobuy.app"
  }
  },
  "oauth_client": [
  {
- "client_id": "347055043748-7du6nj18de92lh0090a7rgt8q11j2ki3.apps.googleusercontent.com",
+ "client_id": "538271072906-igu1hd1fonaqc3mdmqm2af9sajh9505s.apps.googleusercontent.com",
  "client_type": 3
  }
  ],
  "api_key": [
  {
- "current_key": "AIzaSyBF5wjgyhPtL81iWvJtLze7DT99goeKX-I"
+ "current_key": "AIzaSyArSqHF8cvUt73x0ZN8yjcdBM6q5GKxljU"
  }
  ],
  "services": {
  "appinvite_service": {
  "other_platform_oauth_client": [
  {
- "client_id": "347055043748-7du6nj18de92lh0090a7rgt8q11j2ki3.apps.googleusercontent.com",
- "client_type": 3
- }
- ]
- }
- }
- },
- {
- "client_info": {
- "mobilesdk_app_id": "1:347055043748:android:b67d32ad105b8118ea6231",
- "android_client_info": {
- "package_name": "com.prochat.flashchatnewfirebase"
- }
- },
- "oauth_client": [
- {
- "client_id": "347055043748-7du6nj18de92lh0090a7rgt8q11j2ki3.apps.googleusercontent.com",
- "client_type": 3
- }
- ],
- "api_key": [
- {
- "current_key": "AIzaSyBF5wjgyhPtL81iWvJtLze7DT99goeKX-I"
- }
- ],
- "services": {
- "appinvite_service": {
- "other_platform_oauth_client": [
- {
- "client_id": "347055043748-7du6nj18de92lh0090a7rgt8q11j2ki3.apps.googleusercontent.com",
+ "client_id": "538271072906-igu1hd1fonaqc3mdmqm2af9sajh9505s.apps.googleusercontent.com",
  "client_type": 3
  }
  ]

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -20,12 +20,14 @@
  <activity
  android:name=".LoginActivity"
  android:exported="true">
-
  </activity>
  <activity
  android:name=".SignUpActivity"
  android:exported="true">
-
+ </activity>
+ <activity
+ android:name=".LoggedInActivity"
+ android:exported="true">
  </activity>
  </application>
 

diff --git a/app/src/main/java/com/agrobuy/app/LoginActivity.java b/app/src/main/java/com/agrobuy/app/LoginActivity.java
@@ -6,6 +6,7 @@
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -15,18 +16,24 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+
 public class LoginActivity extends AppCompatActivity {
  public TextView signup;
  public Button loginButton;
  public TextView email;
  public TextView password;
+ private FirebaseAuth mAuth;
  private static final int TIME_DELAY = 2000;
  private static long back_pressed;
  @Override
  protected void onCreate(@Nullable Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.login_layout);
  signup = findViewById(R.id.signup);
+
+ // For sign up link
  SpannableString signupSpan = new SpannableString(signup.getText().toString());
  signupSpan.setSpan(new ClickableSpan() {
  @Override
@@ -41,8 +48,20 @@ public void onClick(@NonNull View view) {
  // Login Button
  loginButton = findViewById(R.id.loginButton);
  loginButton.setOnClickListener(view -> {
- Toast.makeText(LoginActivity.this, "Button CLICKED", Toast.LENGTH_SHORT).show();
-
+ mAuth.signInWithEmailAndPassword(email.getText().toString(), password.getText().toString())
+ .addOnCompleteListener(this, task -> {
+ if (task.isSuccessful()) {
+ // Sign in success, update UI with the signed-in user's information
+ Log.d(LoginActivity.class.getName(), "signInWithEmail:success");
+ FirebaseUser user = mAuth.getCurrentUser();
+// updateUI(user);
+ } else {
+ // If sign in fails, display a message to the user.
+ Log.w(LoginActivity.class.getName(), "signInWithEmail:failure", task.getException());
+ Toast.makeText(LoginActivity.this, "Authentication failed.", Toast.LENGTH_SHORT).show();
+// updateUI(null);
+ }
+ });
  });
  }
 

diff --git a/app/src/main/java/com/agrobuy/app/SignUpActivity.java b/app/src/main/java/com/agrobuy/app/SignUpActivity.java
@@ -7,6 +7,7 @@
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.style.ClickableSpan;
+import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
 
@@ -15,9 +16,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.agrobuy.app.databinding.SignupLayoutBinding;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 
 public class SignUpActivity extends AppCompatActivity {
@@ -29,6 +27,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  signupLayout = SignupLayoutBinding.inflate(getLayoutInflater()); // view binding
  setContentView(signupLayout.getRoot());
+ auth = FirebaseAuth.getInstance(); // getting firebase auth
+
 
  // back to login
  SpannableString loginSpan = new SpannableString(signupLayout.loginBack.getText());
@@ -41,8 +41,7 @@ public void onClick(@NonNull View view) {
  signupLayout.loginBack.setText(loginSpan);
  signupLayout.loginBack.setMovementMethod(LinkMovementMethod.getInstance());
 
-
- // singing up
+ // signing up
  signupLayout.signupButton.setOnClickListener(v -> {
  String email = signupLayout.emailForSignup.getText().toString();
  String pass = signupLayout.passwordForSignup.getText().toString();
@@ -68,18 +67,17 @@ public void onClick(@NonNull View view) {
  }
  else{
  auth.createUserWithEmailAndPassword(email,pass)
- .addOnCompleteListener(SignUpActivity.this, new OnCompleteListener<AuthResult>() {
- public void onComplete(@NonNull Task<AuthResult> task) {
-
- if (!task.isSuccessful()) {
- Toast.makeText(SignUpActivity.this, "ERROR",Toast.LENGTH_LONG).show();
- }
- else {
- startActivity(new Intent(SignUpActivity.this, LoggedInActivity.class));
- finish();
- }
+ .addOnCompleteListener(SignUpActivity.this, task -> {
+ if (!task.isSuccessful()) {
+ Log.d("AgroBuy","User creation failed",task.getException());
+ Toast.makeText(SignUpActivity.this, "ERROR",Toast.LENGTH_LONG).show();
  }
- });}
+ else {
+ startActivity(new Intent(SignUpActivity.this, LoggedInActivity.class));
+ finish();
+ }
+ });
+ }
  }
  else{
  Toast.makeText(this, "Password doesn't match!", Toast.LENGTH_SHORT).show();

diff --git a/app/src/main/res/layout/loggedin_layout.xml b/app/src/main/res/layout/loggedin_layout.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
- android:layout_height="match_parent">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+ android:layout_height="match_parent"/>