[android] Split out an EmojiTextInputView from TextInputViews

This also removes the TextInputController whose job is now done by the view.

briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java

@@ -32,7 +32,7 @@ import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.android.conversation.glide.BriarModelLoader;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.reporting.BriarReportSender;
-import org.briarproject.briar.android.view.TextInputView;
+import org.briarproject.briar.android.view.EmojiTextInputView;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.android.DozeWatchdog;
 import org.briarproject.briar.api.android.LockManager;
@@ -169,7 +169,7 @@ public interface AndroidComponent
 
 	void inject(NotificationCleanupService notificationCleanupService);
 
-	void inject(TextInputView textInputView);
+	void inject(EmojiTextInputView textInputView);
 
 	void inject(BriarModelLoader briarModelLoader);
 

briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java

@@ -19,8 +19,8 @@ import org.briarproject.briar.android.controller.handler.UiExceptionHandler;
 import org.briarproject.briar.android.controller.handler.UiResultExceptionHandler;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
 import org.briarproject.briar.android.view.TextSendController;
+import org.briarproject.briar.android.view.TextSendController.SendListener;
 
 import java.util.List;
 

briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java

@@ -21,8 +21,8 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
 import org.briarproject.briar.android.view.TextSendController;
+import org.briarproject.briar.android.view.TextSendController.SendListener;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPost;

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -64,10 +64,10 @@ import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
 import org.briarproject.briar.android.view.BriarRecyclerView;
 import org.briarproject.briar.android.view.TextAttachmentController;
+import org.briarproject.briar.android.view.TextAttachmentController.AttachImageListener;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextInputView.AttachImageListener;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
 import org.briarproject.briar.android.view.TextSendController;
+import org.briarproject.briar.android.view.TextSendController.SendListener;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
 import org.briarproject.briar.api.blog.BlogSharingManager;
 import org.briarproject.briar.api.client.ProtocolStateException;

briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java

@@ -23,8 +23,8 @@ import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
 import org.briarproject.briar.android.view.TextSendController;
+import org.briarproject.briar.android.view.TextSendController.SendListener;
 import org.briarproject.briar.api.introduction.IntroductionManager;
 
 import java.util.List;

briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java

@@ -17,8 +17,8 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.LargeTextInputView;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
 import org.briarproject.briar.android.view.TextSendController;
+import org.briarproject.briar.android.view.TextSendController.SendListener;
 
 import java.util.List;
 

briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java

@@ -27,12 +27,12 @@ import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListe
 import org.briarproject.briar.android.threaded.ThreadListController.ThreadListDataSource;
 import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener;
 import org.briarproject.briar.android.view.BriarRecyclerView;
+import org.briarproject.briar.android.view.KeyboardAwareLinearLayout;
 import org.briarproject.briar.android.view.TextInputView;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
 import org.briarproject.briar.android.view.TextSendController;
+import org.briarproject.briar.android.view.TextSendController.SendListener;
 import org.briarproject.briar.android.view.UnreadMessageButton;
 import org.briarproject.briar.api.client.NamedGroup;
-import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout;
 
 import java.util.Collection;
 import java.util.List;

briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java

@@ -1,61 +1,111 @@
 package org.briarproject.briar.android.view;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.os.IBinder;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
-import android.support.annotation.UiThread;
 import android.support.v7.widget.AppCompatImageButton;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.view.View;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 
 import com.vanniktech.emoji.EmojiEditText;
 import com.vanniktech.emoji.EmojiPopup;
 import com.vanniktech.emoji.RecentEmoji;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
+import org.briarproject.briar.android.BriarApplication;
+
+import javax.inject.Inject;
 
 import static android.content.Context.INPUT_METHOD_SERVICE;
+import static android.content.Context.LAYOUT_INFLATER_SERVICE;
+import static android.view.KeyEvent.KEYCODE_ENTER;
 import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong;
-import static org.briarproject.briar.android.view.TextInputView.TextValidityListener;
 
