Skip to content

Surveys ordered alphabetically. #3

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.

Sign up for GitHub

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

Open
NiSuKe wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Surveys ordered alphabetically. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393c2c5
aqui estan las encuestas ordenadas alfabéticamente
NiSuKe Nov 19, 2018
0be8507
Cambio de radioButtons a checkBoxes con multiples opciones
InfaSysKey Nov 19, 2018
942a4dd
Merge branch 'multipleOptions' of github.com:solidgear/surveyx2018Q4 …
NiSuKe Nov 19, 2018
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
3 changes: 1 addition & 2 deletions Surveyx/app/src/main/java/es/academy/solidgear/surveyx/models/SurveyModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ public void setImage(String image) {
this.image = image;
}

public int[] getQuestions() {
return questions;
public int[] getQuestions() {return questions;
Copy link
Collaborator

@InfaSysKey InfaSysKey Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quizá con un espacio puede quedar más limpio el código.

Copy link
Member

@jvillafanez jvillafanez Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better leave things as they are if there is no meaningful change. Try to revert these lines

}

public void setQuestions(int[] questions) {
Expand Down
1 change: 1 addition & 0 deletions Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.widget.Toast;

import java.util.ArrayList;
import java.util.Collections;
Copy link
Collaborator

@InfaSysKey InfaSysKey Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

¿ Necesaria implementación ? Ya esta importada en la clase necesaria.


import es.academy.solidgear.surveyx.R;
import es.academy.solidgear.surveyx.api.APIService;
Expand Down
8 changes: 8 additions & 0 deletions Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/activities/SurveysActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import com.google.android.gms.tasks.OnSuccessListener;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

import es.academy.solidgear.surveyx.R;
Expand Down Expand Up @@ -226,6 +228,12 @@ private void fetchAllSurveys() {
APIService.OnResponse<SurveysModel> onSurveysResponse = new APIService.OnResponse<SurveysModel>() {
@Override
public void onSuccess(SurveysModel surveysModel) {
Collections.sort(surveysModel.getSurveys(), new Comparator<SurveyModel>() {
Copy link
Collaborator

@InfaSysKey InfaSysKey Nov 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

¿Algún comentario de como funciona?

@Override
public int compare(SurveyModel o1, SurveyModel o2) {
return o1.getTitle().compareTo(o2.getTitle());
}
});
showSurveys(surveysModel.getSurveys());
dialog.dismiss();
}
Expand Down
20 changes: 15 additions & 5 deletions Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/fragments/QuestionFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
import android.app.Fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.AppCompatCheckBox;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.RadioGroup;
import android.widget.TextView;
Expand Down Expand Up @@ -89,11 +91,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
answersOutlet = (RadioGroup) root.findViewById(R.id.answers_outlet);

for (OptionModel option : question.getChoices()) {

// Create radio button with answer
AnswerRadioButton radioButton = new AnswerRadioButton(getActivity(), option.getText());
radioButton.setTag(option.getId());
answersOutlet.addView(radioButton);
//Si la cuestión es de tipo "select-multiple" pone los botones en checkBox si no en radioButton
if (question.getType().equals("select-multiple")){
//AppCompactCheckBox para que funcione en todas las versiones de Android
AppCompatCheckBox checkBox = new AppCompatCheckBox(getActivity());
checkBox.setText(option.getText());
checkBox.setTag(option.getId());
answersOutlet.addView(checkBox);
}else{
// Create radio button with answer
AnswerRadioButton radioButton = new AnswerRadioButton(getActivity(), option.getText());
radioButton.setTag(option.getId());
answersOutlet.addView(radioButton);
}
}

RadioGroup.OnCheckedChangeListener onAnswerChecked = new RadioGroup.OnCheckedChangeListener() {
Expand Down
1 change: 1 addition & 0 deletions Surveyx/app/src/main/java/es/academy/solidgear/surveyx/ui/views/AnswerRadioButton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import android.content.Context;
import android.os.Build;
import android.support.v7.widget.AppCompatCheckBox;
import android.support.v7.widget.AppCompatRadioButton;
import android.util.TypedValue;
import android.view.Gravity;
Expand Down