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 55505aef..766e8060 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 @@ -233,8 +233,8 @@ public class ThreadManager implements Loader.LoaderListener { @Override public void onClick(DialogInterface dialog, int which) { switch (which) { - case 0: // Reply - openReply(true); + case 0: // Quick reply + openReply(false); // Pass through case 1: // Quote ChanApplication.getReplyManager().quote(post.no); @@ -275,7 +275,7 @@ public class ThreadManager implements Loader.LoaderListener { Intent i = new Intent(activity, ReplyActivity.class); activity.startActivity(i); } else { - ReplyFragment reply = ReplyFragment.newInstance(loader.getLoadable()); + ReplyFragment reply = ReplyFragment.newInstance(loader.getLoadable(), true); reply.show(activity.getFragmentManager(), "replyDialog"); } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ReplyActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ReplyActivity.java index 14871ce7..9416608b 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ReplyActivity.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ReplyActivity.java @@ -46,7 +46,7 @@ public class ReplyActivity extends Activity { getActionBar().setDisplayHomeAsUpEnabled(true); FragmentTransaction ft = getFragmentManager().beginTransaction(); - ft.replace(android.R.id.content, ReplyFragment.newInstance(loadable)); + ft.replace(android.R.id.content, ReplyFragment.newInstance(loadable, false)); ft.commitAllowingStateLoss(); loadable = null; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java index a91bfd12..83260c7e 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java @@ -31,6 +31,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; +import android.view.WindowManager; import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.Button; @@ -72,6 +73,7 @@ public class ReplyFragment extends DialogFragment { private int page = 0; private Loadable loadable; + private boolean quickMode = false; private final Reply draft = new Reply(); private boolean shouldSaveDraft = true; @@ -98,9 +100,10 @@ public class ReplyFragment extends DialogFragment { private Activity context; - public static ReplyFragment newInstance(Loadable loadable) { + public static ReplyFragment newInstance(Loadable loadable, boolean quickMode) { ReplyFragment reply = new ReplyFragment(); reply.loadable = loadable; + reply.quickMode = quickMode; return reply; } @@ -133,10 +136,9 @@ public class ReplyFragment extends DialogFragment { context.getActionBar().setTitle(title); } else { dialog.setTitle(title); - } - - if (getDialog() != null) { - getDialog().setOnKeyListener(new Dialog.OnKeyListener() { + // todo move elsewhere + dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + dialog.setOnKeyListener(new Dialog.OnKeyListener() { @Override public boolean onKey(DialogInterface dialogInterface, int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { @@ -238,6 +240,12 @@ public class ReplyFragment extends DialogFragment { container.findViewById(R.id.reply_captcha).setVisibility(View.GONE); } + if (quickMode) { + nameView.setVisibility(View.GONE); + emailView.setVisibility(View.GONE); + subjectView.setVisibility(View.GONE); + } + cancelButton = (Button) container.findViewById(R.id.reply_cancel); cancelButton.setOnClickListener(new OnClickListener() { @Override diff --git a/Clover/app/src/main/res/layout/reply_input.xml b/Clover/app/src/main/res/layout/reply_input.xml index 6999ee0c..edcc6681 100644 --- a/Clover/app/src/main/res/layout/reply_input.xml +++ b/Clover/app/src/main/res/layout/reply_input.xml @@ -96,7 +96,7 @@ along with this program. If not, see . android:layout_width="match_parent" android:layout_height="wrap_content" android:adjustViewBounds="true" - android:minHeight="200dp" + android:minHeight="48dp" android:scaleType="centerCrop"/> diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 937cc95d..bb8114a3 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -77,7 +77,7 @@ along with this program. If not, see . Close Info - Reply + Quick reply Quote Info Show clickables