From 06543d5fc2582370ed0a2cf29a4f6f7f027266ca Mon Sep 17 00:00:00 2001 From: FineFindus <63370021+FineFindus@users.noreply.github.com> Date: Wed, 21 Jun 2023 22:34:22 +0200 Subject: [PATCH] fix(edit-timelines/hashtags): set tags as list (#596) * fix(edit-timelines/hashtags): set tags as list Fixes https://github.com/sk22/megalodon/issues/595, by setting the tags a tags and not as a list. * refactor(edit-timelines/hashtags): set all tag terminator at once * feat(edit-timelines/hashtags): add comment --- .../android/fragments/EditTimelinesFragment.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java index 5d7503f5b..b6739bdd8 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java @@ -236,16 +236,21 @@ public class EditTimelinesFragment extends RecyclerFragment private boolean setTagListContent(NachoTextView editText, @Nullable List tags) { if (tags == null || tags.isEmpty()) return false; - editText.setText(String.join(",", tags)); + editText.setText(tags); editText.chipifyAllUnterminatedTokens(); return true; } private NachoTextView prepareChipTextView(NachoTextView nacho) { - nacho.addChipTerminator(',', BEHAVIOR_CHIPIFY_ALL); - nacho.addChipTerminator('\n', BEHAVIOR_CHIPIFY_ALL); - nacho.addChipTerminator(' ', BEHAVIOR_CHIPIFY_ALL); - nacho.addChipTerminator(';', BEHAVIOR_CHIPIFY_ALL); + //I’ll Be Back + nacho.setChipTerminators( + Map.of( + ',', BEHAVIOR_CHIPIFY_ALL, + '\n', BEHAVIOR_CHIPIFY_ALL, + ' ', BEHAVIOR_CHIPIFY_ALL, + ';', BEHAVIOR_CHIPIFY_ALL + ) + ); nacho.enableEditChipOnTouch(true, true); nacho.setOnFocusChangeListener((v, hasFocus) -> nacho.chipifyAllUnterminatedTokens()); return nacho;