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

Polls improvements

pull/61/merge
Ezerous 6 years ago
parent
51f6d14253
commit
f1ce09595b
1 changed files with 16 additions and 10 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. 26
      app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java

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

@ -191,13 +191,16 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
holder.question.setText(poll.getQuestion()); holder.question.setText(poll.getQuestion());
holder.optionsLayout.removeAllViews(); holder.optionsLayout.removeAllViews();
holder.errorTextview.setVisibility(View.GONE); holder.errorTextview.setVisibility(View.GONE);
final int primaryTextColor = context.getResources().getColor(R.color.primary_text);
if (poll.getAvailableVoteCount() > 1) { if (poll.getAvailableVoteCount() > 1) {
for (Poll.Entry entry : entries) { for (Poll.Entry entry : entries) {
LinearLayout container = new LinearLayout(context); LinearLayout container = new LinearLayout(context);
container.setOrientation(LinearLayout.HORIZONTAL); container.setOrientation(LinearLayout.HORIZONTAL);
CheckBox checkBox = new CheckBox(context); CheckBox checkBox = new CheckBox(context);
TextView label = new TextView(context); TextView label = new TextView(context);
label.setTextColor(context.getResources().getColor(R.color.primary_text)); label.setTextColor(primaryTextColor);
label.setMovementMethod(LinkMovementMethod.getInstance()); label.setMovementMethod(LinkMovementMethod.getInstance());
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
label.setText(Html.fromHtml(entry.getEntryName(), Html.FROM_HTML_MODE_LEGACY)); label.setText(Html.fromHtml(entry.getEntryName(), Html.FROM_HTML_MODE_LEGACY));
@ -206,7 +209,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
label.setText(Html.fromHtml(entry.getEntryName())); label.setText(Html.fromHtml(entry.getEntryName()));
} }
label.setText(ThmmyParser.html2span(context, entry.getEntryName())); label.setText(ThmmyParser.html2span(context, entry.getEntryName()));
checkBox.setTextColor(context.getResources().getColor(R.color.primary_text)); checkBox.setTextColor(primaryTextColor);
container.addView(checkBox); container.addView(checkBox);
container.addView(label); container.addView(label);
holder.optionsLayout.addView(container); holder.optionsLayout.addView(container);
@ -226,7 +229,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
radioButton.setText(Html.fromHtml(entries[i].getEntryName())); radioButton.setText(Html.fromHtml(entries[i].getEntryName()));
} }
radioButton.setText(ThmmyParser.html2span(context, entries[i].getEntryName())); radioButton.setText(ThmmyParser.html2span(context, entries[i].getEntryName()));
radioButton.setTextColor(context.getResources().getColor(R.color.primary_text)); radioButton.setTextColor(primaryTextColor);
radioGroup.addView(radioButton); radioGroup.addView(radioButton);
} }
holder.optionsLayout.addView(radioGroup); holder.optionsLayout.addView(radioGroup);
@ -239,27 +242,29 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
for (int i = 0; i < entries.length; i++) { for (int i = 0; i < entries.length; i++) {
valuesToCompare.add(new BarEntry(i, entries[i].getVotes())); valuesToCompare.add(new BarEntry(i, entries[i].getVotes()));
} }
BarDataSet data = new BarDataSet(valuesToCompare, "Vote Results"); BarDataSet dataSet = new BarDataSet(valuesToCompare, "Vote Results");
data.setColor(context.getResources().getColor(R.color.accent)); dataSet.setDrawValues(true);
dataSet.setColor(context.getResources().getColor(R.color.accent));
dataSet.setValueTextColor(primaryTextColor);
YAxis yAxisLeft = holder.voteChart.getAxisLeft(); YAxis yAxisLeft = holder.voteChart.getAxisLeft();
yAxisLeft.setGranularity(1); yAxisLeft.setGranularity(1);
yAxisLeft.setTextColor(context.getResources().getColor(R.color.primary_text)); yAxisLeft.setTextColor(primaryTextColor);
yAxisLeft.setAxisMinimum(0); yAxisLeft.setAxisMinimum(0);
yAxisLeft.setSpaceTop(30f);
YAxis yAxisRight = holder.voteChart.getAxisRight(); YAxis yAxisRight = holder.voteChart.getAxisRight();
yAxisRight.setEnabled(false); yAxisRight.setEnabled(false);
XAxis xAxis = holder.voteChart.getXAxis(); XAxis xAxis = holder.voteChart.getXAxis();
xAxis.setValueFormatter((value, axis) -> Html.fromHtml(entries[(int) value].getEntryName()).toString()); xAxis.setValueFormatter((value, axis) -> Html.fromHtml(entries[(int) value].getEntryName()).toString());
xAxis.setTextColor(context.getResources().getColor(R.color.primary_text)); xAxis.setTextColor(primaryTextColor);
xAxis.setGranularity(1f); xAxis.setGranularity(1f);
xAxis.setLabelCount(entries.length); xAxis.setLabelCount(entries.length);
xAxis.setDrawGridLines(false); xAxis.setDrawGridLines(false);
xAxis.setDrawAxisLine(false); xAxis.setDrawAxisLine(false);
xAxis.setPosition(XAxis.XAxisPosition.BOTTOM); xAxis.setPosition(XAxis.XAxisPosition.TOP_INSIDE);
BarData barData = new BarData(data); BarData barData = new BarData(dataSet);
barData.setValueTextColor(context.getResources().getColor(R.color.accent));
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);
@ -790,6 +795,7 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
voteChart = itemView.findViewById(R.id.vote_chart); voteChart = itemView.findViewById(R.id.vote_chart);
voteChart.setScaleEnabled(false); voteChart.setScaleEnabled(false);
voteChart.setTouchEnabled(false); voteChart.setTouchEnabled(false);
voteChart.setDrawValueAboveBar(false);
} }
} }

Write Preview
Loading…
Cancel
Save