From 4f234d701dda356c5d4a943764c812d0e2fb318e Mon Sep 17 00:00:00 2001 From: Floens Date: Tue, 26 Aug 2014 16:59:28 +0200 Subject: [PATCH] Add text quoting --- .../floens/chan/core/manager/ReplyManager.java | 10 +++++++++- .../floens/chan/core/manager/ThreadManager.java | 15 +++++++++------ Clover/app/src/main/res/values/strings.xml | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/ReplyManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/ReplyManager.java index e993ca55..0ba414b5 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/manager/ReplyManager.java +++ b/Clover/app/src/main/java/org/floens/chan/core/manager/ReplyManager.java @@ -105,7 +105,15 @@ public class ReplyManager { * @param no the raw no to quote to. */ public void quote(int no) { - draft.comment = draft.comment + ">>" + no + "\n"; + draft.comment += ">>" + no + "\n"; + } + + public void quoteInline(int no, String text) { + draft.comment += ">>" + no + "\n"; + String[] lines = text.split("\n+"); + for (String line : lines) { + draft.comment += ">" + line + "\n"; + } } /** diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java index 363584c0..d091f342 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java +++ b/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java @@ -232,7 +232,7 @@ public class ThreadManager implements Loader.LoaderListener { } if (loader.getLoadable().isThreadMode()) { - menu.add(Menu.NONE, 5, Menu.NONE, activity.getString(R.string.post_quick_reply)); + menu.add(Menu.NONE, 10, Menu.NONE, activity.getString(R.string.post_quick_reply)); } String[] baseOptions = activity.getResources().getStringArray(R.array.post_options); @@ -257,22 +257,25 @@ public class ThreadManager implements Loader.LoaderListener { @Override public boolean onMenuItemClick(final MenuItem item) { switch (item.getItemId()) { - case 5: // Quick reply + case 10: // Quick reply openReply(false); // Pass through case 0: // Quote ChanApplication.getReplyManager().quote(post.no); break; - case 1: // Info + case 1: // Quote inline + ChanApplication.getReplyManager().quoteInline(post.no, post.comment.toString()); + break; + case 2: // Info showPostInfo(post); break; - case 2: // Show clickables + case 3: // Show clickables showPostLinkables(post); break; - case 3: // Copy text + case 4: // Copy text copyToClipboard(post.comment.toString()); break; - case 4: // Report + case 5: // Report Utils.openLink(activity, ChanUrls.getReportUrl(post.board, post.no)); break; case 6: // Id diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 44b85a93..549798a8 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -99,6 +99,7 @@ along with this program. If not, see . Info Quote + Quote text Info Show clickables Copy text