mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 04:02:14 +02:00
Code

Merge pull request #7959 from thunderbird/remove_TokenAutoComplete_workaround

Browse Source 
Remove workaround that is no longer necessary
This commit is contained in:
cketti 2024-06-20 12:47:10 +02:00 committed by GitHub
commit 4edb195ff6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/ui/legacy/src/main/java/com/fsck/k9/view/RecipientSelectView.java
View File

@ -571,7 +571,6 @@ public class RecipientSelectView extends TokenCompleteTextView<Recipient> implem
private class RecipientTokenSpan extends TokenImageSpan {
private final View view;
private boolean initialLayoutPerformed = false;
public RecipientTokenSpan(View view, Recipient recipient) {
super(view, recipient);
@ -583,48 +582,13 @@ public class RecipientSelectView extends TokenCompleteTextView<Recipient> implem
showAlternates(getToken());
}
@Override
public int getSize(@NonNull Paint paint, CharSequence charSequence, int start, int end,
@Nullable Paint.FontMetricsInt fontMetricsInt) {
if (initialLayoutPerformed && view.isLayoutRequested()) {
relayoutView();
}
int size = super.getSize(paint, charSequence, start, end, fontMetricsInt);
initialLayoutPerformed = true;
return size;
}
@Override
public void draw(@NonNull Canvas canvas, CharSequence text, int start, int end, float x, int top, int y,
int bottom, @NonNull Paint paint) {
if (initialLayoutPerformed && view.isLayoutRequested()) {
relayoutView();
}
super.draw(canvas, text, start, end, x, top, y, bottom, paint);
// Dispatch onPreDraw event so image loading using Glide will work properly.
view.findViewById(R.id.contact_photo).getViewTreeObserver().dispatchOnPreDraw();
initialLayoutPerformed = true;
}
// Hack to support layout changes
// TODO: Remove once a TokenAutoComplete release includes https://github.com/splitwise/TokenAutoComplete/pull/403
private void relayoutView() {
int maxViewSpanWidth = getMaxViewSpanWidth();
int spec = View.MeasureSpec.AT_MOST;
if (maxViewSpanWidth == 0) {
//If the width is 0, allow the view to choose it's own content size
spec = View.MeasureSpec.UNSPECIFIED;
}
int widthSpec = View.MeasureSpec.makeMeasureSpec(maxViewSpanWidth, spec);
int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
view.measure(widthSpec, heightSpec);
view.layout(0, 0, view.getMeasuredWidth(), view.getMeasuredHeight());
}
}