From 83c6a438f316d527f8d92ced3ab6a8e761fe005a Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 20 Sep 2023 18:23:37 +0200 Subject: Some changes --- .../android/mastodon/ui/drawer/StatusAdapter.java | 73 +++++++++++----------- .../res/layouts/mastodon/layout/drawer_status.xml | 1 - 2 files changed, 37 insertions(+), 37 deletions(-) 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 a351915f5..f56c035e3 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 @@ -1333,46 +1333,51 @@ public class StatusAdapter extends RecyclerView.Adapter holder.binding.app.setVisibility(View.GONE); holder.binding.editTime.setVisibility(View.GONE); 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) { - holder.binding.actionButtonReplyCount.setText(String.valueOf(statusToDeal.replies_count)); - holder.binding.statusInfo.setVisibility(View.VISIBLE); - holder.binding.dateShort.setVisibility(View.GONE); - 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)); + if (statusToDeal.reblogs_count > 0) { + holder.binding.actionButtonBoostCount.setText(String.valueOf(statusToDeal.reblogs_count)); + holder.binding.actionButtonBoostCount.setVisibility(View.VISIBLE); } else { - holder.binding.time.setText(Helper.dateDiff(context, status.created_at)); + holder.binding.actionButtonBoostCount.setVisibility(View.GONE); } - 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.time.setCompoundDrawables(null, null, img, null); + if (statusToDeal.favourites_count > 0) { + holder.binding.actionButtonFavoriteCount.setText(String.valueOf(statusToDeal.favourites_count)); + holder.binding.actionButtonFavoriteCount.setVisibility(View.VISIBLE); } 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); - holder.binding.time.setVisibility(View.VISIBLE); - } else { - 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); + + if (statusToDeal.replies_count > 0 && !(context instanceof ContextActivity)) { + holder.binding.actionButtonReplyCount.setText(String.valueOf(statusToDeal.replies_count)); + holder.binding.actionButtonReplyCount.setVisibility(View.VISIBLE); } else { - holder.binding.dateShort.setCompoundDrawables(null, null, null, null); + holder.binding.actionButtonReplyCount.setVisibility(View.GONE); } - if (originalDateForBoost || status.reblog == null) { - holder.binding.dateShort.setText(Helper.dateDiff(context, statusToDeal.created_at)); + } else { + 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 { - 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 }); 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 -> { CrossActionHelper.doCrossAction(context, CrossActionHelper.TypeOfCrossAction.REPLY_ACTION, null, statusToDeal); return true; diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml index f0c93d2a4..7fe78a4ae 100644 --- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml +++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml @@ -658,7 +658,6 @@ android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/action_button_reply" - android:layout_marginEnd="10dp" tools:ignore="HardcodedText" tools:visibility="visible" /> -- cgit v1.2.3