From 385a4f8a23265f80587547e4f8b94ada9192a706 Mon Sep 17 00:00:00 2001 From: sreeram-0xb5e <sreeram2910@gmail.com> Date: Fri, 14 Apr 2017 18:24:06 +0530 Subject: [PATCH] Added Auth --- .idea/misc.xml | 2 +- .idea/modules.xml | 2 + app/build.gradle | 3 +- app/src/main/AndroidManifest.xml | 1 + .../com/example/taskboxx/SignUpActivity.java | 83 ++++++++++++------- app/src/main/res/layout/activity_sign_up.xml | 12 +-- app/src/main/res/values/strings.xml | 1 + 7 files changed, 65 insertions(+), 39 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cca2cda..7158618 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/.idea/modules.xml b/.idea/modules.xml index f012943..30ae19d 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,8 @@ <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/TaskBoxx.iml" filepath="$PROJECT_DIR$/TaskBoxx.iml" /> + <module fileurl="file://$PROJECT_DIR$/TaskBoxx1.iml" filepath="$PROJECT_DIR$/TaskBoxx1.iml" /> + <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> </modules> </component> diff --git a/app/build.gradle b/app/build.gradle index 5cb4078..06ba66d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.google.firebase:firebase-auth:10.2.1' androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) @@ -28,7 +29,7 @@ dependencies { compile 'com.android.support:design:25.3.0' compile 'com.android.support.constraint:constraint-layout:1.0.2' testCompile 'junit:junit:4.12' - compile 'com.google.firebase:firebase-auth:10.2.0' + } apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 92ce7e1..e935882 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.taskboxx"> + <uses-permission android:name="android.permission.INTERNET"/> <application android:allowBackup="true" diff --git a/app/src/main/java/com/example/taskboxx/SignUpActivity.java b/app/src/main/java/com/example/taskboxx/SignUpActivity.java index 25cc530..e6c12c1 100644 --- a/app/src/main/java/com/example/taskboxx/SignUpActivity.java +++ b/app/src/main/java/com/example/taskboxx/SignUpActivity.java @@ -10,6 +10,7 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.support.v7.widget.Toolbar; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -21,84 +22,102 @@ 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; +import com.google.firebase.auth.FirebaseAuthException; public class SignUpActivity extends AppCompatActivity { - private Button signup_button; - private EditText name; - private EditText username; - private EditText emailid; - private EditText pwd; - private EditText confirm_pwd; - private ProgressDialog pd; + public Button signup_button; + public EditText name; + public EditText username; + public EditText email; + public EditText pwd; + public EditText confirm_pwd; + public ProgressDialog pd; + private FirebaseAuth mAuth; + private FirebaseAuth.AuthStateListener mAuthListener; + + - public FirebaseAuth firebaseAuth; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sign_up); - firebaseAuth = FirebaseAuth.getInstance(); + mAuth = FirebaseAuth.getInstance(); signup_button = (Button) findViewById(R.id.SignUp); name = (EditText) findViewById(R.id.input_Name_SignUp); username = (EditText) findViewById(R.id.input_Username_SignUp); - emailid = (EditText) findViewById(R.id.input_email_SignUp); + email = (EditText)findViewById(R.id.input_email_SignUp); pwd =(EditText) findViewById(R.id.input_NewPass_SignUp); confirm_pwd = (EditText) findViewById(R.id.input_RePass_SignUp); - pd = new ProgressDialog(this); + signup_button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + StartRigister(); + } + }); + } - public void SignUp(View view){ + + private void StartRigister() { + String u_name = name.getText().toString(); String u_username = username.getText().toString(); - String u_email = emailid.getText().toString(); + String u_email = email.getText().toString(); String u_pwd = pwd.getText().toString(); String u_c_pwd = confirm_pwd.getText().toString(); - if (TextUtils.isEmpty(u_name) || TextUtils.isEmpty(u_username) || TextUtils.isEmpty(u_email) ||TextUtils.isEmpty(u_pwd) ||TextUtils.isEmpty(u_c_pwd) ) - { - Toast.makeText(this,"Please Enter All the fields to proceed!",Toast.LENGTH_SHORT).show(); + if (TextUtils.isEmpty(u_name) || TextUtils.isEmpty(u_username) || TextUtils.isEmpty(u_email) || TextUtils.isEmpty(u_pwd) || TextUtils.isEmpty(u_c_pwd)) { + Toast.makeText(this, "Please Enter All the fields to proceed!", Toast.LENGTH_SHORT).show(); return; } - if (u_pwd.equals(u_c_pwd) ) - { - pd.setMessage("Browsy is Registering User!"); + + if (u_pwd.equals(u_c_pwd)) { + + pd.setMessage("Browsy is Registering You!"); pd.show(); - firebaseAuth.createUserWithEmailAndPassword(u_email,u_pwd) + + mAuth.createUserWithEmailAndPassword(u_email, u_pwd) .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() { + + @Override public void onComplete(@NonNull Task<AuthResult> task) { - if(task.isSuccessful()) + + + if (task.isSuccessful()) { pd.hide(); Toast.makeText(SignUpActivity.this,"Registered Successfully!",Toast.LENGTH_SHORT).show(); - } - else - { - pd.hide(); - Toast.makeText(SignUpActivity.this,"Failed to register!",Toast.LENGTH_SHORT).show(); + else { + pd.hide(); + Toast.makeText(SignUpActivity.this,"Failed To Register!",Toast.LENGTH_SHORT).show(); } + + } }); - } - else - { - Toast.makeText(this,"The Entered Password doesn't Match!",Toast.LENGTH_SHORT).show(); - return; + + + + } else { + Toast.makeText(this, "The Entered Password doesn't Match!", Toast.LENGTH_SHORT).show(); + } //Toast.makeText(this, "Registered!", Toast.LENGTH_SHORT).show(); + } - } } diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index 79428bf..e2c880b 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -68,13 +68,15 @@ android:layout_below="@+id/SignUpUsername_textLayout" android:layout_alignParentLeft="true" android:layout_alignParentStart="true"> - <EditText android:id="@+id/input_email_SignUp" + + <EditText + android:id="@+id/input_email_SignUp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginRight="30dp" android:layout_marginLeft="30dp" - android:inputType="text" - android:hint="Email Address" /> + android:layout_marginRight="30dp" + android:hint="Email Address" + android:inputType="textEmailAddress" /> </android.support.design.widget.TextInputLayout> <android.support.design.widget.TextInputLayout @@ -121,13 +123,13 @@ android:paddingLeft="125dp" android:paddingRight="125dp" android:layout_marginTop="45dp"> + <Button android:id="@+id/SignUp" style="@style/Widget.AppCompat.Button.Borderless" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="#EEEEEE" - android:onClick="SignUp" android:text="Sign Up" /> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4c909e2..06278aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,4 +5,5 @@ <string name="navigation_drawer_close">Close navigation drawer</string> <string name="action_settings">Settings</string> + <string name="auth_failed">Authentication Failed</string> </resources> -- GitLab