-@UiThread
+public class EmojiTextInputView extends KeyboardAwareLinearLayout implements
-@NotNullByDefault
+		TextWatcher {
-class TextInputController implements TextWatcher {
+
+	@Inject
+	RecentEmoji recentEmoji;
 
-	private final Context ctx;
 	private final AppCompatImageButton emojiToggle;
 	private final EmojiPopup emojiPopup;
-	private final EmojiEditText editText;
+	private final EditText editText;
 
 	@Nullable
-	private TextValidityListener listener;
+	private TextInputListener listener;
 	private int maxLength = Integer.MAX_VALUE;
-	private final boolean emptyTextAllowed;
+	private boolean emptyTextAllowed = false;
 	private boolean isEmpty = true;
 
-	TextInputController(View rootView, AppCompatImageButton emojiToggle,
+	public EmojiTextInputView(Context context) {
-			EmojiEditText editText, RecentEmoji recentEmoji,
+		this(context, null);
-			boolean emptyTextAllowed) {
+	}
-		ctx = rootView.getContext();
+
-		this.emojiToggle = emojiToggle;
+	public EmojiTextInputView(Context context, @Nullable AttributeSet attrs) {
-		this.editText = editText;
+		this(context, attrs, 0);
-		this.editText.addTextChangedListener(this);
+	}
-		this.editText.setOnClickListener(v -> showSoftKeyboard());
+
+	public EmojiTextInputView(Context context, @Nullable AttributeSet attrs,
+			int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+
+		// inflate layout
+		LayoutInflater inflater = (LayoutInflater) requireNonNull(
+				context.getSystemService(LAYOUT_INFLATER_SERVICE));
+		inflater.inflate(R.layout.emoji_text_input_view, this, true);
+
+		// get attributes
+		TypedArray a = context.obtainStyledAttributes(attrs,
+				R.styleable.EmojiTextInputView);
+		int paddingBottom = a.getDimensionPixelSize(
+				R.styleable.EmojiTextInputView_textPaddingBottom, 0);
+		int paddingEnd = a.getDimensionPixelSize(
+				R.styleable.EmojiTextInputView_textPaddingEnd, 0);
+		int maxLines =
+				a.getInteger(R.styleable.EmojiTextInputView_maxTextLines, 0);
+		a.recycle();
+
+		// apply attributes to editText
+		editText = findViewById(R.id.input_text);
+		editText.setPadding(0, 0, paddingEnd, paddingBottom);
+		if (maxLines > 0) editText.setMaxLines(maxLines);
+		editText.setOnClickListener(v -> showSoftKeyboard());
+		editText.addTextChangedListener(this);
+		// support sending with Ctrl+Enter
+		editText.setOnKeyListener((v, keyCode, event) -> {
+			if (listener != null && keyCode == KEYCODE_ENTER &&
+					event.isCtrlPressed()) {
+				listener.onSendEvent();
+				return true;
+			}
+			return false;
+		});
+		emojiToggle = findViewById(R.id.emoji_toggle);
+
+		// stuff we can't do in edit mode goes below
+		if (isInEditMode()) {
+			emojiPopup = null;
+			return;
+		}
+		BriarApplication app =
+				(BriarApplication) context.getApplicationContext();
+		app.getApplicationComponent().inject(this);
 		emojiPopup = EmojiPopup.Builder
-				.fromRootView(rootView)
+				.fromRootView(this)
 				.setRecentEmoji(recentEmoji)
 				.setOnEmojiPopupShownListener(this::showKeyboardIcon)
 				.setOnEmojiPopupDismissListener(this::showEmojiIcon)
-				.build(this.editText);
+				.build((EmojiEditText) editText);
-		this.emojiToggle.setOnClickListener(v -> emojiPopup.toggle());
+		emojiToggle.setOnClickListener(v -> emojiPopup.toggle());
-		this.emptyTextAllowed = emptyTextAllowed;
 	}
 
 	@Override
@@ -83,17 +133,43 @@ class TextInputController implements TextWatcher {
 	public void afterTextChanged(Editable s) {
 	}
 
+	@Override
+	public void setEnabled(boolean enabled) {
+		super.setEnabled(enabled);
+		editText.setEnabled(enabled);
+		emojiToggle.setEnabled(enabled);
+	}
+
+	@Override
+	public void setGravity(int gravity) {
+		editText.setGravity(gravity);
+	}
+
+	@Override
+	public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
+		return editText.requestFocus(direction, previouslyFocusedRect);
+	}
+
+	@Override
+	public void onDetachedFromWindow() {
+		super.onDetachedFromWindow();
+		if (emojiPopup.isShowing()) emojiPopup.dismiss();
+	}
+
+	void setTextInputListener(@Nullable TextInputListener listener) {
+		this.listener = listener;
+	}
+
+	void setAllowEmptyText(boolean emptyTextAllowed) {
+		this.emptyTextAllowed = emptyTextAllowed;
+	}
+
 	void setMaxLength(int maxLength) {
 		this.maxLength = maxLength;
 	}
 
-	boolean isEmpty() {
+	void setMaxLines(int maxLines) {
-		return getText() == null;
+		editText.setMaxLines(maxLines);
-	}
-
-	boolean isTooLong() {
-		return editText.getText() != null &&
-				utf8IsTooLong(editText.getText().toString().trim(), maxLength);
 	}
 
 	/**
@@ -112,44 +188,27 @@ class TextInputController implements TextWatcher {
 		editText.setText(null);
 	}
 
+	boolean isEmpty() {
+		return getText() == null;
+	}
+
+	boolean isTooLong() {
+		return editText.getText() != null &&
+				utf8IsTooLong(editText.getText().toString().trim(), maxLength);
+	}
+
 	CharSequence getHint() {
 		return editText.getHint();
 	}
 
 	void setHint(@StringRes int res) {
-		setHint(ctx.getString(res));
+		setHint(getContext().getString(res));
 	}
 
 	void setHint(CharSequence hint) {
 		editText.setHint(hint);
 	}
 
-	void setTextValidityListener(@Nullable TextValidityListener listener) {
-		this.listener = listener;
-	}
-
-	boolean requestFocus(int direction, Rect previouslyFocusedRect) {
-		return editText.requestFocus(direction, previouslyFocusedRect);
-	}
-
-	void onDetachedFromWindow() {
-		if (emojiPopup.isShowing()) emojiPopup.dismiss();
-	}
-
-	void showSoftKeyboard() {
-		Object o = ctx.getSystemService(INPUT_METHOD_SERVICE);
-		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
-		imm.showSoftInput(editText, SHOW_IMPLICIT);
-	}
-
-	void hideSoftKeyboard() {
-		if (emojiPopup.isShowing()) emojiPopup.dismiss();
-		IBinder token = editText.getWindowToken();
-		Object o = ctx.getSystemService(INPUT_METHOD_SERVICE);
-		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
-		imm.hideSoftInputFromWindow(token, 0);
-	}
-
 	private void showEmojiIcon() {
 		emojiToggle.setImageResource(R.drawable.ic_emoji_toggle);
 	}
@@ -158,9 +217,23 @@ class TextInputController implements TextWatcher {
 		emojiToggle.setImageResource(R.drawable.ic_keyboard);
 	}
 
-	public void setEnabled(boolean enabled) {
+	void showSoftKeyboard() {
-		editText.setEnabled(enabled);
+		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
-		emojiToggle.setEnabled(enabled);
+		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
+		imm.showSoftInput(editText, SHOW_IMPLICIT);
+	}
+
+	void hideSoftKeyboard() {
+		if (emojiPopup.isShowing()) emojiPopup.dismiss();
+		IBinder token = editText.getWindowToken();
+		Object o = getContext().getSystemService(INPUT_METHOD_SERVICE);
+		InputMethodManager imm = (InputMethodManager) requireNonNull(o);
+		imm.hideSoftInputFromWindow(token, 0);
+	}
+
+	interface TextInputListener {
+		void onTextIsEmptyChanged(boolean isEmpty);
+		void onSendEvent();
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/view/KeyboardAwareLinearLayout.java

@@ -1,4 +1,8 @@
-package org.thoughtcrime.securesms.components;
+/*
+  Taken from Signal, licences under GPLv3
+ */
+
+package org.briarproject.briar.android.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -24,6 +28,7 @@ import javax.annotation.Nullable;
 import static android.content.Context.WINDOW_SERVICE;
 import static android.view.Surface.ROTATION_270;
 import static android.view.Surface.ROTATION_90;
+import static java.util.Objects.requireNonNull;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.WARNING;
 
@@ -38,8 +43,6 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 			Logger.getLogger(KeyboardAwareLinearLayout.class.getName());
 
 	private final Rect rect = new Rect();
-	private final Set<OnKeyboardHiddenListener> hiddenListeners =
-			new HashSet<>();
 	private final Set<OnKeyboardShownListener> shownListeners = new HashSet<>();
 	private final int minKeyboardSize;
 	private final int minCustomKeyboardSize;
@@ -153,7 +156,6 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 	protected void onKeyboardClose() {
 		LOG.info("onKeyboardClose()");
 		keyboardOpen = false;
-		notifyHiddenListeners();
 	}
 
 	public boolean isKeyboardOpen() {
@@ -173,7 +175,7 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 	private int getDeviceRotation() {
 		WindowManager windowManager =
 				(WindowManager) getContext().getSystemService(WINDOW_SERVICE);
-		return windowManager.getDefaultDisplay().getRotation();
+		return requireNonNull(windowManager).getDefaultDisplay().getRotation();
 	}
 
 	private int getKeyboardLandscapeHeight() {
@@ -199,43 +201,6 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 		prefs.edit().putInt("keyboard_height_portrait", height).apply();
 	}
 
-	public void postOnKeyboardClose(Runnable runnable) {
-		if (keyboardOpen) {
-			addOnKeyboardHiddenListener(new OnKeyboardHiddenListener() {
-				@Override
-				public void onKeyboardHidden() {
-					removeOnKeyboardHiddenListener(this);
-					runnable.run();
-				}
-			});
-		} else {
-			runnable.run();
-		}
-	}
-
-	public void postOnKeyboardOpen(Runnable runnable) {
-		if (!keyboardOpen) {
-			addOnKeyboardShownListener(new OnKeyboardShownListener() {
-				@Override
-				public void onKeyboardShown() {
-					removeOnKeyboardShownListener(this);
-					runnable.run();
-				}
-			});
-		} else {
-			runnable.run();
-		}
-	}
-
-	public void addOnKeyboardHiddenListener(OnKeyboardHiddenListener listener) {
-		hiddenListeners.add(listener);
-	}
-
-	public void removeOnKeyboardHiddenListener(
-			OnKeyboardHiddenListener listener) {
-		hiddenListeners.remove(listener);
-	}
-
 	public void addOnKeyboardShownListener(OnKeyboardShownListener listener) {
 		shownListeners.add(listener);
 	}
@@ -245,15 +210,6 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 		shownListeners.remove(listener);
 	}
 
-	private void notifyHiddenListeners() {
-		// Make a copy as listeners may remove themselves when called
-		Set<OnKeyboardHiddenListener> listeners =
-				new HashSet<>(hiddenListeners);
-		for (OnKeyboardHiddenListener listener : listeners) {
-			listener.onKeyboardHidden();
-		}
-	}
-
 	private void notifyShownListeners() {
 		// Make a copy as listeners may remove themselves when called
 		Set<OnKeyboardShownListener> listeners = new HashSet<>(shownListeners);
@@ -262,11 +218,8 @@ public class KeyboardAwareLinearLayout extends LinearLayout {
 		}
 	}
 
-	public interface OnKeyboardHiddenListener {
-		void onKeyboardHidden();
-	}
-
 	public interface OnKeyboardShownListener {
 		void onKeyboardShown();
 	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.support.annotation.UiThread;
 import android.util.AttributeSet;
-import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.Button;
 
@@ -14,6 +13,7 @@ import org.briarproject.briar.R;
 
 import javax.annotation.Nullable;
 
+import static android.view.Gravity.BOTTOM;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
 @UiThread
@@ -32,18 +32,6 @@ public class LargeTextInputView extends TextInputView {
 	public LargeTextInputView(Context context, @Nullable AttributeSet attrs,
 			int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
-	}
-
-	@Override
-	protected void inflateLayout(Context context) {
-		LayoutInflater inflater = (LayoutInflater) context
-				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		inflater.inflate(R.layout.text_input_view_large, this, true);
-	}
-
-	@Override
-	protected void setUpViews(Context context, @Nullable AttributeSet attrs) {
-		super.setUpViews(context, attrs);
 
 		// get attributes
 		TypedArray attributes = context.obtainStyledAttributes(attrs,
@@ -57,17 +45,23 @@ public class LargeTextInputView extends TextInputView {
 		attributes.recycle();
 
 		if (buttonText != null) setButtonText(buttonText);
-		if (maxLines > 0) editText.setMaxLines(maxLines);
+		if (maxLines > 0) textInput.setMaxLines(maxLines);
 		if (fillHeight) {
 			ViewGroup layout = findViewById(R.id.input_layout);
 			LayoutParams params = (LayoutParams) layout.getLayoutParams();
 			params.height = 0;
 			params.weight = 1;
 			layout.setLayoutParams(params);
-			ViewGroup.LayoutParams editParams = editText.getLayoutParams();
+			ViewGroup.LayoutParams inputParams = textInput.getLayoutParams();
-			editParams.height = MATCH_PARENT;
+			inputParams.height = MATCH_PARENT;
-			editText.setLayoutParams(editParams);
+			textInput.setLayoutParams(inputParams);
 		}
+		textInput.setGravity(BOTTOM);
+	}
+
+	@Override
+	protected int getLayout() {
+		return R.layout.text_input_view_large;
 	}
 
 	public void setButtonText(String text) {

briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java

@@ -27,8 +27,6 @@ import com.bumptech.glide.request.target.Target;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.conversation.glide.GlideApp;
-import org.briarproject.briar.android.view.TextInputView.AttachImageListener;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,7 +65,7 @@ public class TextAttachmentController extends TextSendController {
 
 	public TextAttachmentController(TextInputView v, SendListener listener,
 			AttachImageListener imageListener, WindowManager windowManager) {
-		super(v, listener, true);
+		super(v, listener, false);
 		this.imageListener = imageListener;
 
 		imageLayout = v.findViewById(R.id.imageLayout);
@@ -100,13 +98,18 @@ public class TextAttachmentController extends TextSendController {
 	}
 
 	@Override
-	void onSendButtonClicked() {
+	public void onSendEvent() {
 		if (canSend()) {
 			listener.onSendClick(textInput.getText(), imageUris);
 			reset();
 		}
 	}
 
+	@Override
+	protected boolean canSendEmptyText() {
+		return !imageUris.isEmpty();
+	}
+
 	private void onImageButtonClicked() {
 		Intent intent = new Intent(SDK_INT >= 19 ?
 				ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT);
@@ -272,4 +275,8 @@ public class TextAttachmentController extends TextSendController {
 		};
 	}
 
+	public interface AttachImageListener {
+		void onAttachImage(Intent intent);
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java

@@ -2,48 +2,33 @@ package org.briarproject.briar.android.view;
 
 import android.animation.LayoutTransition;
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-import android.net.Uri;
 import android.os.Parcelable;
-import android.support.annotation.CallSuper;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.UiThread;
-import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
-
+import android.widget.LinearLayout;
-import com.vanniktech.emoji.EmojiEditText;
-import com.vanniktech.emoji.RecentEmoji;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.BriarApplication;
+import org.briarproject.briar.android.view.KeyboardAwareLinearLayout.OnKeyboardShownListener;
-import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout;
-
-import java.util.List;
-
-import javax.inject.Inject;
 
 import static android.content.Context.LAYOUT_INFLATER_SERVICE;
-import static android.view.KeyEvent.KEYCODE_ENTER;
 import static java.util.Objects.requireNonNull;
 
 @UiThread
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
-public class TextInputView extends KeyboardAwareLinearLayout {
+public class TextInputView extends LinearLayout {
 
-	@Inject
-	RecentEmoji recentEmoji;
-
-	TextInputController textInputController;
 	@Nullable
 	TextSendController textSendController;
-	EmojiEditText editText;
+	final EmojiTextInputView textInput;
 
 	public TextInputView(Context context) {
 		this(context, null);
@@ -56,26 +41,15 @@ public class TextInputView extends KeyboardAwareLinearLayout {
 	public TextInputView(Context context, @Nullable AttributeSet attrs,
 			int defStyleAttr) {
 		super(context, attrs, defStyleAttr);
-		if (!isInEditMode()) {
+		setSaveEnabled(true);
-			BriarApplication app =
-					(BriarApplication) context.getApplicationContext();
-			app.getApplicationComponent().inject(this);
-		}
 		setOrientation(VERTICAL);
 		setLayoutTransition(new LayoutTransition());
-		inflateLayout(context);
-		setSaveEnabled(true);
-		if (!isInEditMode()) setUpViews(context, attrs);
-	}
 
-	protected void inflateLayout(Context context) {
+		// inflate layout
 		LayoutInflater inflater = (LayoutInflater) requireNonNull(
 				context.getSystemService(LAYOUT_INFLATER_SERVICE));
-		inflater.inflate(R.layout.text_input_view, this, true);
+		inflater.inflate(getLayout(), this, true);
-	}
 
-	@CallSuper
-	protected void setUpViews(Context context, @Nullable AttributeSet attrs) {
 		// get attributes
 		TypedArray attributes = context.obtainStyledAttributes(attrs,
 				R.styleable.TextInputView);
@@ -84,12 +58,14 @@ public class TextInputView extends KeyboardAwareLinearLayout {
 				.getBoolean(R.styleable.TextInputView_allowEmptyText, false);
 		attributes.recycle();
 
-		// set up input controller
+		textInput = findViewById(R.id.emojiTextInput);
-		AppCompatImageButton emojiToggle = findViewById(R.id.emoji_toggle);
+		textInput.setAllowEmptyText(allowEmptyText);
-		editText = findViewById(R.id.input_text);
+		if (hint != null) textInput.setHint(hint);
-		textInputController = new TextInputController(this, emojiToggle,
+	}
-				editText, recentEmoji, allowEmptyText);
+
-		if (hint != null) textInputController.setHint(hint);
+	@LayoutRes
+	protected int getLayout() {
+		return R.layout.text_input_view;
 	}
 
 	@Nullable
@@ -118,71 +94,56 @@ public class TextInputView extends KeyboardAwareLinearLayout {
 	 */
 	public <T extends TextSendController> void setSendController(T controller) {
 		textSendController = controller;
-		textInputController.setTextValidityListener(textSendController);
+		textInput.setTextInputListener(textSendController);
-
-		// support sending with Ctrl+Enter
-		editText.setOnKeyListener((v, keyCode, event) -> {
-			if (keyCode == KEYCODE_ENTER && event.isCtrlPressed()) {
-				textSendController.onSendButtonClicked();
-				return true;
-			}
-			return false;
-		});
-	}
-
-	public TextInputController getTextInputController() {
-		return textInputController;
 	}
 
 	@Override
 	public void setEnabled(boolean enabled) {
 		super.setEnabled(enabled);
-		textInputController.setEnabled(enabled);
+		textInput.setEnabled(enabled);
 		requireNonNull(textSendController).setEnabled(enabled);
 	}
 
 	@Override
 	public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
-		return textInputController
+		return textInput.requestFocus(direction, previouslyFocusedRect);
-				.requestFocus(direction, previouslyFocusedRect);
 	}
 
-	@Override
+	EmojiTextInputView getEmojiTextInputView() {
-	public void onDetachedFromWindow() {
+		return textInput;
-		super.onDetachedFromWindow();
-		textInputController.onDetachedFromWindow();
 	}
 
 	public void clearText() {
-		textInputController.clearText();
+		textInput.clearText();
 	}
 
 	public void setHint(@StringRes int res) {
-		textInputController.setHint(getContext().getString(res));
+		textInput.setHint(getContext().getString(res));
 	}
 
 	public void setMaxTextLength(int maxLength) {
-		textInputController.setMaxLength(maxLength);
+		textInput.setMaxLength(maxLength);
+	}
+
+	public boolean isKeyboardOpen() {
+		return textInput.isKeyboardOpen();
 	}
 
 	public void showSoftKeyboard() {
-		textInputController.showSoftKeyboard();
+		textInput.showSoftKeyboard();
 	}
 
 	public void hideSoftKeyboard() {
-		textInputController.hideSoftKeyboard();
+		textInput.hideSoftKeyboard();
 	}
 
-	interface TextValidityListener {
+	public void addOnKeyboardShownListener(OnKeyboardShownListener listener) {
-		void onTextIsEmptyChanged(boolean isEmpty);
+		textInput.addOnKeyboardShownListener(listener);
 	}
 
-	public interface AttachImageListener {
+	public void removeOnKeyboardShownListener(
-		void onAttachImage(Intent intent);
+			OnKeyboardShownListener listener) {
-	}
+		textInput.removeOnKeyboardShownListener(listener);
-
-	public interface SendListener {
-		void onSendClick(@Nullable String text, List<Uri> imageUris);
 	}
 
 }

briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java

@@ -1,5 +1,6 @@
 package org.briarproject.briar.android.view;
 
+import android.net.Uri;
 import android.os.Parcelable;
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
@@ -9,40 +10,61 @@ import android.view.View;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.view.TextInputView.SendListener;
+import org.briarproject.briar.android.view.EmojiTextInputView.TextInputListener;
-import org.briarproject.briar.android.view.TextInputView.TextValidityListener;
+
+import java.util.List;
 
 import static android.support.design.widget.Snackbar.LENGTH_SHORT;
 import static java.util.Collections.emptyList;
 
 @UiThread
 @NotNullByDefault
-public class TextSendController implements TextValidityListener {
+public class TextSendController implements TextInputListener {
 
-	protected final TextInputController textInput;
+	protected final EmojiTextInputView textInput;
 	protected final View sendButton;
 	protected final SendListener listener;
 	protected boolean enabled = true;
+	protected final boolean allowEmptyText;
 
-	private final boolean allowEmptyText;
 	private boolean wasEmpty = true;
 
 	public TextSendController(TextInputView v, SendListener listener,
 			boolean allowEmptyText) {
 		this.sendButton = v.findViewById(R.id.btn_send);
-		this.sendButton.setOnClickListener(view -> onSendButtonClicked());
+		this.sendButton.setOnClickListener(view -> onSendEvent());
 		this.sendButton.setEnabled(allowEmptyText);
 		this.listener = listener;
-		this.textInput = v.getTextInputController();
+		this.textInput = v.getEmojiTextInputView();
 		this.allowEmptyText = allowEmptyText;
 	}
 
 	@Override
 	public void onTextIsEmptyChanged(boolean isEmpty) {
-		sendButton.setEnabled(enabled && !isEmpty);
+		sendButton.setEnabled(enabled && (!isEmpty || canSendEmptyText()));
 		wasEmpty = isEmpty;
 	}
 
+	@Override
+	public void onSendEvent() {
+		if (canSend()) {
+			listener.onSendClick(textInput.getText(), emptyList());
+		}
+	}
+
+	protected final boolean canSend() {
+		if (textInput.isTooLong()) {
+			Snackbar.make(sendButton, R.string.text_too_long, LENGTH_SHORT)
+					.show();
+			return false;
+		}
+		return enabled && (canSendEmptyText() || !textInput.isEmpty());
+	}
+
+	protected boolean canSendEmptyText() {
+		return allowEmptyText;
+	}
+
 	@Nullable
 	public Parcelable onSaveInstanceState(@Nullable Parcelable superState) {
 		return superState;
@@ -55,23 +77,12 @@ public class TextSendController implements TextValidityListener {
 
 	@CallSuper
 	public void setEnabled(boolean enabled) {
-		sendButton.setEnabled(enabled && (!wasEmpty || allowEmptyText));
+		sendButton.setEnabled(enabled && (!wasEmpty || canSendEmptyText()));
 		this.enabled = enabled;
 	}
 
-	void onSendButtonClicked() {
+	public interface SendListener {
-		if (canSend()) {
+		void onSendClick(@Nullable String text, List<Uri> imageUris);
-			listener.onSendClick(textInput.getText(), emptyList());
-		}
-	}
-
-	protected boolean canSend() {
-		if (textInput.isTooLong()) {
-			Snackbar.make(sendButton, R.string.text_too_long, LENGTH_SHORT)
-					.show();
-			return false;
-		}
-		return enabled && (allowEmptyText || !textInput.isEmpty());
 	}
 
 }

briar-android/src/main/java/org/thoughtcrime/securesms/LICENSE

@@ -1,621 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS

briar-android/src/main/res/drawable/ic_image.xml

@@ -1,8 +1,9 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
-        android:width="24dp"
+	xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
+	android:width="24dp"
-        android:viewportHeight="24.0"
+	android:height="24dp"
-        android:viewportWidth="24.0">
+	android:viewportHeight="24.0"
+	android:viewportWidth="24.0">
 	<path
 		android:fillColor="#000000"
 		android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>

briar-android/src/main/res/layout/emoji_text_input_view.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="horizontal"
+	tools:parentTag="org.briarproject.briar.android.view.KeyboardAwareLinearLayout"
+	tools:showIn="@layout/fragment_reblog">
+
+	<android.support.v7.widget.AppCompatImageButton
+		android:id="@+id/emoji_toggle"
+		android:layout_width="@dimen/text_input_height"
+		android:layout_height="@dimen/text_input_height"
+		android:layout_gravity="bottom"
+		android:background="?attr/selectableItemBackground"
+		android:padding="@dimen/margin_small"
+		android:scaleType="center"
+		android:src="@drawable/ic_emoji_toggle"
+		app:tint="?attr/colorControlNormal"/>
+
+	<com.vanniktech.emoji.EmojiEditText
+		android:id="@+id/input_text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:background="@android:color/transparent"
+		android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
+		android:minHeight="@dimen/text_input_height"
+		android:textColor="?android:attr/textColorPrimary"
+		tools:text="Line 1\nLine 2\nLine 3"/>
+
+</merge>

briar-android/src/main/res/layout/text_input_view.xml

@@ -48,31 +48,12 @@
 		android:layout_height="wrap_content"
 		android:background="@color/card_background">
 
-		<android.support.v7.widget.AppCompatImageButton
+		<org.briarproject.briar.android.view.EmojiTextInputView
-			android:id="@+id/emoji_toggle"
+			android:id="@+id/emojiTextInput"
-			android:layout_width="@dimen/text_input_height"
-			android:layout_height="@dimen/text_input_height"
-			android:layout_gravity="bottom"
-			android:background="?attr/selectableItemBackground"
-			android:padding="@dimen/margin_small"
-			android:scaleType="center"
-			android:src="@drawable/ic_emoji_toggle"
-			app:tint="?attr/colorControlNormal"/>
-
-		<com.vanniktech.emoji.EmojiEditText
-			android:id="@+id/input_text"
 			android:layout_width="0dp"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:background="@android:color/transparent"
+			app:maxTextLines="4"/>
-			android:inputType="textMultiLine|textCapSentences"
-			android:maxLines="4"
-			android:minHeight="@dimen/text_input_height"
-			android:paddingLeft="2dp"
-			android:paddingStart="2dp"
-			android:textColor="?android:attr/textColorPrimary"
-			tools:ignore="RtlSymmetry"
-			tools:text="Line 1\nLine 2\nLine 3"/>
 
 		<FrameLayout
 			android:layout_width="@dimen/text_input_height"

briar-android/src/main/res/layout/text_input_view_large.xml

@@ -22,39 +22,12 @@
 		app:cardCornerRadius="0dp"
 		app:cardUseCompatPadding="false">
 
-		<LinearLayout
+		<org.briarproject.briar.android.view.EmojiTextInputView
+			android:id="@+id/emojiTextInput"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:orientation="horizontal">
+			app:textPaddingBottom="10dp"
-
+			app:textPaddingEnd="@dimen/margin_medium"/>
-			<android.support.v7.widget.AppCompatImageButton
-				android:id="@+id/emoji_toggle"
-				android:layout_width="@dimen/text_input_height"
-				android:layout_height="@dimen/text_input_height"
-				android:layout_gravity="bottom"
-				android:background="?attr/selectableItemBackground"
-				android:padding="@dimen/margin_small"
-				android:scaleType="center"
-				android:src="@drawable/ic_emoji_toggle"
-				app:tint="?attr/colorControlNormal"/>
-
-			<com.vanniktech.emoji.EmojiEditText
-				android:id="@+id/input_text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:background="@android:color/transparent"
-				android:gravity="bottom"
-				android:inputType="textMultiLine|textLongMessage|textCapSentences|textAutoCorrect"
-				android:minHeight="@dimen/text_input_height"
-				android:paddingBottom="10dp"
-				android:paddingEnd="@dimen/margin_small"
-				android:paddingRight="@dimen/margin_small"
-				android:paddingTop="@dimen/margin_small"
-				android:textColor="?android:attr/textColorPrimary"
-				tools:ignore="RtlSymmetry"
-				tools:text="Line 1\nLine 2\nLine 3"/>
-
-		</LinearLayout>
 
 	</android.support.v7.widget.CardView>
 

briar-android/src/main/res/values/attrs.xml

@@ -19,6 +19,12 @@
 		</attr>
 	</declare-styleable>
 
+	<declare-styleable name="EmojiTextInputView">
+		<attr name="textPaddingBottom" format="dimension"/>
+		<attr name="textPaddingEnd" format="dimension"/>
+		<attr name="maxTextLines" format="integer"/>
+	</declare-styleable>
+
 	<declare-styleable name="TextInputView">
 		<attr name="hint" format="string"/>
 		<attr name="allowEmptyText" format="boolean"/>