Merge remote-tracking branch 'megalodon_main/main'

This commit is contained in:
LucasGGamerM
2023-06-26 17:21:29 -03:00

View File

@@ -271,16 +271,21 @@ public class EditTimelinesFragment extends RecyclerFragment<TimelineDefinition>
private boolean setTagListContent(NachoTextView editText, @Nullable List<String> tags) { private boolean setTagListContent(NachoTextView editText, @Nullable List<String> tags) {
if (tags == null || tags.isEmpty()) return false; if (tags == null || tags.isEmpty()) return false;
editText.setText(String.join(",", tags)); editText.setText(tags);
editText.chipifyAllUnterminatedTokens(); editText.chipifyAllUnterminatedTokens();
return true; return true;
} }
private NachoTextView prepareChipTextView(NachoTextView nacho) { private NachoTextView prepareChipTextView(NachoTextView nacho) {
nacho.addChipTerminator(',', BEHAVIOR_CHIPIFY_ALL); //Ill Be Back
nacho.addChipTerminator('\n', BEHAVIOR_CHIPIFY_ALL); nacho.setChipTerminators(
nacho.addChipTerminator(' ', BEHAVIOR_CHIPIFY_ALL); Map.of(
nacho.addChipTerminator(';', BEHAVIOR_CHIPIFY_ALL); ',', BEHAVIOR_CHIPIFY_ALL,
'\n', BEHAVIOR_CHIPIFY_ALL,
' ', BEHAVIOR_CHIPIFY_ALL,
';', BEHAVIOR_CHIPIFY_ALL
)
);
nacho.enableEditChipOnTouch(true, true); nacho.enableEditChipOnTouch(true, true);
nacho.setOnFocusChangeListener((v, hasFocus) -> nacho.chipifyAllUnterminatedTokens()); nacho.setOnFocusChangeListener((v, hasFocus) -> nacho.chipifyAllUnterminatedTokens());
return nacho; return nacho;