mirrors
/
Fedilab
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Some changes

Browse Source
new_markdown_detector
Thomas 1 year ago
parent 69adba7493
commit 83c6a438f3
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File

73
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
Unescape View File

@ -1333,46 +1333,51 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
holder.binding.app.setVisibility(View.GONE); holder.binding.app.setVisibility(View.GONE);
holder.binding.editTime.setVisibility(View.GONE); holder.binding.editTime.setVisibility(View.GONE);
holder.binding.visibilitySmall.setImageResource(ressource); holder.binding.visibilitySmall.setImageResource(ressource);
holder.binding.statusInfo.setVisibility(View.GONE);
holder.binding.dateShort.setVisibility(View.VISIBLE);
holder.binding.visibilitySmall.setVisibility(View.VISIBLE);
if (statusToDeal.edited_at != null) {
Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_baseline_mode_edit_message_24);
img.setBounds(0, 0, (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f), (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f));
holder.binding.dateShort.setCompoundDrawables(null, null, img, null);
} else {
holder.binding.dateShort.setCompoundDrawables(null, null, null, null);
}
if (originalDateForBoost || status.reblog == null) {
holder.binding.dateShort.setText(Helper.dateDiff(context, statusToDeal.created_at));
} else {
holder.binding.dateShort.setText(Helper.dateDiff(context, status.created_at));
}
holder.binding.time.setVisibility(View.GONE);
Helper.absoluteDateTimeReveal(context, holder.binding.dateShort, statusToDeal.created_at, statusToDeal.edited_at);
if (displayCounters && canBeFederated) { if (displayCounters && canBeFederated) {
holder.binding.actionButtonReplyCount.setText(String.valueOf(statusToDeal.replies_count)); if (statusToDeal.reblogs_count > 0) {
holder.binding.statusInfo.setVisibility(View.VISIBLE); holder.binding.actionButtonBoostCount.setText(String.valueOf(statusToDeal.reblogs_count));
holder.binding.dateShort.setVisibility(View.GONE); holder.binding.actionButtonBoostCount.setVisibility(View.VISIBLE);
holder.binding.visibilitySmall.setVisibility(View.GONE);
holder.binding.reblogsCount.setText(String.valueOf(statusToDeal.reblogs_count));
holder.binding.favoritesCount.setText(String.valueOf(statusToDeal.favourites_count));
if (originalDateForBoost || status.reblog == null) {
holder.binding.time.setText(Helper.dateDiff(context, statusToDeal.created_at));
} else { } else {
holder.binding.time.setText(Helper.dateDiff(context, status.created_at)); holder.binding.actionButtonBoostCount.setVisibility(View.GONE);
} }
if (statusToDeal.edited_at != null) { if (statusToDeal.favourites_count > 0) {
Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_baseline_mode_edit_message_24); holder.binding.actionButtonFavoriteCount.setText(String.valueOf(statusToDeal.favourites_count));
img.setBounds(0, 0, (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f), (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f)); holder.binding.actionButtonFavoriteCount.setVisibility(View.VISIBLE);
holder.binding.time.setCompoundDrawables(null, null, img, null);
} else { } else {
holder.binding.time.setCompoundDrawables(null, null, null, null); holder.binding.actionButtonFavoriteCount.setVisibility(View.GONE);
} }
Helper.absoluteDateTimeReveal(context, holder.binding.time, statusToDeal.created_at, statusToDeal.edited_at);
holder.binding.visibility.setImageResource(ressource); if (statusToDeal.replies_count > 0 && !(context instanceof ContextActivity)) {
holder.binding.time.setVisibility(View.VISIBLE); holder.binding.actionButtonReplyCount.setText(String.valueOf(statusToDeal.replies_count));
} else { holder.binding.actionButtonReplyCount.setVisibility(View.VISIBLE);
holder.binding.statusInfo.setVisibility(View.GONE);
holder.binding.dateShort.setVisibility(View.VISIBLE);
holder.binding.visibilitySmall.setVisibility(View.VISIBLE);
if (statusToDeal.edited_at != null) {
Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_baseline_mode_edit_message_24);
img.setBounds(0, 0, (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f), (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f));
holder.binding.dateShort.setCompoundDrawables(null, null, img, null);
} else { } else {
holder.binding.dateShort.setCompoundDrawables(null, null, null, null); holder.binding.actionButtonReplyCount.setVisibility(View.GONE);
} }
if (originalDateForBoost || status.reblog == null) { } else {
holder.binding.dateShort.setText(Helper.dateDiff(context, statusToDeal.created_at)); holder.binding.actionButtonBoostCount.setVisibility(View.GONE);
holder.binding.actionButtonFavoriteCount.setVisibility(View.GONE);
if (statusToDeal.replies_count > 0 && !(context instanceof ContextActivity)) {
holder.binding.actionButtonReplyCount.setVisibility(View.VISIBLE);
} else { } else {
holder.binding.dateShort.setText(Helper.dateDiff(context, status.created_at)); holder.binding.actionButtonReplyCount.setVisibility(View.GONE);
} }
holder.binding.time.setVisibility(View.GONE);
Helper.absoluteDateTimeReveal(context, holder.binding.dateShort, statusToDeal.created_at, statusToDeal.edited_at);
} }
} }
@ -2433,11 +2438,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
}); });
popup.show(); popup.show();
}); });
if (statusToDeal.replies_count > 0 && !(context instanceof ContextActivity)) {
holder.binding.actionButtonReplyCount.setVisibility(View.VISIBLE);
} else {
holder.binding.actionButtonReplyCount.setVisibility(View.GONE);
}
holder.binding.actionButtonReply.setOnLongClickListener(v -> { holder.binding.actionButtonReply.setOnLongClickListener(v -> {
CrossActionHelper.doCrossAction(context, CrossActionHelper.TypeOfCrossAction.REPLY_ACTION, null, statusToDeal); CrossActionHelper.doCrossAction(context, CrossActionHelper.TypeOfCrossAction.REPLY_ACTION, null, statusToDeal);
return true; return true;

1
app/src/main/res/layouts/mastodon/layout/drawer_status.xml
Unescape View File

@ -658,7 +658,6 @@
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/action_button_reply" app:layout_constraintStart_toEndOf="@+id/action_button_reply"
android:layout_marginEnd="10dp"
tools:ignore="HardcodedText" tools:ignore="HardcodedText"
tools:visibility="visible" /> tools:visibility="visible" />

Write Preview
Loading…
Cancel
Save