diff options
3 files changed, 12 insertions, 8 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java index f176f4498..ce1227e56 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/ComposeAdapter.java @@ -1642,9 +1642,11 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder lenght += ("#" + tag + " ").length(); } holder.binding.content.setText(statusDraft.text); - statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3; - statusDraft.setCursorToEnd = false; - holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3); + if (statusDraft.text.length() - lenght - 3 >= 0) { + statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3; + statusDraft.setCursorToEnd = false; + holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3); + } } } else if (forwardTag && position > 0 && statusDraft.text != null && statusDraft.text.contains("#") && !statusList.get(position).tagAdded) { Status status = statusList.get(position - 1).reblog == null ? statusList.get(position - 1) : statusList.get(position - 1).reblog; @@ -1672,9 +1674,11 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder for (String tag : camelCaseTags) { lenght += ("#" + tag + " ").length(); } - statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3; - statusDraft.setCursorToEnd = false; - holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3); + if (statusDraft.text.length() - lenght - 3 >= 0) { + statusDraft.cursorPosition = statusDraft.text.length() - lenght - 3; + statusDraft.setCursorToEnd = false; + holder.binding.content.setSelection(statusDraft.text.length() - lenght - 3); + } } } diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java index 6eff3cf51..f05f5a203 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java @@ -1826,7 +1826,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> } for (Poll.PollItem pollItem : statusToDeal.poll.options) { @NonNull LayoutPollItemBinding pollItemBinding = LayoutPollItemBinding.inflate(inflater, holder.binding.poll.rated, true); - double value = Math.ceil((pollItem.votes_count * 100) / (double) statusToDeal.poll.voters_count); + double value = Math.round((pollItem.votes_count * 100) / (double) statusToDeal.poll.voters_count); pollItemBinding.pollItemPercent.setText(String.format("%s %%", (int) value)); pollItemBinding.pollItemText.setText( pollItem.getSpanTitle(context, statusToDeal, diff --git a/app/src/main/res/layouts/mastodon/layout/layout_poll_item.xml b/app/src/main/res/layouts/mastodon/layout/layout_poll_item.xml index c630f2cee..d1972b1d4 100644 --- a/app/src/main/res/layouts/mastodon/layout/layout_poll_item.xml +++ b/app/src/main/res/layouts/mastodon/layout/layout_poll_item.xml @@ -40,7 +40,7 @@ android:layout_marginStart="12dp" android:drawablePadding="5dp" android:ellipsize="end" - android:singleLine="true" + android:singleLine="false" tools:text="Option" /> </androidx.appcompat.widget.LinearLayoutCompat> |