From 603987a48197e04d1c8a9a9168348bfc55360075 Mon Sep 17 00:00:00 2001 From: Floens Date: Thu, 25 Jun 2015 22:31:36 +0200 Subject: [PATCH] Put name and options next to each other in the reply layout --- .../chan/core/presenter/ReplyPresenter.java | 10 ++--- .../floens/chan/ui/layout/ReplyLayout.java | 15 +++---- .../main/res/layout/layout_reply_input.xml | 41 +++++++++++-------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java index 91d7f7a0..6e0005a3 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java +++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java @@ -134,11 +134,10 @@ public class ReplyPresenter implements ReplyManager.FileListener, ReplyManager.H public void onMoreClicked() { moreOpen = !moreOpen; - callback.openName(moreOpen); + callback.openNameOptions(moreOpen); if (!loadable.isThreadMode()) { callback.openSubject(moreOpen); } - callback.openOptions(moreOpen); if (previewOpen) { callback.openFileName(moreOpen); if (board.spoilers) { @@ -301,9 +300,8 @@ public class ReplyPresenter implements ReplyManager.FileListener, ReplyManager.H previewOpen = false; selectedQuote = -1; callback.openMessage(false, true, "", false); - callback.openName(false); callback.openSubject(false); - callback.openOptions(false); + callback.openNameOptions(false); callback.openFileName(false); callback.openSpoiler(false, false); callback.openPreview(false, null); @@ -403,12 +401,10 @@ public class ReplyPresenter implements ReplyManager.FileListener, ReplyManager.H void setCommentHint(String hint); - void openName(boolean open); + void openNameOptions(boolean open); void openSubject(boolean open); - void openOptions(boolean open); - void openFileName(boolean open); void setFileName(String fileName); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java index bf89eba0..ae7d61d0 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java @@ -39,12 +39,12 @@ import org.floens.chan.core.model.Reply; import org.floens.chan.core.presenter.ReplyPresenter; import org.floens.chan.core.settings.ChanSettings; import org.floens.chan.ui.drawable.DropdownArrowDrawable; +import org.floens.chan.ui.theme.ThemeHelper; import org.floens.chan.ui.view.LoadView; import org.floens.chan.ui.view.SelectionListeningEditText; import org.floens.chan.utils.AndroidUtils; import org.floens.chan.utils.AnimationUtils; import org.floens.chan.utils.ImageDecoder; -import org.floens.chan.ui.theme.ThemeHelper; import java.io.File; @@ -68,6 +68,7 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima private EditText subject; private EditText options; private EditText fileName; + private LinearLayout nameOptions; private SelectionListeningEditText comment; private TextView commentCounter; private LinearLayout previewContainer; @@ -112,6 +113,7 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima subject = (EditText) replyInputLayout.findViewById(R.id.subject); options = (EditText) replyInputLayout.findViewById(R.id.options); fileName = (EditText) replyInputLayout.findViewById(R.id.file_name); + nameOptions = (LinearLayout) replyInputLayout.findViewById(R.id.name_options); comment = (SelectionListeningEditText) replyInputLayout.findViewById(R.id.comment); comment.addTextChangedListener(this); comment.setSelectionChangedListener(this); @@ -172,7 +174,7 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima @Override public void onLayoutAnimationProgress(boolean vertical, View view, float progress) { - if (view == name) { + if (view == nameOptions) { moreDropdown.setRotation(openingName ? progress : 1f - progress); } } @@ -282,9 +284,9 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima } @Override - public void openName(boolean open) { + public void openNameOptions(boolean open) { openingName = open; - AnimationUtils.animateHeight(name, open, comment.getWidth(), 300, this); + AnimationUtils.animateHeight(nameOptions, open, comment.getWidth(), 300, this); } @Override @@ -292,11 +294,6 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima AnimationUtils.animateHeight(subject, open, comment.getWidth()); } - @Override - public void openOptions(boolean open) { - AnimationUtils.animateHeight(options, open, comment.getWidth()); - } - @Override public void openFileName(boolean open) { AnimationUtils.animateHeight(fileName, open, comment.getWidth()); diff --git a/Clover/app/src/main/res/layout/layout_reply_input.xml b/Clover/app/src/main/res/layout/layout_reply_input.xml index 8f857761..836e8c2b 100644 --- a/Clover/app/src/main/res/layout/layout_reply_input.xml +++ b/Clover/app/src/main/res/layout/layout_reply_input.xml @@ -46,15 +46,33 @@ along with this program. If not, see . android:paddingLeft="8dp" android:paddingTop="8dp"> - + android:orientation="horizontal" + android:visibility="gone"> + + + + + + . android:textSize="16sp" android:visibility="gone" /> - -