From 787c014265158d249443802d38ff1207ac9ffa5d Mon Sep 17 00:00:00 2001 From: cketti Date: Mon, 12 Jan 2015 22:46:56 +0100 Subject: [PATCH] Create new package for UI code related to message viewing --- .../main/java/com/fsck/k9/activity/MessageList.java | 6 +++--- .../{view => ui/messageview}/MessageOpenPgpView.java | 3 +-- .../messageview}/MessageViewFragment.java | 5 +++-- .../{view => ui/messageview}/SingleMessageView.java | 12 ++++++++---- k9mail/src/main/res/layout/message.xml | 4 ++-- .../main/res/layout/message_view_openpgp_layout.xml | 4 ++-- 6 files changed, 19 insertions(+), 15 deletions(-) rename k9mail/src/main/java/com/fsck/k9/{view => ui/messageview}/MessageOpenPgpView.java (99%) rename k9mail/src/main/java/com/fsck/k9/{fragment => ui/messageview}/MessageViewFragment.java (99%) rename k9mail/src/main/java/com/fsck/k9/{view => ui/messageview}/SingleMessageView.java (98%) diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java index 2d75c1633..a1a817863 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java @@ -40,8 +40,8 @@ import com.fsck.k9.activity.setup.Prefs; import com.fsck.k9.crypto.PgpData; import com.fsck.k9.fragment.MessageListFragment; import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener; -import com.fsck.k9.fragment.MessageViewFragment; -import com.fsck.k9.fragment.MessageViewFragment.MessageViewFragmentListener; +import com.fsck.k9.ui.messageview.MessageViewFragment; +import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListener; import com.fsck.k9.mailstore.StorageManager; import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.search.LocalSearch; @@ -51,7 +51,7 @@ import com.fsck.k9.search.SearchSpecification.Attribute; import com.fsck.k9.search.SearchSpecification.SearchCondition; import com.fsck.k9.search.SearchSpecification.Searchfield; import com.fsck.k9.view.MessageHeader; -import com.fsck.k9.view.MessageOpenPgpView; +import com.fsck.k9.ui.messageview.MessageOpenPgpView; import com.fsck.k9.view.MessageTitleView; import com.fsck.k9.view.ViewSwitcher; import com.fsck.k9.view.ViewSwitcher.OnSwitchCompleteListener; diff --git a/k9mail/src/main/java/com/fsck/k9/view/MessageOpenPgpView.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageOpenPgpView.java similarity index 99% rename from k9mail/src/main/java/com/fsck/k9/view/MessageOpenPgpView.java rename to k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageOpenPgpView.java index 3c0e857da..8cddbe7e4 100644 --- a/k9mail/src/main/java/com/fsck/k9/view/MessageOpenPgpView.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageOpenPgpView.java @@ -1,5 +1,5 @@ -package com.fsck.k9.view; +package com.fsck.k9.ui.messageview; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -30,7 +30,6 @@ import com.fsck.k9.K9; import com.fsck.k9.R; import com.fsck.k9.crypto.CryptoHelper; import com.fsck.k9.crypto.OpenPgpApiHelper; -import com.fsck.k9.fragment.MessageViewFragment; import com.fsck.k9.helper.IdentityHelper; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; diff --git a/k9mail/src/main/java/com/fsck/k9/fragment/MessageViewFragment.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java similarity index 99% rename from k9mail/src/main/java/com/fsck/k9/fragment/MessageViewFragment.java rename to k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java index 961a38555..a93b96a8d 100644 --- a/k9mail/src/main/java/com/fsck/k9/fragment/MessageViewFragment.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java @@ -1,4 +1,4 @@ -package com.fsck.k9.fragment; +package com.fsck.k9.ui.messageview; import java.io.File; import java.util.Collections; @@ -31,7 +31,9 @@ import com.fsck.k9.activity.MessageReference; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.crypto.PgpData; +import com.fsck.k9.fragment.ConfirmationDialogFragment; import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; +import com.fsck.k9.fragment.ProgressDialogFragment; import com.fsck.k9.helper.FileBrowserHelper; import com.fsck.k9.helper.FileBrowserHelper.FileBrowserFailOverCallback; import com.fsck.k9.mail.Flag; @@ -42,7 +44,6 @@ import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.view.AttachmentView; import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback; import com.fsck.k9.view.MessageHeader; -import com.fsck.k9.view.SingleMessageView; import org.openintents.openpgp.OpenPgpSignatureResult; diff --git a/k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java b/k9mail/src/main/java/com/fsck/k9/ui/messageview/SingleMessageView.java similarity index 98% rename from k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java rename to k9mail/src/main/java/com/fsck/k9/ui/messageview/SingleMessageView.java index 289256a31..d22662ef9 100644 --- a/k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/messageview/SingleMessageView.java @@ -1,4 +1,4 @@ -package com.fsck.k9.view; +package com.fsck.k9.ui.messageview; import java.io.File; import java.io.FileOutputStream; @@ -42,7 +42,6 @@ import com.fsck.k9.R; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.controller.MessagingListener; import com.fsck.k9.crypto.PgpData; -import com.fsck.k9.fragment.MessageViewFragment; import com.fsck.k9.helper.ClipboardManager; import com.fsck.k9.helper.Contacts; import com.fsck.k9.helper.FileHelper; @@ -62,11 +61,16 @@ import com.fsck.k9.mailstore.LocalMessageExtractor; import com.fsck.k9.mailstore.ViewableContainer; import com.fsck.k9.provider.AttachmentProvider.AttachmentProviderColumns; +import com.fsck.k9.view.AttachmentView; +import com.fsck.k9.view.AttachmentView.AttachmentFileDownloadCallback; +import com.fsck.k9.view.MessageHeader; +import com.fsck.k9.view.MessageHeader.OnLayoutChangedListener; +import com.fsck.k9.view.MessageWebView; import org.apache.commons.io.IOUtils; public class SingleMessageView extends LinearLayout implements OnClickListener, - MessageHeader.OnLayoutChangedListener, OnCreateContextMenuListener { + OnLayoutChangedListener, OnCreateContextMenuListener { private static final int MENU_ITEM_LINK_VIEW = Menu.FIRST; private static final int MENU_ITEM_LINK_SHARE = Menu.FIRST + 1; private static final int MENU_ITEM_LINK_COPY = Menu.FIRST + 2; @@ -104,7 +108,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener, private Button mDownloadRemainder; private LayoutInflater mInflater; private Contacts mContacts; - private AttachmentView.AttachmentFileDownloadCallback attachmentCallback; + private AttachmentFileDownloadCallback attachmentCallback; private View mAttachmentsContainer; private SavedState mSavedState; private ClipboardManager mClipboardManager; diff --git a/k9mail/src/main/res/layout/message.xml b/k9mail/src/main/res/layout/message.xml index a054bc2bd..cbf2552de 100644 --- a/k9mail/src/main/res/layout/message.xml +++ b/k9mail/src/main/res/layout/message.xml @@ -1,5 +1,5 @@ - - + diff --git a/k9mail/src/main/res/layout/message_view_openpgp_layout.xml b/k9mail/src/main/res/layout/message_view_openpgp_layout.xml index 6f87b6d46..6d4a2ca06 100644 --- a/k9mail/src/main/res/layout/message_view_openpgp_layout.xml +++ b/k9mail/src/main/res/layout/message_view_openpgp_layout.xml @@ -1,5 +1,5 @@ - - +