diff --git a/app/src/main/java/com/example/werfish/praticeapp/MainActivity.java b/app/src/main/java/com/example/werfish/praticeapp/MainActivity.java index 1aa550d..575e3ab 100644 --- a/app/src/main/java/com/example/werfish/praticeapp/MainActivity.java +++ b/app/src/main/java/com/example/werfish/praticeapp/MainActivity.java @@ -20,14 +20,12 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); //initializing all the text fields and buttons - final EditText nameField = (EditText) findViewById(R.id.nameTextField); - final EditText emailField = (EditText) findViewById(R.id.emailTextField); - final EditText phoneField = (EditText) findViewById(R.id.phoneTextField); - final EditText passField = (EditText) findViewById(R.id.passwordField); - final EditText repeatPassField = (EditText) findViewById(R.id.repeatPassField); + final EditText userName = (EditText) findViewById(R.id.login_Name); + final EditText password = (EditText) findViewById(R.id.login_Password); - Button btnAdd = (Button) findViewById(R.id.button_addRecord); - Button btnRecords = (Button) findViewById(R.id.button_Records); + Button btnLogin = (Button) findViewById(R.id.login_LoginButton); + Button btnRegister = (Button) findViewById(R.id.login_ButtonRegistration); + Button btnUsers = (Button) findViewById(R.id.login_ButtonUsers); //Insert test records to the database @@ -40,16 +38,12 @@ protected void onCreate(Bundle savedInstanceState) { } //set onclick listener for the adding button - btnAdd.setOnClickListener(new View.OnClickListener() { +/* btnLogin.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { Boolean validationFailed = Boolean.FALSE; String errorMessage = null; String name = nameField.getText().toString(); - String email = emailField.getText().toString(); - String phone = phoneField.getText().toString(); - String password = passField.getText().toString(); - String repeatPass = repeatPassField.getText().toString(); //Perform several validation checks if(isNameEmpty(name)){ @@ -79,8 +73,6 @@ public void onClick(View v) { errorToast.show(); }else{ - db.insertUser(name,email,phone,password); - clearFields(); Toast errorToast = Toast.makeText(getApplicationContext(), "The record has been added to the database", Toast.LENGTH_SHORT); @@ -91,11 +83,7 @@ public void onClick(View v) { } private void clearFields(){ - nameField.setText(""); - emailField.setText(""); - phoneField.setText(""); - passField.setText(""); - repeatPassField.setText(""); + password.setText(""); } private Boolean isNameEmpty(String name) { @@ -132,9 +120,24 @@ private Boolean isPasswordsMatch(String pass,String repeat){ return false; } } + });*/ + + btnRegister.setOnClickListener(new View.OnClickListener() { + + @Override + public void onClick(View view) { + Intent intent = new Intent(MainActivity.this, RegistrationActivity.class); + startActivity(intent); + clearFields(); + } + + private void clearFields(){ + userName.setText(""); + password.setText(""); + } }); - btnRecords.setOnClickListener(new View.OnClickListener() { + btnUsers.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -144,11 +147,8 @@ public void onClick(View view) { } private void clearFields(){ - nameField.setText(""); - emailField.setText(""); - phoneField.setText(""); - passField.setText(""); - repeatPassField.setText(""); + userName.setText(""); + password.setText(""); } }); diff --git a/app/src/main/java/com/example/werfish/praticeapp/RegistrationActivity.java b/app/src/main/java/com/example/werfish/praticeapp/RegistrationActivity.java new file mode 100644 index 0000000..40bb559 --- /dev/null +++ b/app/src/main/java/com/example/werfish/praticeapp/RegistrationActivity.java @@ -0,0 +1,127 @@ +package com.example.werfish.praticeapp; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.Gravity; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +public class RegistrationActivity extends AppCompatActivity { + + final UsersDBHelper db = new UsersDBHelper(this); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_registration); + + //initializing all the text fields and buttons + final EditText nameField = (EditText) findViewById(R.id.nameTextField); + final EditText emailField = (EditText) findViewById(R.id.emailTextField); + final EditText phoneField = (EditText) findViewById(R.id.phoneTextField); + final EditText passField = (EditText) findViewById(R.id.passwordField); + final EditText repeatPassField = (EditText) findViewById(R.id.repeatPassField); + + Button btnAdd = (Button) findViewById(R.id.button_addRecord); + + //set onclick listener for the adding button + btnAdd.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Boolean validationFailed = Boolean.FALSE; + String errorMessage = null; + + String name = nameField.getText().toString(); + String email = emailField.getText().toString(); + String phone = phoneField.getText().toString(); + String password = passField.getText().toString(); + String repeatPass = repeatPassField.getText().toString(); + + //Perform several validation checks + if(isNameEmpty(name)){ + validationFailed = true; + errorMessage = "The name is empty!"; + }else if(db.nameExists(name)){ + validationFailed = true; + errorMessage = "This name exists in the database!"; + }else if(isEmailEmpty(email)){ + validationFailed = true; + errorMessage = "The email is empty!"; + }else if(db.emailExists(email)){ + validationFailed = true; + errorMessage = "This email is already registered!"; + }else if(isPasswordEmpty(password)){ + validationFailed = true; + errorMessage = "The password is empty!"; + }else if(!isPasswordsMatch(password,repeatPass)){ + validationFailed = true; + errorMessage = "The repeated password does not match with original!"; + } + + if(validationFailed == Boolean.TRUE) { + //Toast with the error message + Toast errorToast = Toast.makeText(getApplicationContext(), errorMessage, Toast.LENGTH_SHORT); + errorToast.setGravity(Gravity.CENTER, 0, 0); + errorToast.show(); + }else{ + + db.insertUser(name,email,phone,password); + + clearFields(); + + Toast errorToast = Toast.makeText(getApplicationContext(), "The record has been added to the database", Toast.LENGTH_SHORT); + errorToast.setGravity(Gravity.CENTER, 0, 0); + errorToast.show(); + } + + } + + private void clearFields(){ + nameField.setText(""); + emailField.setText(""); + phoneField.setText(""); + passField.setText(""); + repeatPassField.setText(""); + } + + private Boolean isNameEmpty(String name) { + //checks if the password is empty + if(name.equals("")){ + return true; + }else{ + return false; + } + } + + private Boolean isPasswordEmpty(String password) { + //checks if the password is empty + if(password.equals("")){ + return true; + }else{ + return false; + } + } + + private Boolean isEmailEmpty(String email){ + //checks if email is Empty + if(email.equals("")){ + return true; + }else{ + return false; + } + } + + private Boolean isPasswordsMatch(String pass,String repeat){ + if(pass.equals(repeat)){ + return true; + }else{ + return false; + } + } + }); + + + } + +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ad75289..9b1666a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -3,31 +3,34 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="com.example.werfish.praticeapp.MainActivity"> + tools:context="com.example.werfish.praticeapp.MainActivity" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp"> + + - - + android:id="@+id/login_LoginScreenLayout" + android:layout_below="@+id/login_LabelTitle" + android:layout_alignParentStart="true"> - - - - - -