From 6dc01975ef96401dd33d5f23b06f45e68a0b78a3 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 18 Sep 2023 10:10:52 +0200 Subject: Dedicate icon --- .../fedilab/android/mastodon/ui/drawer/StatusAdapter.java | 11 +++++++++++ app/src/main/res/layouts/mastodon/layout/drawer_status.xml | 13 ++++++++++--- 2 files changed, 21 insertions(+), 3 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 90a13ccde..2564d9288 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 @@ -575,6 +575,8 @@ public class StatusAdapter extends RecyclerView.Adapter holder.binding.layoutReactions.getRoot().setVisibility(View.GONE); holder.binding.layoutReactions.reactionsView.setAdapter(null); } + + holder.binding.statusEmoji.setOnClickListener(v -> { EmojiManager.install(new EmojiOneProvider()); final EmojiPopup emojiPopup = EmojiPopup.Builder.fromRootView(holder.binding.statusEmoji).setOnEmojiPopupDismissListener(() -> { @@ -1037,6 +1039,15 @@ public class StatusAdapter extends RecyclerView.Adapter } return true; }); + holder.binding.actionButtonExtra.setAnimation(null); + + holder.binding.actionButtonExtra.setOnClickListener(v -> { + holder.binding.extraFeaturesPanel.setVisibility(View.VISIBLE); + holder.binding.actionButtonExtra.setChecked(false); + }); + + holder.binding.buttonCloseExtraFeaturesPanel.setOnClickListener(v -> holder.binding.extraFeaturesPanel.setVisibility(View.GONE)); + holder.binding.actionButtonBoost.setOnClickListener(v -> { boolean needToWarnForMissingDescription = false; if (warnNoMedia && statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) { 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 4b471a228..35ec4bfb0 100644 --- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml +++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml @@ -763,13 +763,20 @@ android:background="@drawable/bg_compose_panels" android:padding="6dp" android:visibility="gone" - app:constraint_referenced_ids="action_button_quote, action_button_translate, action_button_maths, status_add_custom_emoji, status_emoji" + app:constraint_referenced_ids="button_close_extra_features_panel, action_button_quote, action_button_translate, action_button_maths, status_add_custom_emoji, status_emoji" app:flow_maxElementsWrap="3" app:flow_wrapMode="aligned" - app:layout_constraintBottom_toBottomOf="@id/action_button_extra" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintBottom_toBottomOf="@id/action_buttons" + app:layout_constraintEnd_toEndOf="@id/action_button_extra" /> + +