ThmmyNoLife
/
mTHMMY
mirror of https://github.com/ThmmyNoLife/mTHMMY
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

More poll improvements

pull/61/merge
Ezerous 6 years ago
parent
92f4b06296
commit
dd1fb88a94
No known key found for this signature in database GPG Key ID: 262B2954BBA319E3
1 changed files with 6 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java

11
app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
View File

@ -44,6 +44,7 @@ import com.squareup.picasso.Picasso;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -243,6 +244,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
} else { } else {
//Showing results //Showing results
holder.optionsLayout.setVisibility(View.GONE); holder.optionsLayout.setVisibility(View.GONE);
Arrays.sort(entries, (p1, p2) -> p1.getVotes() - p2.getVotes());
List<BarEntry> valuesToCompare = new ArrayList<>(); List<BarEntry> valuesToCompare = new ArrayList<>();
int totalVotes = 0; int totalVotes = 0;
for (int i = 0; i < entries.length; i++) { for (int i = 0; i < entries.length; i++) {
@ -250,7 +252,6 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
totalVotes += entries[i].getVotes(); totalVotes += entries[i].getVotes();
} }
BarDataSet dataSet = new BarDataSet(valuesToCompare, "Vote Results"); BarDataSet dataSet = new BarDataSet(valuesToCompare, "Vote Results");
dataSet.setDrawValues(true);
dataSet.setColor(accentColor); dataSet.setColor(accentColor);
dataSet.setValueTextColor(accentColor); dataSet.setValueTextColor(accentColor);
@ -281,9 +282,9 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
holder.voteChart.setData(barData); holder.voteChart.setData(barData);
holder.voteChart.getLegend().setEnabled(false); holder.voteChart.getLegend().setEnabled(false);
holder.voteChart.getDescription().setEnabled(false); holder.voteChart.getDescription().setEnabled(false);
int chartHeightdp = 10 + 30 * entries.length; int chartHeightDp = 10 + 30 * entries.length;
DisplayMetrics metrics = context.getResources().getDisplayMetrics(); DisplayMetrics metrics = context.getResources().getDisplayMetrics();
holder.voteChart.setMinimumHeight((int) (chartHeightdp * (metrics.densityDpi / 160f))); holder.voteChart.setMinimumHeight((int) (chartHeightDp * (metrics.densityDpi / 160f)));
holder.voteChart.invalidate(); holder.voteChart.invalidate();
holder.voteChart.setVisibility(View.VISIBLE); holder.voteChart.setVisibility(View.VISIBLE);
} }
@ -806,8 +807,8 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
hidePollResultsButton = itemView.findViewById(R.id.show_poll_options_button); hidePollResultsButton = itemView.findViewById(R.id.show_poll_options_button);
errorTextview = itemView.findViewById(R.id.error_too_many_checked); errorTextview = itemView.findViewById(R.id.error_too_many_checked);
voteChart = itemView.findViewById(R.id.vote_chart); voteChart = itemView.findViewById(R.id.vote_chart);
voteChart.setScaleEnabled(false); voteChart.setScaleYEnabled(false);
voteChart.setTouchEnabled(false); voteChart.setDoubleTapToZoomEnabled(false);
} }
} }

Write Preview
Loading…
Cancel
Save