diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..16d72c8
Binary files /dev/null and b/.DS_Store differ
diff --git a/Blood App/.idea/gradle.xml b/Blood App/.idea/gradle.xml
index e9969a1..7b46144 100644
--- a/Blood App/.idea/gradle.xml
+++ b/Blood App/.idea/gradle.xml
@@ -14,7 +14,6 @@
-
diff --git a/Blood App/.idea/misc.xml b/Blood App/.idea/misc.xml
index 84e8f62..0096656 100644
--- a/Blood App/.idea/misc.xml
+++ b/Blood App/.idea/misc.xml
@@ -148,6 +148,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Blood App/.idea/render.experimental.xml b/Blood App/.idea/render.experimental.xml
new file mode 100644
index 0000000..8ec256a
--- /dev/null
+++ b/Blood App/.idea/render.experimental.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Blood App/app/src/main/java/com/dev334/blood/ui/login/CreateProfileFragment.java b/Blood App/app/src/main/java/com/dev334/blood/ui/login/CreateProfileFragment.java
index 3d49faa..1c25308 100644
--- a/Blood App/app/src/main/java/com/dev334/blood/ui/login/CreateProfileFragment.java
+++ b/Blood App/app/src/main/java/com/dev334/blood/ui/login/CreateProfileFragment.java
@@ -41,11 +41,17 @@ public class CreateProfileFragment extends Fragment {
private String selectedState,selectedDistrict,selectedBloodGroup;
private Spinner stateSpinner,districtSpinner,bloodGroupSpinner;
private ArrayAdapter stateAdapter,districtAdapter,bloodGroupAdapter;
- private EditText weight,gender,dob,phone;
+ private EditText weight,dob,phone;
private String weightString,genderString,dobString, phoneString;
private Button nextButton;
DatePickerDialog.OnDateSetListener setListener;
private String TAG="CreateProfile";
+
+ // added new variables for gender spinner
+ private Spinner genderSpinner;
+ private ArrayAdapter genderAdapter;
+ private String selectedGender;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -66,12 +72,33 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
stateSpinner.setAdapter(stateAdapter);
+ /* STARTING CODE FOR GENDER SPINNER */
+ //linking spinner with its xml
+ genderSpinner = view.findViewById(R.id.EditGenderSpinner);
+ //creating adapter for the gender spinner
+ genderAdapter = ArrayAdapter.createFromResource(getContext(),R.array.array_gender,R.layout.spinner_layout);
+ genderAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
+ //setting adapter to the spinner
+ genderSpinner.setAdapter(genderAdapter);
+ // adding item listener to the spinner
+ genderSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView parent, View view, int position, long id) {
+ selectedGender = (String) parent.getItemAtPosition(position);
+ Log.e(TAG,selectedGender);
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView parent) {
+
+ }
+ });
+
bloodGroupSpinner=view.findViewById(R.id.EditBloodGroup);
bloodGroupAdapter=ArrayAdapter.createFromResource(getContext(),R.array.array_blood_group,R.layout.spinner_layout);
bloodGroupAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item);
bloodGroupSpinner.setAdapter(bloodGroupAdapter);
- gender=view.findViewById(R.id.EditGender);
weight=view.findViewById(R.id.EditWeight);
nextButton = view.findViewById(R.id.btnCreate);
phone=view.findViewById(R.id.EditContactRecord);
@@ -267,7 +294,8 @@ public void onClick(View view) {
nextButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- genderString=gender.getText().toString();
+ genderString=selectedGender;
+ Log.e(TAG,genderString);
weightString=weight.getText().toString();
phoneString=phone.getText().toString();
if(check()){
@@ -282,6 +310,7 @@ public void onClick(View view) {
return view;
}
+
private void createUser() {
User user = new User(((LoginActivity)getActivity()).getUserEmail(),Integer.parseInt(weightString),genderString,dobString,selectedBloodGroup,selectedDistrict,phoneString);
Call call = ApiClient.getApiClient(getContext()).create(ApiInterface.class).createUser(user);
diff --git a/Blood App/app/src/main/res/layout/fragment_create_profile.xml b/Blood App/app/src/main/res/layout/fragment_create_profile.xml
index 4a1a369..4749179 100644
--- a/Blood App/app/src/main/res/layout/fragment_create_profile.xml
+++ b/Blood App/app/src/main/res/layout/fragment_create_profile.xml
@@ -41,7 +41,6 @@
android:id="@+id/EditBloodGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/spinner_indian_states"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
@@ -69,52 +68,65 @@
android:textColorHint="@color/hint"
android:textSize="16sp" />
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -122,7 +134,7 @@
android:id="@+id/spinner_indian_states"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@id/linear_layout_gender_weight"
+ android:layout_below="@id/EditGenderSpinner"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
diff --git a/Blood App/app/src/main/res/values/strings.xml b/Blood App/app/src/main/res/values/strings.xml
index 2680d7e..49e828c 100644
--- a/Blood App/app/src/main/res/values/strings.xml
+++ b/Blood App/app/src/main/res/values/strings.xml
@@ -3,7 +3,6 @@
http://192.168.29.237:3000/
pk.eyJ1Ijoib25lb24iLCJhIjoiY2t3dDBsemMxMDQ5dDJybWl0ZWtnaTh5ZCJ9.vJ_c4dfplBSKRnLQ0aJ9kQ
-
- Select Your State
- Andaman and Nicobar Islands
@@ -45,6 +44,15 @@
- West Bengal
+
+ - Gender
+ - Male
+ - Female
+ - Other
+ - Prefer not to say
+
+
+
- Select Your Blood Group
- A+