Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated the UI for gender selection from edit text view to spinner #19

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
1 change: 0 additions & 1 deletion Blood App/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Blood App/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Blood App/.idea/render.experimental.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,17 @@ public class CreateProfileFragment extends Fragment {
private String selectedState,selectedDistrict,selectedBloodGroup;
private Spinner stateSpinner,districtSpinner,bloodGroupSpinner;
private ArrayAdapter<CharSequence> 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<CharSequence> genderAdapter;
private String selectedGender;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -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);
Expand Down Expand Up @@ -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()){
Expand All @@ -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<ApiResponse> call = ApiClient.getApiClient(getContext()).create(ApiInterface.class).createUser(user);
Expand Down
96 changes: 54 additions & 42 deletions Blood App/app/src/main/res/layout/fragment_create_profile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -69,60 +68,73 @@
android:textColorHint="@color/hint"
android:textSize="16sp" />

<EditText
android:id="@+id/EditWeight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:background="@drawable/primary_outline_textbox"
android:drawableLeft="@drawable/ic_baseline_line_weight_24"
android:drawablePadding="8dp"
android:fontFamily="@font/poppinsregular"
android:hint="Weight"
android:paddingStart="16dp"
android:paddingTop="12dp"
android:paddingEnd="16dp"
android:paddingBottom="12dp"
android:inputType="number"
android:textColor="@color/Text"
android:textColorHint="@color/hint"
android:textSize="16sp" />

<Spinner
android:id="@+id/EditGenderSpinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/Text"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"/>

<LinearLayout
android:id="@+id/linear_layout_gender_weight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">

<EditText
android:id="@+id/EditGender"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:background="@drawable/primary_outline_textbox"
android:drawableLeft="@drawable/ic_baseline_supervised_user_circle_24"
android:drawablePadding="8dp"
android:fontFamily="@font/poppinsregular"
android:hint="Gender"
android:paddingStart="16dp"
android:paddingTop="12dp"
android:paddingEnd="16dp"
android:paddingBottom="12dp"
android:textColor="@color/Text"
android:textColorHint="@color/hint"
android:textSize="16sp" />

<EditText
android:id="@+id/EditWeight"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:background="@drawable/primary_outline_textbox"
android:drawableLeft="@drawable/ic_baseline_line_weight_24"
android:drawablePadding="8dp"
android:fontFamily="@font/poppinsregular"
android:hint="Weight"
android:paddingStart="16dp"
android:paddingTop="12dp"
android:paddingEnd="16dp"
android:paddingBottom="12dp"
android:inputType="number"
android:textColor="@color/Text"
android:textColorHint="@color/hint"
android:textSize="16sp" />


<!-- <EditText-->
<!-- android:id="@+id/EditGender"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="32dp"-->
<!-- android:layout_marginTop="16dp"-->
<!-- android:layout_marginEnd="32dp"-->
<!-- android:background="@drawable/primary_outline_textbox"-->
<!-- android:drawableLeft="@drawable/ic_baseline_supervised_user_circle_24"-->
<!-- android:drawablePadding="8dp"-->
<!-- android:fontFamily="@font/poppinsregular"-->
<!-- android:hint="Gender"-->
<!-- android:paddingStart="16dp"-->
<!-- android:paddingTop="12dp"-->
<!-- android:paddingEnd="16dp"-->
<!-- android:paddingBottom="12dp"-->
<!-- android:textColor="@color/Text"-->
<!-- android:textColorHint="@color/hint"-->
<!-- android:textSize="16sp" />-->



</LinearLayout>

<Spinner
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"
Expand Down
10 changes: 9 additions & 1 deletion Blood App/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<string name="BaseURL">http://192.168.29.237:3000/</string>
<string name="mapbox_access_token">pk.eyJ1Ijoib25lb24iLCJhIjoiY2t3dDBsemMxMDQ5dDJybWl0ZWtnaTh5ZCJ9.vJ_c4dfplBSKRnLQ0aJ9kQ</string>


<string-array name="array_indian_states">
<item>Select Your State</item>
<item>Andaman and Nicobar Islands</item>
Expand Down Expand Up @@ -45,6 +44,15 @@
<item>West Bengal</item>
</string-array>

<string-array name="array_gender">
<item>Gender</item>
<item>Male</item>
<item>Female</item>
<item>Other</item>
<item>Prefer not to say</item>

</string-array>

<string-array name="array_blood_group">
<item>Select Your Blood Group</item>
<item>A+</item>
Expand Down