From 5aebdcaa6a0a761bf118b240d381d16c507ad698 Mon Sep 17 00:00:00 2001 From: FineFindus <63370021+FineFindus@users.noreply.github.com> Date: Mon, 2 Jan 2023 12:53:34 +0100 Subject: [PATCH 1/2] feat(compose/publish): add warning when no image description provided --- .../android/fragments/ComposeFragment.java | 15 ++++++++++++++- mastodon/src/main/res/values/strings_sk.xml | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index aabc8fab3..9232c2956 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -131,6 +131,7 @@ import java.util.List; import java.util.Locale; import java.util.Optional; import java.util.UUID; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -917,7 +918,18 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr } private void onPublishClick(View v){ - publish(); + if (!attachments.isEmpty() + && statusVisibility != StatusPrivacy.DIRECT + && !attachments.stream().allMatch(attachment -> attachment.description != null && !attachment.description.isBlank())) { + new M3AlertDialogBuilder(getActivity()) + .setTitle(R.string.sk_no_image_desc_title) + .setMessage(R.string.sk_no_image_desc) + .setNegativeButton(R.string.cancel, null) + .setPositiveButton(R.string.publish, (dialog, i)-> publish()) + .show(); + } else { + publish(); + } } private void publishErrorCallback(ErrorResponse error) { @@ -1030,6 +1042,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr } }; + if(editingStatus!=null && !redraftStatus){ new EditStatus(req, editingStatus.id) .setCallback(resCallback) diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml index 7f0c0a906..fefd28928 100644 --- a/mastodon/src/main/res/values/strings_sk.xml +++ b/mastodon/src/main/res/values/strings_sk.xml @@ -131,4 +131,6 @@ Don’t draft Reduce motion in animations This is a bot account + No Image description + The included images have no description. Please consider adding one, to allow visually impaired people to participate. \ No newline at end of file From 6fdbafc67bc2c8b9637f7765bd846a18c7d3a3ba Mon Sep 17 00:00:00 2001 From: FineFindus <63370021+FineFindus@users.noreply.github.com> Date: Mon, 2 Jan 2023 12:57:18 +0100 Subject: [PATCH 2/2] fix(compose/publish): remove unnecessary import --- .../java/org/joinmastodon/android/fragments/ComposeFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 9232c2956..06bddf577 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -131,7 +131,6 @@ import java.util.List; import java.util.Locale; import java.util.Optional; import java.util.UUID; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors;