diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5cd135a..ff11e8c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,9 @@ diff --git a/app/src/main/java/com/example/alzapp/LoginRequest.java b/app/src/main/java/com/example/alzapp/LoginRequest.java index e87ee7a..d0a3c0e 100644 --- a/app/src/main/java/com/example/alzapp/LoginRequest.java +++ b/app/src/main/java/com/example/alzapp/LoginRequest.java @@ -20,5 +20,4 @@ public class LoginRequest extends StringRequest { @Override public Map getParams() { return params; - } -} + }} diff --git a/app/src/main/java/com/example/alzapp/Registerequest.java b/app/src/main/java/com/example/alzapp/Registerequest.java index 548b543..a845907 100644 --- a/app/src/main/java/com/example/alzapp/Registerequest.java +++ b/app/src/main/java/com/example/alzapp/Registerequest.java @@ -10,7 +10,7 @@ public class Registerequest extends StringRequest { private static final String REGISTER_REQUEST_URL = "https://eclectic-sweeps.000webhostapp.com/registration_enc.php"; private Map params; - public Registerequest(String firstname, String lastname,String username,String dob,String email,String password, Response.Listener listener) { + public Registerequest(String firstname, String lastname,String username,String dob,String email,String password,String gender, Response.Listener listener) { super(Method.POST, REGISTER_REQUEST_URL, listener, null); params = new HashMap<>(); params.put("username", username); @@ -19,7 +19,7 @@ public class Registerequest extends StringRequest { params.put("lastname", lastname); params.put("dob",dob); params.put("email",email); - + params.put("gender",gender); } diff --git a/app/src/main/java/com/example/alzapp/registration.java b/app/src/main/java/com/example/alzapp/registration.java index 3897977..f853920 100644 --- a/app/src/main/java/com/example/alzapp/registration.java +++ b/app/src/main/java/com/example/alzapp/registration.java @@ -49,22 +49,23 @@ public class registration extends AppCompatActivity implements DatePickerDialog. private EditText email_id; private Button signup; private Button signup_button; - int sex; + String gender; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_registration); - username = (EditText) findViewById(R.id.reg_username); - password = (EditText) findViewById(R.id.reg_password); - firstname = (EditText) findViewById(R.id.firstname); - lastname = (EditText) findViewById(R.id.lastname); - email_id = (EditText) findViewById(R.id.email_id); - signup = (Button) findViewById(R.id.signup_button); - signin = (TextView) findViewById(R.id.signIn_text); - dob = (TextView) findViewById(R.id.dob1); - signup_button = (Button) findViewById(R.id.signup_button); + username = findViewById(R.id.reg_username); + password = findViewById(R.id.reg_password); + firstname = findViewById(R.id.firstname); + lastname = findViewById(R.id.lastname); + email_id = findViewById(R.id.email_id); + signup = findViewById(R.id.signup_button); + signin = findViewById(R.id.signIn_text); + dob = findViewById(R.id.dob1); + + radioSexGroup = findViewById(R.id.radioSex); signin.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -74,6 +75,36 @@ public class registration extends AppCompatActivity implements DatePickerDialog. }); + + + + dob.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + DialogFragment datePicker = new DatePickerFragment(); + datePicker.show(getSupportFragmentManager(), "date picker"); + + } + }); + + Button back = (Button) findViewById(R.id.back); + + back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + onBackPressed(); + } + }); + + + // get selected radio button from radioGroup + int selectedId = radioSexGroup.getCheckedRadioButtonId(); + + //find the radiobutton by returned id + radioSexButton = (RadioButton) findViewById(selectedId); + + + signup.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -95,7 +126,7 @@ public class registration extends AppCompatActivity implements DatePickerDialog. JSONObject jsonResponse = new JSONObject(response); boolean success = jsonResponse.getBoolean("success"); if (success) { - Intent intent = new Intent(registration.this,login.class); + Intent intent = new Intent(registration.this,UserAreaActivity.class); startActivity(intent); } else { AlertDialog.Builder builder = new AlertDialog.Builder(registration.this); @@ -109,7 +140,7 @@ public class registration extends AppCompatActivity implements DatePickerDialog. } } }; - Registerequest reg_request = new Registerequest(firstname.getText().toString(),lastname.getText().toString(),username.getText().toString(),dob.getText().toString(),email_id.getText().toString(),password.getText().toString(),responseListener); + Registerequest reg_request = new Registerequest(firstname.getText().toString(),lastname.getText().toString(),username.getText().toString(),dob.getText().toString(),email_id.getText().toString(),password.getText().toString(),radioSexButton.getText().toString(),responseListener); RequestQueue queue = Volley.newRequestQueue(registration.this); queue.add(reg_request); @@ -120,23 +151,6 @@ public class registration extends AppCompatActivity implements DatePickerDialog. } } }); - dob.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - DialogFragment datePicker = new DatePickerFragment(); - datePicker.show(getSupportFragmentManager(), "date picker"); - - } - }); - - Button back = (Button) findViewById(R.id.back); - - back.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - onBackPressed(); - } - }); @@ -165,45 +179,24 @@ public class registration extends AppCompatActivity implements DatePickerDialog. } - public void addListenerOnButton() { - - radioSexGroup = (RadioGroup) findViewById(R.id.radioSex); - - - - - - - // get selected radio button from radioGroup - int selectedId = radioSexGroup.getCheckedRadioButtonId(); - - //find the radiobutton by returned id - radioSexButton = (RadioButton) findViewById(selectedId); - - if(radioSexButton.getText() == "Male"){ - sex = 1; - } - else if (radioSexButton.getText() == "Female"){ - - sex = 2; - } - else{ - - sex = 3; - } - - + public void checkButton(View v) { + int radioId = radioSexGroup.getCheckedRadioButtonId(); + radioSexButton = findViewById(radioId); } + + + + public boolean isEmpty(EditText etText) { return etText.getText().toString().trim().length() == 0; } - public void showToast() { + /*public void showToast() { LayoutInflater inflater = getLayoutInflater(); View layout = inflater.inflate(R.layout.toast, (ViewGroup) findViewById(R.id.toast_root)); @@ -219,7 +212,7 @@ public class registration extends AppCompatActivity implements DatePickerDialog. toast.setView(layout); toast.show(); - } + }*/ diff --git a/app/src/main/res/layout/activity_registration.xml b/app/src/main/res/layout/activity_registration.xml index 87e22e2..e6448c8 100644 --- a/app/src/main/res/layout/activity_registration.xml +++ b/app/src/main/res/layout/activity_registration.xml @@ -38,7 +38,9 @@ android:text="Register to save your progress and get detailed report" android:textAlignment="center" android:textColor="#FFFFFF" - android:textSize="14sp" /> + android:textSize="14sp" + android:autofillHints="username" + /> + android:visibility="visible" + android:autofillHints="username" + /> + android:visibility="visible" + android:autofillHints="password" + /> + android:visibility="visible" + android:autofillHints="username" + /> + android:visibility="visible" + android:text="@string/Dob" + /> @@ -121,7 +131,9 @@ android:layout_marginEnd="30dp" android:ems="10" android:hint="E-Mail ID" - android:inputType="textEmailAddress" /> + android:inputType="textEmailAddress" + android:autofillHints="email" + /> + android:visibility="visible" + android:onClick="checkButton" + /> + android:visibility="visible" + android:onClick="checkButton"/> + android:visibility="visible" + android:onClick="checkButton" + /> @@ -167,7 +184,7 @@ android:id="@+id/input_group" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" + android:layout_marginLeft="25dp" android:layout_marginRight="25dp" android:layout_marginBottom="132dp" @@ -191,8 +208,10 @@ android:text="Already Have an Account? Sign in" android:textAllCaps="true" android:textColor="#FFFFFF" - android:textSize="13dp" - android:textStyle="bold" /> + android:textSize="13sp" + android:textStyle="bold" + android:focusable="true" + />