wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify message_container layout

Browse source
This commit is contained in:
cketti 2022-07-28 18:02:22 +02:00
parent 66ebddbd1a
commit ec80646b6c
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
View file

@ -22,6 +22,7 @@ import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
import android.view.View;
import android.view.View.OnCreateContextMenuListener;
import android.view.ViewGroup;
import android.webkit.WebView;
import android.webkit.WebView.HitTestResult;
import android.widget.LinearLayout;
@ -70,7 +71,7 @@ public class MessageContainerView extends LinearLayout implements OnCreateContex
private final ClipboardManager clipboardManager = DI.get(ClipboardManager.class);
private MessageWebView mMessageContentView;
private LinearLayout mAttachments;
private ViewGroup attachmentsContainer;
private View unsignedTextContainer;
private View unsignedTextDivider;
private TextView unsignedText;
@ -97,7 +98,7 @@ public class MessageContainerView extends LinearLayout implements OnCreateContex
mMessageContentView.setOnCreateContextMenuListener(this);
mMessageContentView.setVisibility(View.VISIBLE);
mAttachments = findViewById(R.id.attachments);
attachmentsContainer = findViewById(R.id.attachments_container);
unsignedTextContainer = findViewById(R.id.message_unsigned_container);
unsignedTextDivider = findViewById(R.id.message_unsigned_divider);
@ -458,12 +459,12 @@ public class MessageContainerView extends LinearLayout implements OnCreateContex
}
AttachmentView view =
(AttachmentView) mInflater.inflate(R.layout.message_view_attachment, mAttachments, false);
(AttachmentView) mInflater.inflate(R.layout.message_view_attachment, attachmentsContainer, false);
view.setCallback(attachmentCallback);
view.setAttachment(attachment);
attachmentViewMap.put(attachment, view);
mAttachments.addView(view);
attachmentsContainer.addView(view);
}
}
@ -475,19 +476,19 @@ public class MessageContainerView extends LinearLayout implements OnCreateContex
}
LockedAttachmentView view = (LockedAttachmentView) mInflater
.inflate(R.layout.message_view_attachment_locked, mAttachments, false);
.inflate(R.layout.message_view_attachment_locked, attachmentsContainer, false);
view.setCallback(attachmentCallback);
view.setAttachment(attachment);
// attachments.put(attachment, view);
mAttachments.addView(view);
attachmentsContainer.addView(view);
}
}
}
public void resetView() {
setLoadPictures(false);
mAttachments.removeAllViews();
attachmentsContainer.removeAllViews();
currentHtmlText = null;
currentAttachmentResolver = null;

12
app/ui/legacy/src/main/res/layout/message_container.xml
View file

@ -68,16 +68,8 @@
<!-- Attachments area -->
<LinearLayout
android:id="@+id/attachments_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/attachments"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
/>
</LinearLayout>
android:layout_height="wrap_content"
android:orientation="vertical" />
</com.fsck.k9.ui.messageview.MessageContainerView>