diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index fabfbef7b..0ade6b602 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -951,7 +951,7 @@ public abstract class BaseMainActivity extends BaseActivity popup.getMenuInflater() .inflate(R.menu.main, popup.getMenu()); - if (social != UpdateAccountInfoAsyncTask.SOCIAL.MASTODON) { + if (social != UpdateAccountInfoAsyncTask.SOCIAL.MASTODON && social != UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { MenuItem action_about_instance = popup.getMenu().findItem(R.id.action_about_instance); if (action_about_instance != null) action_about_instance.setVisible(false); diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index cf49f113c..b2d761bcc 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -234,7 +234,8 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On Helper.changeDrawableColor(context, R.drawable.ic_repeat, iconColor); Helper.changeDrawableColor(context, R.drawable.ic_plus_one, iconColor); Helper.changeDrawableColor(context, R.drawable.ic_pin_drop, iconColor); - //holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte)); + + holder.status_reply_count.setTextColor(iconColor); holder.status_favorite_count.setTextColor(iconColor); @@ -393,6 +394,11 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On status.setImageFound(true); Status.makeImage(context, NotificationsListAdapter.this, status); } + + holder.status_privacy.setOnClickListener(view -> { + String v = status.getVisibility(); + holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte) + ": " + v); + }); holder.notification_status_content.setText(status.getContentSpan(), TextView.BufferType.SPANNABLE); holder.status_spoiler.setText(status.getContentSpanCW(), TextView.BufferType.SPANNABLE); holder.status_spoiler.setMovementMethod(LinkMovementMethod.getInstance()); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 419c6c676..c5540c30b 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -695,7 +695,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct lstHolders.add(holder); } - //holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte)); + holder.startUpdateTimer(); final Status status = statuses.get(i); @@ -711,6 +711,10 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } status.setItemViewType(viewHolder.getItemViewType()); + holder.status_privacy.setOnClickListener(view -> { + String v = status.getVisibility(); + holder.status_privacy.setContentDescription(context.getString(R.string.toot_visibility_tilte)+": " + v); + }); if (type == RetrieveFeedsAsyncTask.Type.CONTEXT && holder.status_reply_indicator_top != null) {