|
|
|
@ -946,7 +946,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { |
|
|
|
|
List<PollOptionViewData> options = poll.getOptions(); |
|
|
|
|
for (int i = 0; i < args.length; i++) { |
|
|
|
|
if (i < options.size()) { |
|
|
|
|
int percent = PollViewDataKt.calculatePercent(options.get(i).getVotesCount(), poll.getVotesCount()); |
|
|
|
|
int percent = PollViewDataKt.calculatePercent(options.get(i).getVotesCount(), poll.getVotersCount(), poll.getVotesCount()); |
|
|
|
|
args[i] = buildDescription(options.get(i).getTitle(), percent, context); |
|
|
|
|
} else { |
|
|
|
|
args[i] = ""; |
|
|
|
@ -989,12 +989,18 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { |
|
|
|
|
|
|
|
|
|
if (expired || poll.getVoted()) { |
|
|
|
|
// no voting possible
|
|
|
|
|
pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), emojis, PollAdapter.RESULT); |
|
|
|
|
View.OnClickListener viewThreadListener = v -> { |
|
|
|
|
int position = getAdapterPosition(); |
|
|
|
|
if (position != RecyclerView.NO_POSITION) { |
|
|
|
|
listener.onViewThread(position); |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), poll.getVotersCount(), emojis, PollAdapter.RESULT, viewThreadListener); |
|
|
|
|
|
|
|
|
|
pollButton.setVisibility(View.GONE); |
|
|
|
|
} else { |
|
|
|
|
// voting possible
|
|
|
|
|
pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), emojis, poll.getMultiple() ? PollAdapter.MULTIPLE : PollAdapter.SINGLE); |
|
|
|
|
pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), poll.getVotersCount(), emojis, poll.getMultiple() ? PollAdapter.MULTIPLE : PollAdapter.SINGLE, null); |
|
|
|
|
|
|
|
|
|
pollButton.setVisibility(View.VISIBLE); |
|
|
|
|
|
|
|
|
@ -1021,8 +1027,15 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { |
|
|
|
|
private CharSequence getPollInfoText(long timestamp, PollViewData poll, |
|
|
|
|
StatusDisplayOptions statusDisplayOptions, |
|
|
|
|
Context context) { |
|
|
|
|
String votes = numberFormat.format(poll.getVotesCount()); |
|
|
|
|
String votesText = context.getResources().getQuantityString(R.plurals.poll_info_votes, poll.getVotesCount(), votes); |
|
|
|
|
|
|
|
|
|
String votesText; |
|
|
|
|
if(poll.getVotersCount() == null) { |
|
|
|
|
String voters = numberFormat.format(poll.getVotesCount()); |
|
|
|
|
votesText = context.getResources().getQuantityString(R.plurals.poll_info_votes, poll.getVotesCount(), voters); |
|
|
|
|
} else { |
|
|
|
|
String voters = numberFormat.format(poll.getVotersCount()); |
|
|
|
|
votesText = context.getResources().getQuantityString(R.plurals.poll_info_people, poll.getVotersCount(), voters); |
|
|
|
|
} |
|
|
|
|
CharSequence pollDurationInfo; |
|
|
|
|
if (poll.getExpired()) { |
|
|
|
|
pollDurationInfo = context.getString(R.string.poll_info_closed); |
|
|
|
|