mirror of
https://github.com/moparisthebest/k-9
synced 2024-12-11 02:12:27 -05:00
1d1b1affe9
This reverts commit 88c30be91957a4cf97fe10ee42760fbf782886aa. Sadly, it broke display of attachments Conflicts: res/layout/message_view_body.xml res/layout/message_view_header.xml
207 lines
9.3 KiB
XML
207 lines
9.3 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
|
<!-- Header area -->
|
|
<com.fsck.k9.view.MessageHeader
|
|
android:id="@+id/header_container"
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
>
|
|
<View
|
|
android:id="@+id/chip"
|
|
android:layout_marginTop="1dip"
|
|
android:layout_marginBottom="1dip"
|
|
android:layout_width="6dip"
|
|
android:layout_height="fill_parent" />
|
|
<LinearLayout
|
|
android:id="@+id/top_container"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
>
|
|
<LinearLayout
|
|
android:layout_width="fill_parent"
|
|
android:layout_alignParentRight="true"
|
|
android:layout_alignParentTop="true"
|
|
android:gravity="fill_horizontal"
|
|
android:layout_height="wrap_content">
|
|
<LinearLayout android:id="@+id/people"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:paddingLeft="4dip"
|
|
android:layout_weight="5"
|
|
android:orientation="vertical">
|
|
<TextView android:id="@+id/subject"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:textSize="10sp"
|
|
android:textStyle="bold"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
>
|
|
<LinearLayout
|
|
android:id="@+id/from_container"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:baselineAligned="true" >
|
|
<TextView
|
|
android:id="@+id/from"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingRight="6dip"
|
|
android:singleLine="true"
|
|
android:ellipsize="end"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
</LinearLayout>
|
|
<LinearLayout
|
|
android:id="@+id/to_container"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:baselineAligned="true" >
|
|
<TextView
|
|
android:id="@+id/to_label"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingRight="4dip"
|
|
android:text="@string/message_to_label"
|
|
android:textSize="10sp"
|
|
android:textStyle="bold"
|
|
android:textColor="?android:attr/textColorSecondary" />
|
|
<TextView android:id="@+id/to"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:singleLine="false"
|
|
android:ellipsize="none"
|
|
android:textSize="10sp"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
</LinearLayout>
|
|
<LinearLayout android:id="@+id/cc_container"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:baselineAligned="true">
|
|
<TextView android:id="@+id/cc_label"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingRight="4dip"
|
|
android:text="@string/message_view_cc_label"
|
|
android:textSize="10sp"
|
|
android:textStyle="bold"
|
|
android:textColor="?android:attr/textColorSecondary" />
|
|
<TextView android:id="@+id/cc"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:singleLine="false"
|
|
android:ellipsize="none"
|
|
android:textSize="10sp"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
</LinearLayout>
|
|
<TextView android:id="@+id/additional_headers_view"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:paddingBottom="4dip"
|
|
android:baselineAligned="true"
|
|
android:singleLine="false"
|
|
android:ellipsize="none"
|
|
android:textSize="10sp"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:textAppearance="?android:attr/textAppearanceSmall" >
|
|
</TextView>
|
|
</LinearLayout>
|
|
<LinearLayout android:id="@+id/topright_container"
|
|
android:orientation="vertical"
|
|
android:layout_weight="0.1"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="right"
|
|
>
|
|
<CheckBox android:id="@+id/flagged"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:focusable="false"
|
|
android:layout_alignParentRight="true"
|
|
style="?android:attr/starStyle" />
|
|
<TextView android:id="@+id/date"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:singleLine="true"
|
|
android:ellipsize="none"
|
|
android:textSize="10sp"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
<TextView android:id="@+id/time"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:textSize="10sp"
|
|
android:singleLine="true"
|
|
android:ellipsize="none"
|
|
android:textColor="?android:attr/textColorPrimary"
|
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
<LinearLayout android:id="@+id/icons_container"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_alignParentRight="true"
|
|
android:baselineAligned="true">
|
|
<View android:id="@+id/attachment"
|
|
android:layout_width="22sp"
|
|
android:layout_height="22sp"
|
|
android:background="@drawable/ic_email_attachment_small" />
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
</com.fsck.k9.view.MessageHeader>
|
|
<LinearLayout
|
|
android:id="@+id/show_pictures_section"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_marginTop="6dip"
|
|
android:paddingLeft="6dip"
|
|
android:paddingRight="3dip"
|
|
android:paddingTop="4dip"
|
|
android:paddingBottom="4dip"
|
|
android:baselineAligned="false"
|
|
android:visibility="gone">
|
|
<TextView
|
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
android:textColor="?android:attr/textColorSecondary"
|
|
android:text="@string/message_view_show_pictures_instructions"
|
|
android:layout_gravity="center"
|
|
android:layout_width="0dip"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1.0" />
|
|
<Button android:id="@+id/show_pictures"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/message_view_show_pictures_action" />
|
|
</LinearLayout>
|
|
<include layout="@layout/message_view_crypto_layout"/>
|
|
<!-- Content area -->
|
|
<com.fsck.k9.view.MessageWebView
|
|
android:id="@+id/message_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="fill_parent" />
|
|
<com.fsck.k9.view.AccessibleWebView
|
|
android:id="@+id/accessible_message_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_width="fill_parent" />
|
|
<!-- Attachments area -->
|
|
<LinearLayout
|
|
android:id="@+id/attachments"
|
|
android:orientation="vertical"
|
|
android:layout_width="fill_parent"
|
|
android:layout_height="wrap_content"
|
|
android:padding="4dip" />
|
|
<Button android:id="@+id/download_remainder"
|
|
android:text="@string/message_view_download_remainder"
|
|
android:layout_height="wrap_content"
|
|
android:visibility="gone"
|
|
android:layout_width="fill_parent" />
|
|
</merge>
|