From b16f0ca3edde2973a7a934814162029f62e81435 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 19 Sep 2025 17:09:33 +0200 Subject: [PATCH] Some updates --- .../android/mastodon/ui/drawer/StatusAdapter.java | 13 ++++++++++++- .../main/res/menus/mastodon/menu/option_toot.xml | 5 ++++- app/src/main/res/values/strings.xml | 1 + .../fastlane/metadata/android/en/changelogs/539.txt | 10 +++++----- 4 files changed, 22 insertions(+), 7 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 3707b3d6..c43400d7 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 @@ -60,6 +60,7 @@ import android.text.Html; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; +import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MenuItem; @@ -2600,6 +2601,8 @@ public class StatusAdapter extends RecyclerView.Adapter if (statusToDeal.visibility.equals("direct") || (statusToDeal.visibility.equals("private") && !isOwner)) popup.getMenu().findItem(R.id.action_schedule_boost).setVisible(false); if (isOwner) { + //TODO: remove when ready + popup.getMenu().findItem(R.id.action_quote_policy).setVisible(false); popup.getMenu().findItem(R.id.action_block).setVisible(false); popup.getMenu().findItem(R.id.action_mute).setVisible(false); popup.getMenu().findItem(R.id.action_report).setVisible(false); @@ -2608,6 +2611,7 @@ public class StatusAdapter extends RecyclerView.Adapter popup.getMenu().findItem(R.id.action_pin).setVisible(!statusToDeal.visibility.equalsIgnoreCase("direct")); stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm); } else { + popup.getMenu().findItem(R.id.action_quote_policy).setVisible(false); popup.getMenu().findItem(R.id.action_pin).setVisible(false); popup.getMenu().findItem(R.id.action_redraft).setVisible(false); popup.getMenu().findItem(R.id.action_edit).setVisible(false); @@ -2767,7 +2771,14 @@ public class StatusAdapter extends RecyclerView.Adapter statusesVM.pin(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id).observe((LifecycleOwner) context, status1 -> Toasty.info(context, context.getString(R.string.toast_pin)).show()); } return true; - } else if (itemId == R.id.action_bookmark) { + } else if (itemId == R.id.action_quote_policy) { + String currentPolicy = "public"; + if(statusToDeal.quote_approval != null && statusToDeal.quote_approval.automatic != null && statusToDeal.quote_approval.automatic.length > 0) { + currentPolicy = statusToDeal.quote_approval.automatic[0]; + } + + return true; + }else if (itemId == R.id.action_bookmark) { if (statusToDeal.bookmarked) { statusesVM.unBookmark(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, statusToDeal.id).observe((LifecycleOwner) context, status1 -> Toasty.info(context, context.getString(R.string.status_unbookmarked)).show()); } else { diff --git a/app/src/main/res/menus/mastodon/menu/option_toot.xml b/app/src/main/res/menus/mastodon/menu/option_toot.xml index 20907ce0..b97b16e8 100644 --- a/app/src/main/res/menus/mastodon/menu/option_toot.xml +++ b/app/src/main/res/menus/mastodon/menu/option_toot.xml @@ -21,7 +21,10 @@ android:id="@+id/action_pin" android:title="@string/action_pin" app:showAsAction="never" /> - + Change logo Change the logo of the app on your device Pin message + Change who can quote you Unpin message The message is no longer pinned! The message has been pinned diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt index 96b9ea59..131bc74a 100644 --- a/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt +++ b/src/fdroid/fastlane/metadata/android/en/changelogs/539.txt @@ -1,20 +1,20 @@ Added: -- Mastodon quotes support +- Full Mastodon quotes support - Quote button can be hidden in Settings > Timeline - Change default quote policy in settings - Add colors in compose depending of the visibility (can be disabled / colors can be changed) - Add accessibility actions to move timelines up/down in Manage timelines page Changed: -- Boost & quote button are merged +- Boost & quote buttons are merged - Show emoji buttons only in focused status -- Add popup menu for boost, quote actions in status +- Add popup menu for boost/quote actions in status - Improve UI and accessibility in login page - Move "Max chars in links" next to "Truncate links" -- Add more translated pronouns for keys support(translations) +- Add more translated pronouns for keys support Fixed: - Left margin not removed for bottom information - Make content warning text selectable - Disable HTML parsing in display names -- Improve translate button preference +- Improve translate button preference \ No newline at end of file