From 7b5b0e0823d48682d8815dd52b638a4e109d76b2 Mon Sep 17 00:00:00 2001 From: Apoorv Pranjal Date: Mon, 3 Oct 2022 17:02:12 +0530 Subject: [PATCH 1/3] added ui of gender spinner --- .DS_Store | Bin 0 -> 6148 bytes Blood App/.idea/misc.xml | 13 +++ Blood App/.idea/render.experimental.xml | 6 ++ .../blood/ui/login/CreateProfileFragment.java | 19 +++- .../res/layout/fragment_create_profile.xml | 96 ++++++++++-------- Blood App/app/src/main/res/values/strings.xml | 10 +- 6 files changed, 98 insertions(+), 46 deletions(-) create mode 100644 .DS_Store create mode 100644 Blood App/.idea/render.experimental.xml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..16d72c880e2f69ca2a38869612961ec50387504b GIT binary patch literal 6148 zcmeHK&u`N(6n@?cO&EwCnBanBiEA~oOGULymbMa=fJw`M1EA6@6-3M8sz2zVs+8;C zkKxFF!vDevzGr*V+HMkD5MqAS^Y?7OFR4E#c1%Pfnx?x%H6rrhjFnp`E-~(BU$YI{ zQUwZqjg%zq(~ySUd@b8GI0c*n|C$2)?)nr_P71#Z@2@&ea+RQ$mxg`#&QEQKi0)F0 z4(J6P(IIugeu?M+aZEdON@+J=Vt-v>-=?QDK%T;Ckx-wG=>+v+l_wtlE-#slhxXro zONMzio&>>nv9VdXakJ`q-j??+{-|d0q(7OCqyFd(*N&9Rlk>Qryvhc%UhQ5>6_b8e z3`Uxer30kAeVrAlnnh|_q+`vEO^4_Eey?_aK5sVave8`B<$O1226g!)Xe<`KxBckx z-eK<~KP}W5tA7C0%Gbci!Ht&zCBK8)Vhbr`H0qf@{s@J9;p`XJ$qp~cdmUOG_dBLJ|1 zW^IW1gMm5HVra26h#r_QRG^^>d&Cfij&^DDLW`wALnmPmAHv>Q*b|D-cgOXmPA3r> zbfr_kDX^@-rm5C=|L + + + + + + + + + + + + + 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..39600b5 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,16 @@ 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; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -66,12 +71,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, stateSpinner.setAdapter(stateAdapter); + /* ADDING 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); + //setting adapter to the spinner + genderSpinner.setAdapter(genderAdapter); + 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 +279,7 @@ public void onClick(View view) { nextButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - genderString=gender.getText().toString(); +// genderString=gender.getText().toString(); weightString=weight.getText().toString(); phoneString=phone.getText().toString(); if(check()){ @@ -282,6 +294,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+ From 80ecfff1235322bbcb050b18fc9ac806a554a323 Mon Sep 17 00:00:00 2001 From: Apoorv Pranjal Date: Mon, 3 Oct 2022 17:26:01 +0530 Subject: [PATCH 2/3] added the functionality of the gender spinner and it is taking the gender selected from the spinner --- .../blood/ui/login/CreateProfileFragment.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 39600b5..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 @@ -50,6 +50,7 @@ public class CreateProfileFragment extends Fragment { // added new variables for gender spinner private Spinner genderSpinner; private ArrayAdapter genderAdapter; + private String selectedGender; @Override public void onCreate(Bundle savedInstanceState) { @@ -71,13 +72,27 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, stateSpinner.setAdapter(stateAdapter); - /* ADDING GENDER SPINNER */ + /* 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); @@ -279,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()){ From cbd4156c6c6744013df7475fd098565085970683 Mon Sep 17 00:00:00 2001 From: Apoorv Pranjal Date: Tue, 4 Oct 2022 09:56:03 +0530 Subject: [PATCH 3/3] final commit --- Blood App/.idea/gradle.xml | 1 - 1 file changed, 1 deletion(-) 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 @@ -