moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Move "Show pictures" button into MessageTopView 

We can also get rid of the "Show message" and "Show attachments" buttons.
This commit is contained in:
cketti 2015-02-17 02:32:20 +01:00
parent c64ae008c1
commit 68147880ce
3 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
View File

@ -67,8 +67,6 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
private Button mShowHiddenAttachments;
private LinearLayout mHiddenAttachments;
private View mShowPicturesAction;
private View mShowMessageAction;
private View mShowAttachmentsAction;
private boolean mShowPictures;
private boolean mHasAttachments;
private LayoutInflater mInflater;
@ -105,9 +103,6 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
mShowHiddenAttachments = (Button) findViewById(R.id.show_hidden_attachments);
mShowHiddenAttachments.setVisibility(View.GONE);
mShowPicturesAction = findViewById(R.id.show_pictures);
mShowMessageAction = findViewById(R.id.show_message);
mShowAttachmentsAction = findViewById(R.id.show_attachments);
mShowPictures = false;
@ -129,8 +124,6 @@ public class MessageContainerView extends LinearLayout implements OnClickListene
setBackgroundColor(outValue.data);
mShowHiddenAttachments.setOnClickListener(this);
// mShowMessageAction.setOnClickListener(this);
// mShowAttachmentsAction.setOnClickListener(this);
// mShowPicturesAction.setOnClickListener(this);
mClipboardManager = ClipboardManager.getInstance(context);

17
k9mail/src/main/res/layout/message.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<com.fsck.k9.ui.messageview.MessageTopView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/message_view"
android:orientation="vertical"
android:layout_width="fill_parent"
@ -20,6 +21,20 @@
<!-- Header area -->
<include layout="@layout/message_view_header"/>
<Button
android:id="@+id/show_pictures"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginBottom="4dip"
android:layout_marginLeft="6dip"
android:layout_marginRight="6dip"
android:layout_marginTop="4dip"
android:text="@string/message_view_show_pictures_action"
android:visibility="gone"
tools:visibility="visible"/>
<LinearLayout
android:orientation="vertical"
android:id="@+id/message_containers"
@ -27,7 +42,7 @@
android:layout_height="wrap_content" />
</LinearLayout>
</com.fsck.k9.view.NonLockingScrollView>
<Button android:id="@+id/download_remainder"

44
k9mail/src/main/res/layout/message_view_header.xml
View File

@ -205,49 +205,7 @@
<View
android:layout_height="1dip"
android:layout_width="match_parent"
android:layout_alignParentLeft="true"
android:layout_marginBottom="4dip"
android:background="@drawable/divider_horizontal_email" />
<!-- Button area -->
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:paddingTop="4dip"
android:baselineAligned="false" >
<Button
android:id="@+id/show_pictures"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_marginLeft="6dip"
android:layout_marginBottom="4dip"
android:layout_height="wrap_content"
android:text="@string/message_view_show_pictures_action"
style="?android:attr/buttonStyleSmall" />
<Button
android:id="@+id/show_attachments"
android:visibility="gone"
android:layout_marginLeft="6dip"
android:layout_marginBottom="4dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_view_show_attachments_action"
style="?android:attr/buttonStyleSmall" />
<Button
android:id="@+id/show_message"
android:visibility="gone"
android:layout_marginLeft="6dip"
android:layout_marginBottom="4dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/message_view_show_message_action"
style="?android:attr/buttonStyleSmall" />
</LinearLayout>
</com.fsck.k9.view.MessageHeader>