From 800dfed5c1bf9b3d62b3a6951b8ea14c037fd927 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 20 Nov 2018 19:30:33 -0200 Subject: [PATCH 1/9] [android] support adding image attachments to private messages --- briar-android/build.gradle | 1 + .../briar/android/TestingConstants.java | 6 + .../briar/android/activity/RequestCodes.java | 1 + .../briar/android/blog/ReblogFragment.java | 14 +- .../android/blog/WriteBlogPostActivity.java | 21 +- .../conversation/ConversationActivity.java | 31 ++- .../IntroductionMessageFragment.java | 24 +- .../android/sharing/BaseMessageFragment.java | 16 +- .../android/threaded/ThreadListActivity.java | 6 +- .../view/TextInputAttachmentController.java | 211 ++++++++++++++++++ .../briar/android/view/TextInputView.java | 81 +++++-- .../src/main/res/drawable/ic_image.xml | 9 + .../src/main/res/layout/text_input_view.xml | 76 ++++++- .../main/res/layout/text_input_view_large.xml | 3 +- briar-android/src/main/res/values/dimens.xml | 1 + briar-android/src/main/res/values/strings.xml | 2 + briar-android/witness.gradle | 1 + 17 files changed, 438 insertions(+), 66 deletions(-) create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java create mode 100644 briar-android/src/main/res/drawable/ic_image.xml diff --git a/briar-android/build.gradle b/briar-android/build.gradle index c52aced57..e0463f369 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -105,6 +105,7 @@ dependencies { implementation "com.android.support:cardview-v7:$supportVersion" implementation "com.android.support:support-annotations:$supportVersion" implementation "com.android.support:exifinterface:$supportVersion" + implementation "com.android.support:palette-v7:$supportVersion" implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation "android.arch.lifecycle:extensions:1.1.1" diff --git a/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java b/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java index e3b970dc9..9363db287 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java @@ -30,4 +30,10 @@ public interface TestingConstants { long EXPIRY_DATE = IS_DEBUG_BUILD || IS_BETA_BUILD ? BuildConfig.BuildTimestamp + 90 * 24 * 60 * 60 * 1000L : Long.MAX_VALUE; + + /** + * Feature flag for enabling image attachments. + */ + boolean FEATURE_FLAG_IMAGE_ATTACHMENTS = IS_DEBUG_BUILD; + } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java index 5d087d88b..0fc18c60b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/RequestCodes.java @@ -14,5 +14,6 @@ public interface RequestCodes { int REQUEST_BLUETOOTH_DISCOVERABLE = 10; int REQUEST_UNLOCK = 11; int REQUEST_KEYGUARD_UNLOCK = 12; + int REQUEST_ATTACH_IMAGE = 13; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java index a21557d16..bb3dda396 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java @@ -1,5 +1,6 @@ package org.briarproject.briar.android.blog; +import android.net.Uri; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -20,6 +21,8 @@ import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.view.TextInputView; import org.briarproject.briar.android.view.TextInputView.TextInputListener; +import java.util.List; + import javax.annotation.Nullable; import javax.inject.Inject; @@ -118,10 +121,9 @@ public class ReblogFragment extends BaseFragment implements TextInputListener { } @Override - public void onSendClick(String text) { + public void onSendClick(@Nullable String text, List imageUris) { ui.input.hideSoftKeyboard(); - String comment = getComment(); - feedController.repeatPost(item, comment, + feedController.repeatPost(item, text, new UiExceptionHandler(this) { @Override public void onExceptionUi(DbException exception) { @@ -131,12 +133,6 @@ public class ReblogFragment extends BaseFragment implements TextInputListener { finish(); } - @Nullable - private String getComment() { - if (ui.input.getText().length() == 0) return null; - return ui.input.getText().toString(); - } - private void showProgressBar() { ui.progressBar.setVisibility(VISIBLE); ui.input.setVisibility(GONE); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java index d077f97f8..e54764d78 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java @@ -1,7 +1,9 @@ package org.briarproject.briar.android.blog; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; +import android.support.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; @@ -14,8 +16,9 @@ import org.briarproject.bramble.api.FormatException; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.identity.IdentityManager; import org.briarproject.bramble.api.identity.LocalAuthor; +import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; +import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.sync.GroupId; -import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; @@ -27,6 +30,7 @@ import org.briarproject.briar.api.blog.BlogPost; import org.briarproject.briar.api.blog.BlogPostFactory; import java.security.GeneralSecurityException; +import java.util.List; import java.util.logging.Logger; import javax.inject.Inject; @@ -35,8 +39,12 @@ import static android.view.View.GONE; import static android.view.View.VISIBLE; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; +import static org.briarproject.bramble.util.StringUtils.truncateUtf8; import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH; +@MethodsNotNullByDefault +@ParametersNotNullByDefault public class WriteBlogPostActivity extends BriarActivity implements OnEditorActionListener, TextInputListener { @@ -58,9 +66,8 @@ public class WriteBlogPostActivity extends BriarActivity @Inject volatile BlogManager blogManager; - @SuppressWarnings("ConstantConditions") @Override - public void onCreate(Bundle state) { + public void onCreate(@Nullable Bundle state) { super.onCreate(state); Intent i = getIntent(); @@ -128,17 +135,19 @@ public class WriteBlogPostActivity extends BriarActivity } private void enableOrDisablePublishButton() { - input.setSendButtonEnabled(input.getText().length() > 0); + input.setSendButtonEnabled(!input.isEmpty()); } @Override - public void onSendClick(String text) { + public void onSendClick(@Nullable String text, List imageUris) { + if (isNullOrEmpty(text)) return; + // hide publish button, show progress bar input.hideSoftKeyboard(); input.setVisibility(GONE); progressBar.setVisibility(VISIBLE); - text = StringUtils.truncateUtf8(text, MAX_BLOG_POST_TEXT_LENGTH); + text = truncateUtf8(text, MAX_BLOG_POST_TEXT_LENGTH); storePost(text); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 20a359573..aa183ef74 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -6,6 +6,7 @@ import android.arch.lifecycle.ViewModelProvider; import android.arch.lifecycle.ViewModelProviders; import android.content.DialogInterface; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.annotation.UiThread; @@ -52,7 +53,6 @@ import org.briarproject.bramble.api.sync.Message; import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.event.MessagesAckedEvent; import org.briarproject.bramble.api.sync.event.MessagesSentEvent; -import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.BriarActivity; @@ -64,6 +64,7 @@ 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.TextInputView; +import org.briarproject.briar.android.view.TextInputView.AttachImageListener; import org.briarproject.briar.android.view.TextInputView.TextInputListener; import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.blog.BlogSharingManager; @@ -106,6 +107,7 @@ import static android.support.v4.app.ActivityOptionsCompat.makeSceneTransitionAn import static android.support.v4.view.ViewCompat.setTransitionName; import static android.support.v7.util.SortedList.INVALID_POSITION; import static android.view.Gravity.RIGHT; +import static android.widget.Toast.LENGTH_LONG; import static android.widget.Toast.LENGTH_SHORT; import static java.util.Collections.emptyList; import static java.util.Collections.sort; @@ -115,6 +117,10 @@ import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; +import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; +import static org.briarproject.bramble.util.StringUtils.truncateUtf8; +import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_IMAGE_ATTACHMENTS; +import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_ATTACH_IMAGE; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_INTRODUCTION; import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT; import static org.briarproject.briar.android.conversation.ImageActivity.DATE; @@ -131,7 +137,7 @@ import static uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.S @ParametersNotNullByDefault public class ConversationActivity extends BriarActivity implements EventListener, ConversationListener, TextInputListener, - TextCache, AttachmentCache { + TextCache, AttachmentCache, AttachImageListener { public static final String CONTACT_ID = "briar.CONTACT_ID"; @@ -251,6 +257,9 @@ public class ConversationActivity extends BriarActivity textInputView = findViewById(R.id.text_input_container); textInputView.setListener(this); + if (FEATURE_FLAG_IMAGE_ATTACHMENTS) { + textInputView.setAttachImageListener(this); + } } @Override @@ -267,6 +276,8 @@ public class ConversationActivity extends BriarActivity Snackbar.LENGTH_SHORT); snackbar.getView().setBackgroundResource(R.color.briar_primary); snackbar.show(); + } else if (request == REQUEST_ATTACH_IMAGE && result == RESULT_OK) { + textInputView.onImageReceived(data); } } @@ -573,9 +584,19 @@ public class ConversationActivity extends BriarActivity } @Override - public void onSendClick(String text) { - if (text.isEmpty()) return; - text = StringUtils.truncateUtf8(text, MAX_PRIVATE_MESSAGE_TEXT_LENGTH); + public void onAttachImage(Intent intent) { + startActivityForResult(intent, REQUEST_ATTACH_IMAGE); + } + + @Override + public void onSendClick(@Nullable String text, List imageUris) { + if (!imageUris.isEmpty()) { + Toast.makeText(this, "Not yet implemented.", LENGTH_LONG).show(); + textInputView.setText(""); + return; + } + if (isNullOrEmpty(text)) return; + text = truncateUtf8(text, MAX_PRIVATE_MESSAGE_TEXT_LENGTH); long timestamp = System.currentTimeMillis(); timestamp = Math.max(timestamp, getMinTimestampForNewMessage()); if (messagingGroupId == null) loadGroupId(text, timestamp); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index ea7858e48..96be4eae5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -1,8 +1,8 @@ package org.briarproject.briar.android.introduction; import android.content.Context; +import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v7.app.ActionBar; import android.view.LayoutInflater; @@ -17,7 +17,8 @@ import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; import org.briarproject.bramble.api.db.DbException; -import org.briarproject.bramble.util.StringUtils; +import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; +import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.fragment.BaseFragment; @@ -25,6 +26,7 @@ import org.briarproject.briar.android.view.TextInputView; import org.briarproject.briar.android.view.TextInputView.TextInputListener; import org.briarproject.briar.api.introduction.IntroductionManager; +import java.util.List; import java.util.logging.Logger; import javax.inject.Inject; @@ -38,9 +40,12 @@ import static android.view.View.VISIBLE; import static android.widget.Toast.LENGTH_SHORT; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; +import static org.briarproject.bramble.util.StringUtils.truncateUtf8; import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH; +@MethodsNotNullByDefault +@ParametersNotNullByDefault public class IntroductionMessageFragment extends BaseFragment implements TextInputListener { @@ -84,8 +89,9 @@ public class IntroductionMessageFragment extends BaseFragment } @Override - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { // change toolbar text ActionBar actionBar = introductionActivity.getSupportActionBar(); @@ -184,14 +190,14 @@ public class IntroductionMessageFragment extends BaseFragment } @Override - public void onSendClick(@NonNull String text) { + public void onSendClick(@Nullable String text, List imageUris) { // disable button to prevent accidental double invitations ui.message.setSendButtonEnabled(false); - String txt = ui.message.getText().toString(); - if (txt.isEmpty()) txt = null; - else txt = StringUtils.truncateUtf8(txt, MAX_INTRODUCTION_TEXT_LENGTH); - makeIntroduction(contact1, contact2, txt); + if (text != null) { + text = truncateUtf8(text, MAX_INTRODUCTION_TEXT_LENGTH); + } + makeIntroduction(contact1, contact2, text); // don't wait for the introduction to be made before finishing activity introductionActivity.hideSoftKeyboard(ui.message); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index c4fee6429..bcdfdedd5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -1,7 +1,9 @@ package org.briarproject.briar.android.sharing; import android.content.Context; +import android.net.Uri; import android.os.Bundle; +import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.annotation.UiThread; import android.support.design.widget.Snackbar; @@ -10,17 +12,23 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +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.TextInputListener; +import java.util.List; + import static android.support.design.widget.Snackbar.LENGTH_SHORT; import static org.briarproject.bramble.util.StringUtils.truncateUtf8; import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong; import static org.briarproject.briar.api.sharing.SharingConstants.MAX_INVITATION_TEXT_LENGTH; +@MethodsNotNullByDefault +@ParametersNotNullByDefault public abstract class BaseMessageFragment extends BaseFragment implements TextInputListener { @@ -34,8 +42,9 @@ public abstract class BaseMessageFragment extends BaseFragment } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { + public View onCreateView(@Nullable LayoutInflater inflater, + @Nullable ViewGroup container, + @Nullable Bundle savedInstanceState) { // inflate view View v = inflater.inflate(R.layout.fragment_message, container, @@ -76,7 +85,8 @@ public abstract class BaseMessageFragment extends BaseFragment } @Override - public void onSendClick(String text) { + public void onSendClick(@Nullable String text, List imageUris) { + if (text == null) return; if (utf8IsTooLong(text, listener.getMaximumTextLength())) { Snackbar.make(message, R.string.text_too_long, LENGTH_SHORT).show(); return; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index f99598fc5..d9534edb6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -1,6 +1,7 @@ package org.briarproject.briar.android.threaded; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.support.annotation.CallSuper; import android.support.annotation.StringRes; @@ -33,6 +34,7 @@ import org.briarproject.briar.api.client.NamedGroup; import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout; import java.util.Collection; +import java.util.List; import java.util.logging.Logger; import javax.annotation.Nullable; @@ -348,8 +350,8 @@ public abstract class ThreadListActivity imageUris) { + if (text == null || text.trim().length() == 0) return; if (utf8IsTooLong(text, getMaxTextLength())) { displaySnackbar(R.string.text_too_long); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java new file mode 100644 index 000000000..b711c456d --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java @@ -0,0 +1,211 @@ +package org.briarproject.briar.android.view; + +import android.content.ClipData; +import android.content.Intent; +import android.graphics.Bitmap; +import android.net.Uri; +import android.support.annotation.Nullable; +import android.support.annotation.UiThread; +import android.support.design.widget.FloatingActionButton; +import android.support.v7.graphics.Palette; +import android.support.v7.widget.AppCompatImageButton; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + +import com.bumptech.glide.load.DataSource; +import com.bumptech.glide.load.engine.GlideException; +import com.bumptech.glide.request.RequestListener; +import com.bumptech.glide.request.target.Target; +import com.vanniktech.emoji.EmojiEditText; + +import org.briarproject.briar.R; +import org.briarproject.briar.android.conversation.glide.GlideApp; +import org.briarproject.briar.android.view.TextInputView.AttachImageListener; + +import java.util.ArrayList; +import java.util.List; + +import static android.content.Intent.ACTION_GET_CONTENT; +import static android.content.Intent.ACTION_OPEN_DOCUMENT; +import static android.content.Intent.CATEGORY_OPENABLE; +import static android.content.Intent.EXTRA_ALLOW_MULTIPLE; +import static android.graphics.Color.BLACK; +import static android.graphics.Color.WHITE; +import static android.os.Build.VERSION.SDK_INT; +import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_YES; +import static android.support.v7.app.AppCompatDelegate.getDefaultNightMode; +import static android.view.View.GONE; +import static android.view.View.INVISIBLE; +import static android.view.View.VISIBLE; +import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; +import static com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.FIT_CENTER; +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; + +class TextInputAttachmentController implements TextWatcher { + + private final EmojiEditText editText; + private final View sendButton; + private final AppCompatImageButton imageButton; + private final ViewGroup imageLayout; + private final ImageView imageView; + + private final AttachImageListener listener; + + private String textHint; + private List imageUris = emptyList(); + + public TextInputAttachmentController(View v, EmojiEditText editText, + View sendButton, AttachImageListener listener) { + + imageLayout = v.findViewById(R.id.imageLayout); + imageView = v.findViewById(R.id.imageView); + FloatingActionButton imageCancelButton = + v.findViewById(R.id.imageCancelButton); + imageButton = v.findViewById(R.id.imageButton); + + this.listener = listener; + this.sendButton = sendButton; + this.editText = editText; + this.textHint = editText.getHint().toString(); + + editText.addTextChangedListener(this); + imageButton.setOnClickListener(view -> onImageButtonClicked()); + imageCancelButton.setOnClickListener(view -> afterSendButtonClicked()); + showImageButton(true); + } + + private void onImageButtonClicked() { + Intent intent = new Intent(SDK_INT >= 19 ? + ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT); + intent.addCategory(CATEGORY_OPENABLE); + intent.setType("image/*"); + if (SDK_INT >= 18) + intent.putExtra(EXTRA_ALLOW_MULTIPLE, false); + listener.onAttachImage(intent); + } + + void onImageReceived(@Nullable Intent resultData) { + if (resultData == null) return; + if (resultData.getData() != null) { + imageUris = singletonList(resultData.getData()); + } else if (SDK_INT >= 18 && resultData.getClipData() != null) { + ClipData clipData = resultData.getClipData(); + imageUris = new ArrayList<>(clipData.getItemCount()); + for (int i = 0; i < clipData.getItemCount(); i++) { + imageUris.add(clipData.getItemAt(i).getUri()); + } + } else { + return; + } + showImageButton(false); + editText.setHint(R.string.image_caption_hint); + imageLayout.setVisibility(VISIBLE); + GlideApp.with(imageView) + .asBitmap() + .load(imageUris.get(0)) // TODO show more than the first + .diskCacheStrategy(NONE) + .downsample(FIT_CENTER) + .addListener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, + Object model, Target target, + boolean isFirstResource) { + return false; + } + + @Override + public boolean onResourceReady(Bitmap resource, + Object model, Target target, + DataSource dataSource, boolean isFirstResource) { + Palette.from(resource).generate( + TextInputAttachmentController.this::onPaletteGenerated); + return false; + } + }) + .into(imageView); + } + + @UiThread + private void onPaletteGenerated(@Nullable Palette palette) { + int color; + if (palette == null) { + color = getDefaultNightMode() == MODE_NIGHT_YES ? BLACK : WHITE; + } else { + color = getDefaultNightMode() == MODE_NIGHT_YES ? + palette.getDarkMutedColor(BLACK) : + palette.getLightMutedColor(WHITE); + } + imageView.setBackgroundColor(color); + } + + private void showImageButton(boolean showImageButton) { + if (showImageButton) { + imageButton.setVisibility(VISIBLE); + if (SDK_INT <= 15) { + sendButton.setVisibility(INVISIBLE); + } else { + sendButton.clearAnimation(); + sendButton.animate().alpha(0f).withEndAction( + () -> sendButton.setVisibility(INVISIBLE) + ).start(); + imageButton.clearAnimation(); + imageButton.animate().alpha(1f).start(); + } + } else { + sendButton.setVisibility(VISIBLE); + if (SDK_INT <= 15) { + imageButton.setVisibility(INVISIBLE); + } else { + sendButton.clearAnimation(); + sendButton.animate().alpha(1f).start(); + imageButton.clearAnimation(); + imageButton.animate().alpha(0f).withEndAction( + () -> imageButton.setVisibility(INVISIBLE) + ).start(); + } + } + } + + @Override + public void beforeTextChanged(CharSequence s, int start, int count, + int after) { + // noop + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, + int count) { + if (start != 0 || !imageUris.isEmpty()) return; + if (s.length() > 0) showImageButton(false); + else if (s.length() == 0) showImageButton(true); + } + + @Override + public void afterTextChanged(Editable s) { + // noop + } + + public List getUris() { + return imageUris; + } + + public void saveHint(String hint) { + textHint = hint; + } + + void afterSendButtonClicked() { + // restore hint + editText.setHint(textHint); + // hide image layout + imageLayout.setVisibility(GONE); + // reset image URIs + imageUris = emptyList(); + // show the image button again, so images can get attached + showImageButton(true); + } + +} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index 638db9af9..a935b8e9c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -2,10 +2,13 @@ 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.IBinder; import android.support.annotation.CallSuper; +import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.annotation.UiThread; import android.support.v7.widget.AppCompatImageButton; @@ -26,13 +29,16 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.BriarApplication; import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout; -import javax.annotation.Nullable; +import java.util.List; + 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.Collections.emptyList; +import static java.util.Objects.requireNonNull; @UiThread @MethodsNotNullByDefault @@ -44,6 +50,8 @@ public class TextInputView extends KeyboardAwareLinearLayout { @Nullable TextInputListener listener; + @Nullable + TextInputAttachmentController attachmentController; AppCompatImageButton emojiToggle; EmojiEditText editText; @@ -69,12 +77,12 @@ public class TextInputView extends KeyboardAwareLinearLayout { setOrientation(VERTICAL); setLayoutTransition(new LayoutTransition()); inflateLayout(context); - setUpViews(context, attrs); + if (!isInEditMode()) setUpViews(context, attrs); } protected void inflateLayout(Context context) { - LayoutInflater inflater = (LayoutInflater) context - .getSystemService(LAYOUT_INFLATER_SERVICE); + LayoutInflater inflater = (LayoutInflater) requireNonNull( + context.getSystemService(LAYOUT_INFLATER_SERVICE)); inflater.inflate(R.layout.text_input_view, this, true); } @@ -96,18 +104,33 @@ public class TextInputView extends KeyboardAwareLinearLayout { String hint = attributes.getString(R.styleable.TextInputView_hint); attributes.recycle(); - if (hint != null) editText.setHint(hint); + if (hint != null) setHint(hint); emojiToggle.setOnClickListener(v -> emojiPopup.toggle()); editText.setOnClickListener(v -> showSoftKeyboard()); editText.setOnKeyListener((v, keyCode, event) -> { if (keyCode == KEYCODE_ENTER && event.isCtrlPressed()) { - trySendMessage(); + onSendButtonClicked(); return true; } return false; }); - sendButton.setOnClickListener(v -> trySendMessage()); + sendButton.setOnClickListener(v -> onSendButtonClicked()); + } + + public void setListener(TextInputListener listener) { + this.listener = listener; + } + + /** + * Call this during onCreate() to enable image attachment support. + * Do not call it twice! + */ + public void setAttachImageListener(AttachImageListener imageListener) { + if (attachmentController != null) throw new IllegalStateException(); + attachmentController = new TextInputAttachmentController(getRootView(), + editText, sendButton, imageListener + ); } private void showEmojiIcon() { @@ -118,10 +141,23 @@ public class TextInputView extends KeyboardAwareLinearLayout { emojiToggle.setImageResource(R.drawable.ic_keyboard); } - private void trySendMessage() { + private void onSendButtonClicked() { if (listener != null) { - listener.onSendClick(editText.getText().toString()); + Editable editable = editText.getText(); + String text = editable == null || editable.length() == 0 ? + null : editable.toString(); + List imageUris = attachmentController == null ? emptyList() : + attachmentController.getUris(); + listener.onSendClick(text, imageUris); } + if (attachmentController != null) { + attachmentController.afterSendButtonClicked(); + } + } + + public void onImageReceived(@Nullable Intent resultData) { + if (attachmentController == null) throw new IllegalStateException(); + attachmentController.onImageReceived(resultData); } @Override @@ -139,12 +175,17 @@ public class TextInputView extends KeyboardAwareLinearLayout { editText.setText(text); } - public Editable getText() { - return editText.getText(); + public boolean isEmpty() { + return editText.getText() == null || editText.getText().length() == 0; } public void setHint(@StringRes int res) { - editText.setHint(res); + setHint(getContext().getString(res)); + } + + public void setHint(String hint) { + if (attachmentController != null) attachmentController.saveHint(hint); + editText.setHint(hint); } public void setSendButtonEnabled(boolean enabled) { @@ -155,24 +196,26 @@ public class TextInputView extends KeyboardAwareLinearLayout { editText.addTextChangedListener(watcher); } - public void setListener(TextInputListener listener) { - this.listener = listener; - } - public void showSoftKeyboard() { Object o = getContext().getSystemService(INPUT_METHOD_SERVICE); - ((InputMethodManager) o).showSoftInput(editText, SHOW_IMPLICIT); + InputMethodManager imm = (InputMethodManager) requireNonNull(o); + imm.showSoftInput(editText, SHOW_IMPLICIT); } public void hideSoftKeyboard() { if (emojiPopup.isShowing()) emojiPopup.dismiss(); IBinder token = editText.getWindowToken(); Object o = getContext().getSystemService(INPUT_METHOD_SERVICE); - ((InputMethodManager) o).hideSoftInputFromWindow(token, 0); + InputMethodManager imm = (InputMethodManager) requireNonNull(o); + imm.hideSoftInputFromWindow(token, 0); + } + + public interface AttachImageListener { + void onAttachImage(Intent intent); } public interface TextInputListener { - void onSendClick(String text); + void onSendClick(@Nullable String text, List imageUris); } } diff --git a/briar-android/src/main/res/drawable/ic_image.xml b/briar-android/src/main/res/drawable/ic_image.xml new file mode 100644 index 000000000..46efff4c9 --- /dev/null +++ b/briar-android/src/main/res/drawable/ic_image.xml @@ -0,0 +1,9 @@ + + + diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml index d1730c469..1ceb3a43b 100644 --- a/briar-android/src/main/res/layout/text_input_view.xml +++ b/briar-android/src/main/res/layout/text_input_view.xml @@ -5,12 +5,43 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:animateLayoutChanges="true" tools:showIn="@layout/activity_conversation"> + + + + + + + + - + android:layout_gravity="bottom"> + + + + + + diff --git a/briar-android/src/main/res/layout/text_input_view_large.xml b/briar-android/src/main/res/layout/text_input_view_large.xml index fcc944a7c..e3abf0f82 100644 --- a/briar-android/src/main/res/layout/text_input_view_large.xml +++ b/briar-android/src/main/res/layout/text_input_view_large.xml @@ -64,6 +64,7 @@ android:layout_marginEnd="@dimen/margin_small" android:layout_marginLeft="@dimen/margin_small" android:layout_marginRight="@dimen/margin_small" - android:layout_marginStart="@dimen/margin_small"/> + android:layout_marginStart="@dimen/margin_small" + tools:text="@string/send"/> diff --git a/briar-android/src/main/res/values/dimens.xml b/briar-android/src/main/res/values/dimens.xml index 81f7d4377..608470e78 100644 --- a/briar-android/src/main/res/values/dimens.xml +++ b/briar-android/src/main/res/values/dimens.xml @@ -70,6 +70,7 @@ 42dp + 150dp 16sp 32sp 2dp diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 2f87d2a26..e093fc0fb 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -127,6 +127,8 @@ No messages. No messages to show Type message + Add a caption (optional) + Attach image Change contact name Contact name Change diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index ee7273494..eaf6c6271 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -40,6 +40,7 @@ dependencyVerification { 'com.android.support:interpolator:28.0.0:interpolator-28.0.0.aar:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea', 'com.android.support:loader:28.0.0:loader-28.0.0.aar:920b85efd72dc33e915b0f88a883fe73b88483c6df8751a741e17611f2460341', 'com.android.support:localbroadcastmanager:28.0.0:localbroadcastmanager-28.0.0.aar:d287c823af5fdde72c099fcfc5f630efe9687af7a914343ae6fd92de32c8a806', + 'com.android.support:palette-v7:28.0.0:palette-v7-28.0.0.aar:317202dddb953d152d0677dbd8bb3b9d8ef8dcd0bdee0da4f40c98826e4960e6', 'com.android.support:preference-v14:28.0.0:preference-v14-28.0.0.aar:8133c6e19233fa51e036a341e6d3f4adeead3375cebf777efced0fe154c3267e', 'com.android.support:preference-v7:28.0.0:preference-v7-28.0.0.aar:75eabe936d1fc3b178450a554c4d433466036f2be6d6dccdf971eac9590fdbf5', 'com.android.support:print:28.0.0:print-28.0.0.aar:4be8a812d73e4a80e35b91ceae127def3f0bb9726bf3bc439aa0cc81503f5728', From 4d594acad5214dec4bf3e0aef3f36eed52eb2603 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 23 Nov 2018 17:16:54 -0200 Subject: [PATCH 2/9] [android] Save attached (but not sent) image on screen rotation --- .../view/TextInputAttachmentController.java | 59 ++++++++++++++++++- .../briar/android/view/TextInputView.java | 23 ++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java index b711c456d..3258cd67f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java @@ -4,9 +4,12 @@ import android.content.ClipData; import android.content.Intent; import android.graphics.Bitmap; import android.net.Uri; +import android.os.Parcel; +import android.os.Parcelable; import android.support.annotation.Nullable; import android.support.annotation.UiThread; import android.support.design.widget.FloatingActionButton; +import android.support.v4.view.AbsSavedState; import android.support.v7.graphics.Palette; import android.support.v7.widget.AppCompatImageButton; import android.text.Editable; @@ -35,6 +38,7 @@ import static android.content.Intent.EXTRA_ALLOW_MULTIPLE; import static android.graphics.Color.BLACK; import static android.graphics.Color.WHITE; import static android.os.Build.VERSION.SDK_INT; +import static android.support.v4.view.AbsSavedState.EMPTY_STATE; import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_YES; import static android.support.v7.app.AppCompatDelegate.getDefaultNightMode; import static android.view.View.GONE; @@ -92,15 +96,19 @@ class TextInputAttachmentController implements TextWatcher { if (resultData == null) return; if (resultData.getData() != null) { imageUris = singletonList(resultData.getData()); + onNewUris(); } else if (SDK_INT >= 18 && resultData.getClipData() != null) { ClipData clipData = resultData.getClipData(); imageUris = new ArrayList<>(clipData.getItemCount()); for (int i = 0; i < clipData.getItemCount(); i++) { imageUris.add(clipData.getItemAt(i).getUri()); } - } else { - return; + onNewUris(); } + } + + private void onNewUris() { + if (imageUris.isEmpty()) return; showImageButton(false); editText.setHint(R.string.image_caption_hint); imageLayout.setVisibility(VISIBLE); @@ -208,4 +216,51 @@ class TextInputAttachmentController implements TextWatcher { showImageButton(true); } + public Parcelable onSaveInstanceState(@Nullable Parcelable superState) { + SavedState state = + new SavedState(superState == null ? EMPTY_STATE : superState); + state.imageUris = imageUris; + return state; + } + + @Nullable + public Parcelable onRestoreInstanceState(Parcelable inState) { + SavedState state = (SavedState) inState; + imageUris = state.imageUris; + onNewUris(); + return state.getSuperState(); + } + + private static class SavedState extends AbsSavedState { + private List imageUris; + + private SavedState(Parcelable superState) { + super(superState); + } + + private SavedState(Parcel in) { + super(in); + //noinspection unchecked + imageUris = in.readArrayList(Uri.class.getClassLoader()); + + } + + @Override + public void writeToParcel(Parcel out, int flags) { + super.writeToParcel(out, flags); + out.writeList(imageUris); + } + + public static final Parcelable.Creator CREATOR + = new Parcelable.Creator() { + public SavedState createFromParcel(Parcel in) { + return new SavedState(in); + } + + public SavedState[] newArray(int size) { + return new SavedState[size]; + } + }; + } + } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index a935b8e9c..383361a69 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -7,6 +7,7 @@ import android.content.res.TypedArray; import android.graphics.Rect; import android.net.Uri; import android.os.IBinder; +import android.os.Parcelable; import android.support.annotation.CallSuper; import android.support.annotation.Nullable; import android.support.annotation.StringRes; @@ -77,6 +78,7 @@ public class TextInputView extends KeyboardAwareLinearLayout { setOrientation(VERTICAL); setLayoutTransition(new LayoutTransition()); inflateLayout(context); + setSaveEnabled(true); if (!isInEditMode()) setUpViews(context, attrs); } @@ -118,6 +120,27 @@ public class TextInputView extends KeyboardAwareLinearLayout { sendButton.setOnClickListener(v -> onSendButtonClicked()); } + @Nullable + @Override + protected Parcelable onSaveInstanceState() { + Parcelable superState = super.onSaveInstanceState(); + if (attachmentController != null) { + superState = attachmentController.onSaveInstanceState(superState); + } + return superState; + } + + @Override + protected void onRestoreInstanceState(Parcelable state) { + if (attachmentController != null) { + Parcelable outState = + attachmentController.onRestoreInstanceState(state); + super.onRestoreInstanceState(outState); + } else { + super.onRestoreInstanceState(state); + } + } + public void setListener(TextInputListener listener) { this.listener = listener; } From f536cfdab85a9dbba64b86201c6dfab0f4b06178 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 29 Nov 2018 20:29:43 -0200 Subject: [PATCH 3/9] [android] first round of review comments for attaching images --- .../android/sharing/BaseMessageFragment.java | 3 -- .../view/TextInputAttachmentController.java | 30 ++++++++++++------- .../briar/android/view/TextInputView.java | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index bcdfdedd5..1934acd48 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -23,9 +23,7 @@ import org.briarproject.briar.android.view.TextInputView.TextInputListener; import java.util.List; import static android.support.design.widget.Snackbar.LENGTH_SHORT; -import static org.briarproject.bramble.util.StringUtils.truncateUtf8; import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong; -import static org.briarproject.briar.api.sharing.SharingConstants.MAX_INVITATION_TEXT_LENGTH; @MethodsNotNullByDefault @ParametersNotNullByDefault @@ -96,7 +94,6 @@ public abstract class BaseMessageFragment extends BaseFragment message.setSendButtonEnabled(false); message.hideSoftKeyboard(); - text = truncateUtf8(text, MAX_INVITATION_TEXT_LENGTH); if(!listener.onButtonClick(text)) { message.setSendButtonEnabled(true); message.showSoftKeyboard(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java index 3258cd67f..24dd47ffb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputAttachmentController.java @@ -49,6 +49,7 @@ import static com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.FIT_CEN import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; +@UiThread class TextInputAttachmentController implements TextWatcher { private final EmojiEditText editText; @@ -78,7 +79,10 @@ class TextInputAttachmentController implements TextWatcher { editText.addTextChangedListener(this); imageButton.setOnClickListener(view -> onImageButtonClicked()); - imageCancelButton.setOnClickListener(view -> afterSendButtonClicked()); + imageCancelButton.setOnClickListener(view -> { + editText.setText(null); + reset(); + }); showImageButton(true); } @@ -87,7 +91,7 @@ class TextInputAttachmentController implements TextWatcher { ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT); intent.addCategory(CATEGORY_OPENABLE); intent.setType("image/*"); - if (SDK_INT >= 18) + if (SDK_INT >= 18) // TODO set true to allow attaching multiple images intent.putExtra(EXTRA_ALLOW_MULTIPLE, false); listener.onAttachImage(intent); } @@ -122,6 +126,7 @@ class TextInputAttachmentController implements TextWatcher { public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) { + reset(); return false; } @@ -157,9 +162,11 @@ class TextInputAttachmentController implements TextWatcher { sendButton.setVisibility(INVISIBLE); } else { sendButton.clearAnimation(); - sendButton.animate().alpha(0f).withEndAction( - () -> sendButton.setVisibility(INVISIBLE) - ).start(); + sendButton.setEnabled(false); + sendButton.animate().alpha(0f).withEndAction(() -> { + sendButton.setVisibility(INVISIBLE); + imageButton.setEnabled(true); + }).start(); imageButton.clearAnimation(); imageButton.animate().alpha(1f).start(); } @@ -171,9 +178,11 @@ class TextInputAttachmentController implements TextWatcher { sendButton.clearAnimation(); sendButton.animate().alpha(1f).start(); imageButton.clearAnimation(); - imageButton.animate().alpha(0f).withEndAction( - () -> imageButton.setVisibility(INVISIBLE) - ).start(); + imageButton.setEnabled(false); + imageButton.animate().alpha(0f).withEndAction(() -> { + imageButton.setVisibility(INVISIBLE); + sendButton.setEnabled(true); + }).start(); } } } @@ -189,7 +198,7 @@ class TextInputAttachmentController implements TextWatcher { int count) { if (start != 0 || !imageUris.isEmpty()) return; if (s.length() > 0) showImageButton(false); - else if (s.length() == 0) showImageButton(true); + else showImageButton(true); } @Override @@ -205,7 +214,7 @@ class TextInputAttachmentController implements TextWatcher { textHint = hint; } - void afterSendButtonClicked() { + void reset() { // restore hint editText.setHint(textHint); // hide image layout @@ -242,7 +251,6 @@ class TextInputAttachmentController implements TextWatcher { super(in); //noinspection unchecked imageUris = in.readArrayList(Uri.class.getClassLoader()); - } @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index 383361a69..b98aac366 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -174,7 +174,7 @@ public class TextInputView extends KeyboardAwareLinearLayout { listener.onSendClick(text, imageUris); } if (attachmentController != null) { - attachmentController.afterSendButtonClicked(); + attachmentController.reset(); } } From 8fe49d99618cb2667b4203a941df6a231c1e4664 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 3 Dec 2018 11:52:39 -0200 Subject: [PATCH 4/9] [android] Re-factor TextInputViews --- .../briar/android/blog/ReblogFragment.java | 10 +- .../android/blog/WriteBlogPostActivity.java | 32 +--- .../conversation/ConversationActivity.java | 16 +- .../IntroductionMessageFragment.java | 15 +- .../conversation/GroupActivity.java | 2 +- .../creation/CreateGroupController.java | 5 +- .../creation/CreateGroupControllerImpl.java | 12 +- .../creation/GroupInviteActivity.java | 3 +- .../android/sharing/BaseMessageFragment.java | 25 +-- .../briar/android/sharing/ShareActivity.java | 5 +- .../android/sharing/ShareBlogActivity.java | 2 +- .../android/sharing/ShareBlogController.java | 4 +- .../sharing/ShareBlogControllerImpl.java | 9 +- .../android/sharing/ShareForumActivity.java | 2 +- .../android/sharing/ShareForumController.java | 4 +- .../sharing/ShareForumControllerImpl.java | 9 +- .../android/threaded/ThreadListActivity.java | 19 +- ...ler.java => TextAttachmentController.java} | 98 +++++------ .../android/view/TextInputController.java | 165 ++++++++++++++++++ .../briar/android/view/TextInputView.java | 145 ++++++--------- .../android/view/TextSendController.java | 62 +++++++ .../main/res/layout/activity_conversation.xml | 5 +- .../src/main/res/layout/fragment_message.xml | 1 + .../src/main/res/layout/fragment_reblog.xml | 1 + .../main/res/layout/introduction_message.xml | 1 + .../src/main/res/layout/text_input_view.xml | 28 +-- briar-android/src/main/res/values/attrs.xml | 2 + 27 files changed, 416 insertions(+), 266 deletions(-) rename briar-android/src/main/java/org/briarproject/briar/android/view/{TextInputAttachmentController.java => TextAttachmentController.java} (81%) create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java index bb3dda396..94f75cb8c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java @@ -19,7 +19,7 @@ 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.TextInputListener; +import org.briarproject.briar.android.view.TextInputView.SendListener; import java.util.List; @@ -32,10 +32,11 @@ import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; import static org.briarproject.briar.android.blog.BasePostFragment.POST_ID; +import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH; @MethodsNotNullByDefault @ParametersNotNullByDefault -public class ReblogFragment extends BaseFragment implements TextInputListener { +public class ReblogFragment extends BaseFragment implements SendListener { public static final String TAG = ReblogFragment.class.getName(); @@ -80,7 +81,8 @@ public class ReblogFragment extends BaseFragment implements TextInputListener { View v = inflater.inflate(R.layout.fragment_reblog, container, false); ui = new ViewHolder(v); ui.post.setTransitionName(postId); - ui.input.setSendButtonEnabled(false); + ui.input.setEnabled(false); + ui.input.setMaxTextLength(MAX_BLOG_POST_TEXT_LENGTH); showProgressBar(); return v; @@ -116,7 +118,7 @@ public class ReblogFragment extends BaseFragment implements TextInputListener { ui.post.hideReblogButton(); ui.input.setListener(this); - ui.input.setSendButtonEnabled(true); + ui.input.setEnabled(true); ui.scrollView.post(() -> ui.scrollView.fullScroll(FOCUS_DOWN)); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java index e54764d78..e26e2e05e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java @@ -4,8 +4,6 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; -import android.text.Editable; -import android.text.TextWatcher; import android.view.KeyEvent; import android.view.MenuItem; import android.widget.ProgressBar; @@ -23,7 +21,7 @@ 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.TextInputListener; +import org.briarproject.briar.android.view.TextInputView.SendListener; import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogPost; @@ -40,13 +38,12 @@ import static android.view.View.VISIBLE; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; -import static org.briarproject.bramble.util.StringUtils.truncateUtf8; import static org.briarproject.briar.api.blog.BlogConstants.MAX_BLOG_POST_TEXT_LENGTH; @MethodsNotNullByDefault @ParametersNotNullByDefault public class WriteBlogPostActivity extends BriarActivity - implements OnEditorActionListener, TextInputListener { + implements OnEditorActionListener, SendListener { private static final Logger LOG = Logger.getLogger(WriteBlogPostActivity.class.getName()); @@ -78,23 +75,7 @@ public class WriteBlogPostActivity extends BriarActivity setContentView(R.layout.activity_write_blog_post); input = findViewById(R.id.textInput); - input.setSendButtonEnabled(false); - input.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, - int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, - int count) { - } - - @Override - public void afterTextChanged(Editable s) { - enableOrDisablePublishButton(); - } - }); + input.setMaxTextLength(MAX_BLOG_POST_TEXT_LENGTH); input.setListener(this); progressBar = findViewById(R.id.progressBar); @@ -134,20 +115,15 @@ public class WriteBlogPostActivity extends BriarActivity return true; } - private void enableOrDisablePublishButton() { - input.setSendButtonEnabled(!input.isEmpty()); - } - @Override public void onSendClick(@Nullable String text, List imageUris) { - if (isNullOrEmpty(text)) return; + if (isNullOrEmpty(text)) throw new AssertionError(); // hide publish button, show progress bar input.hideSoftKeyboard(); input.setVisibility(GONE); progressBar.setVisibility(VISIBLE); - text = truncateUtf8(text, MAX_BLOG_POST_TEXT_LENGTH); storePost(text); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index aa183ef74..890e8f16a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -65,7 +65,7 @@ import org.briarproject.briar.android.privategroup.conversation.GroupActivity; import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.android.view.TextInputView; import org.briarproject.briar.android.view.TextInputView.AttachImageListener; -import org.briarproject.briar.android.view.TextInputView.TextInputListener; +import org.briarproject.briar.android.view.TextInputView.SendListener; import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.client.ProtocolStateException; @@ -118,7 +118,6 @@ import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; -import static org.briarproject.bramble.util.StringUtils.truncateUtf8; import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_IMAGE_ATTACHMENTS; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_ATTACH_IMAGE; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_INTRODUCTION; @@ -136,7 +135,7 @@ import static uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt.S @MethodsNotNullByDefault @ParametersNotNullByDefault public class ConversationActivity extends BriarActivity - implements EventListener, ConversationListener, TextInputListener, + implements EventListener, ConversationListener, SendListener, TextCache, AttachmentCache, AttachImageListener { public static final String CONTACT_ID = "briar.CONTACT_ID"; @@ -256,6 +255,8 @@ public class ConversationActivity extends BriarActivity list.setEmptyText(getString(R.string.no_private_messages)); textInputView = findViewById(R.id.text_input_container); + textInputView.setMaxTextLength(MAX_PRIVATE_MESSAGE_TEXT_LENGTH); + textInputView.setEnabled(false); textInputView.setListener(this); if (FEATURE_FLAG_IMAGE_ATTACHMENTS) { textInputView.setAttachImageListener(this); @@ -416,7 +417,7 @@ public class ConversationActivity extends BriarActivity runOnUiThreadUnlessDestroyed(() -> { if (revision == adapter.getRevision()) { adapter.incrementRevision(); - textInputView.setSendButtonEnabled(true); + textInputView.setEnabled(true); List items = createItems(headers); adapter.addAll(items); list.showData(); @@ -592,16 +593,15 @@ public class ConversationActivity extends BriarActivity public void onSendClick(@Nullable String text, List imageUris) { if (!imageUris.isEmpty()) { Toast.makeText(this, "Not yet implemented.", LENGTH_LONG).show(); - textInputView.setText(""); + textInputView.clearText(); return; } - if (isNullOrEmpty(text)) return; - text = truncateUtf8(text, MAX_PRIVATE_MESSAGE_TEXT_LENGTH); + if (isNullOrEmpty(text)) throw new AssertionError(); long timestamp = System.currentTimeMillis(); timestamp = Math.max(timestamp, getMinTimestampForNewMessage()); if (messagingGroupId == null) loadGroupId(text, timestamp); else createMessage(text, timestamp); - textInputView.setText(""); + textInputView.clearText(); } private long getMinTimestampForNewMessage() { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index 96be4eae5..651a05413 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -23,7 +23,7 @@ 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.TextInputListener; +import org.briarproject.briar.android.view.TextInputView.SendListener; import org.briarproject.briar.api.introduction.IntroductionManager; import java.util.List; @@ -40,14 +40,13 @@ import static android.view.View.VISIBLE; import static android.widget.Toast.LENGTH_SHORT; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; -import static org.briarproject.bramble.util.StringUtils.truncateUtf8; import static org.briarproject.briar.android.util.UiUtils.getContactDisplayName; import static org.briarproject.briar.api.introduction.IntroductionConstants.MAX_INTRODUCTION_TEXT_LENGTH; @MethodsNotNullByDefault @ParametersNotNullByDefault public class IntroductionMessageFragment extends BaseFragment - implements TextInputListener { + implements SendListener { public static final String TAG = IntroductionMessageFragment.class.getName(); @@ -103,7 +102,8 @@ public class IntroductionMessageFragment extends BaseFragment View v = inflater.inflate(R.layout.introduction_message, container, false); ui = new ViewHolder(v); - ui.message.setSendButtonEnabled(false); + ui.message.setMaxTextLength(MAX_INTRODUCTION_TEXT_LENGTH); + ui.message.setEnabled(false); return v; } @@ -168,7 +168,7 @@ public class IntroductionMessageFragment extends BaseFragment // show views ui.notPossible.setVisibility(GONE); ui.message.setVisibility(VISIBLE); - ui.message.setSendButtonEnabled(true); + ui.message.setEnabled(true); ui.message.showSoftKeyboard(); } else { ui.notPossible.setVisibility(VISIBLE); @@ -192,11 +192,8 @@ public class IntroductionMessageFragment extends BaseFragment @Override public void onSendClick(@Nullable String text, List imageUris) { // disable button to prevent accidental double invitations - ui.message.setSendButtonEnabled(false); + ui.message.setEnabled(false); - if (text != null) { - text = truncateUtf8(text, MAX_INTRODUCTION_TEXT_LENGTH); - } makeIntroduction(contact1, contact2, text); // don't wait for the introduction to be made before finishing activity diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java index 65b2587e9..cc60fa1e6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java @@ -196,7 +196,7 @@ public class GroupActivity extends private void setGroupEnabled(boolean enabled) { isDissolved = !enabled; - textInput.setSendButtonEnabled(enabled); + textInput.setEnabled(enabled); list.getRecyclerView().setAlpha(enabled ? 1f : 0.5f); if (!enabled) { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java index 56a7614c0..6d4692c71 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupController.java @@ -1,5 +1,7 @@ package org.briarproject.briar.android.privategroup.creation; +import android.support.annotation.Nullable; + import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.db.DbException; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; @@ -18,6 +20,7 @@ public interface CreateGroupController ResultExceptionHandler result); void sendInvitation(GroupId g, Collection contacts, - String text, ResultExceptionHandler result); + @Nullable String text, + ResultExceptionHandler result); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java index efdd03bb3..75ddbb53d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/CreateGroupControllerImpl.java @@ -1,5 +1,7 @@ package org.briarproject.briar.android.privategroup.creation; +import android.support.annotation.Nullable; + import org.briarproject.bramble.api.contact.Contact; import org.briarproject.bramble.api.contact.ContactId; import org.briarproject.bramble.api.contact.ContactManager; @@ -123,7 +125,8 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl @Override public void sendInvitation(GroupId g, Collection contactIds, - String text, ResultExceptionHandler handler) { + @Nullable String text, + ResultExceptionHandler handler) { runOnDbThread(() -> { try { LocalAuthor localAuthor = identityManager.getLocalAuthor(); @@ -144,7 +147,7 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl } private void signInvitations(GroupId g, LocalAuthor localAuthor, - Collection contacts, String text, + Collection contacts, @Nullable String text, ResultExceptionHandler handler) { cryptoExecutor.execute(() -> { long timestamp = clock.currentTimeMillis(); @@ -160,15 +163,14 @@ class CreateGroupControllerImpl extends ContactSelectorControllerImpl } private void sendInvitations(GroupId g, - Collection contexts, String text, + Collection contexts, @Nullable String text, ResultExceptionHandler handler) { runOnDbThread(() -> { try { - String txt = text.isEmpty() ? null : text; for (InvitationContext context : contexts) { try { groupInvitationManager.sendInvitation(g, - context.contactId, txt, context.timestamp, + context.contactId, text, context.timestamp, context.signature); } catch (NoSuchContactException e) { // Continue diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java index 64dd54404..4ae58201d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/creation/GroupInviteActivity.java @@ -55,7 +55,7 @@ public class GroupInviteActivity extends ContactSelectorActivity } @Override - public boolean onButtonClick(String text) { + public void onButtonClick(@Nullable String text) { if (groupId == null) throw new IllegalStateException("GroupId was not initialized"); controller.sendInvitation(groupId, contacts, text, @@ -72,7 +72,6 @@ public class GroupInviteActivity extends ContactSelectorActivity handleDbException(exception); } }); - return true; } @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index 1934acd48..7f732a760 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -6,7 +6,6 @@ import android.os.Bundle; import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.annotation.UiThread; -import android.support.design.widget.Snackbar; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -18,17 +17,14 @@ 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.TextInputListener; +import org.briarproject.briar.android.view.TextInputView.SendListener; import java.util.List; -import static android.support.design.widget.Snackbar.LENGTH_SHORT; -import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong; - @MethodsNotNullByDefault @ParametersNotNullByDefault public abstract class BaseMessageFragment extends BaseFragment - implements TextInputListener { + implements SendListener { protected LargeTextInputView message; private MessageFragmentListener listener; @@ -48,6 +44,7 @@ public abstract class BaseMessageFragment extends BaseFragment View v = inflater.inflate(R.layout.fragment_message, container, false); message = v.findViewById(R.id.messageView); + message.setMaxTextLength(listener.getMaximumTextLength()); message.setButtonText(getString(getButtonText())); message.setHint(getHintText()); message.setListener(this); @@ -84,20 +81,11 @@ public abstract class BaseMessageFragment extends BaseFragment @Override public void onSendClick(@Nullable String text, List imageUris) { - if (text == null) return; - if (utf8IsTooLong(text, listener.getMaximumTextLength())) { - Snackbar.make(message, R.string.text_too_long, LENGTH_SHORT).show(); - return; - } - // disable button to prevent accidental double actions - message.setSendButtonEnabled(false); + message.setEnabled(false); message.hideSoftKeyboard(); - if(!listener.onButtonClick(text)) { - message.setSendButtonEnabled(true); - message.showSoftKeyboard(); - } + listener.onButtonClick(text); } @UiThread @@ -108,8 +96,7 @@ public abstract class BaseMessageFragment extends BaseFragment void setTitle(@StringRes int titleRes); - /** Returns true when the button click has been consumed. */ - boolean onButtonClick(String text); + void onButtonClick(@Nullable String text); int getMaximumTextLength(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java index 4c7e6268a..4d39005a2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareActivity.java @@ -41,13 +41,12 @@ public abstract class ShareActivity extends ContactSelectorActivity @UiThread @Override - public boolean onButtonClick(String text) { + public void onButtonClick(@Nullable String text) { share(contacts, text); setResult(RESULT_OK); supportFinishAfterTransition(); - return true; } - abstract void share(Collection contacts, String text); + abstract void share(Collection contacts, @Nullable String text); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java index 3a89eb994..56bd95f72 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogActivity.java @@ -51,7 +51,7 @@ public class ShareBlogActivity extends ShareActivity { } @Override - void share(Collection contacts, String text) { + void share(Collection contacts, @Nullable String text) { controller.share(groupId, contacts, text, new UiExceptionHandler(this) { @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogController.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogController.java index 2500d8b59..16afbcded 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogController.java @@ -9,10 +9,12 @@ import org.briarproject.briar.android.controller.handler.ExceptionHandler; import java.util.Collection; +import javax.annotation.Nullable; + public interface ShareBlogController extends ContactSelectorController { - void share(GroupId g, Collection contacts, String text, + void share(GroupId g, Collection contacts, @Nullable String text, ExceptionHandler handler); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java index e00a09a43..26af4b3ca 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareBlogControllerImpl.java @@ -20,12 +20,12 @@ import java.util.Collection; import java.util.concurrent.Executor; import java.util.logging.Logger; +import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; -import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; @Immutable @NotNullByDefault @@ -56,17 +56,16 @@ class ShareBlogControllerImpl extends ContactSelectorControllerImpl } @Override - public void share(GroupId g, Collection contacts, String text, - ExceptionHandler handler) { + public void share(GroupId g, Collection contacts, @Nullable + String text, ExceptionHandler handler) { runOnDbThread(() -> { try { - String txt = isNullOrEmpty(text) ? null : text; for (ContactId c : contacts) { try { long time = Math.max(clock.currentTimeMillis(), conversationManager.getGroupCount(c) .getLatestMsgTime() + 1); - blogSharingManager.sendInvitation(g, c, txt, time); + blogSharingManager.sendInvitation(g, c, text, time); } catch (NoSuchContactException | NoSuchGroupException e) { logException(LOG, WARNING, e); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java index d4c5974e1..5969ea92d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumActivity.java @@ -51,7 +51,7 @@ public class ShareForumActivity extends ShareActivity { } @Override - void share(Collection contacts, String text) { + void share(Collection contacts, @Nullable String text) { controller.share(groupId, contacts, text, new UiExceptionHandler(this) { @Override diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumController.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumController.java index 744605714..d63de47fa 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumController.java @@ -9,10 +9,12 @@ import org.briarproject.briar.android.controller.handler.ExceptionHandler; import java.util.Collection; +import javax.annotation.Nullable; + public interface ShareForumController extends ContactSelectorController { - void share(GroupId g, Collection contacts, String text, + void share(GroupId g, Collection contacts, @Nullable String text, ExceptionHandler handler); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java index a2a4f308d..9bbc6d3e7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/ShareForumControllerImpl.java @@ -13,19 +13,19 @@ import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.system.Clock; import org.briarproject.briar.android.contactselection.ContactSelectorControllerImpl; import org.briarproject.briar.android.controller.handler.ExceptionHandler; -import org.briarproject.briar.api.forum.ForumSharingManager; import org.briarproject.briar.api.conversation.ConversationManager; +import org.briarproject.briar.api.forum.ForumSharingManager; import java.util.Collection; import java.util.concurrent.Executor; import java.util.logging.Logger; +import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; import javax.inject.Inject; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; -import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; @Immutable @NotNullByDefault @@ -57,16 +57,15 @@ class ShareForumControllerImpl extends ContactSelectorControllerImpl @Override public void share(GroupId g, Collection contacts, - String text, ExceptionHandler handler) { + @Nullable String text, ExceptionHandler handler) { runOnDbThread(() -> { try { - String txt = isNullOrEmpty(text) ? null : text; for (ContactId c : contacts) { try { long time = Math.max(clock.currentTimeMillis(), conversationManager.getGroupCount(c) .getLatestMsgTime() + 1); - forumSharingManager.sendInvitation(g, c, txt, time); + forumSharingManager.sendInvitation(g, c, text, time); } catch (NoSuchContactException | NoSuchGroupException e) { logException(LOG, WARNING, e); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index d9534edb6..9429b0ed8 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -28,7 +28,7 @@ import org.briarproject.briar.android.threaded.ThreadListController.ThreadListDa import org.briarproject.briar.android.threaded.ThreadListController.ThreadListListener; import org.briarproject.briar.android.view.BriarRecyclerView; import org.briarproject.briar.android.view.TextInputView; -import org.briarproject.briar.android.view.TextInputView.TextInputListener; +import org.briarproject.briar.android.view.TextInputView.SendListener; import org.briarproject.briar.android.view.UnreadMessageButton; import org.briarproject.briar.api.client.NamedGroup; import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout; @@ -44,14 +44,14 @@ import static android.support.design.widget.Snackbar.make; import static android.support.v7.widget.RecyclerView.NO_POSITION; import static android.support.v7.widget.RecyclerView.SCROLL_STATE_IDLE; import static java.util.logging.Level.INFO; -import static org.briarproject.bramble.util.StringUtils.utf8IsTooLong; +import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; import static org.briarproject.briar.android.threaded.ThreadItemAdapter.UnreadCount; @MethodsNotNullByDefault @ParametersNotNullByDefault public abstract class ThreadListActivity> extends BriarActivity - implements ThreadListListener, TextInputListener, SharingListener, + implements ThreadListListener, SendListener, SharingListener, ThreadItemListener, ThreadListDataSource { protected static final String KEY_REPLY_ID = "replyId"; @@ -88,6 +88,7 @@ public abstract class ThreadListActivity imageUris) { - if (text == null || text.trim().length() == 0) - return; - if (utf8IsTooLong(text, getMaxTextLength())) { - displaySnackbar(R.string.text_too_long); - return; - } + if (isNullOrEmpty(text)) throw new AssertionError(); + I replyItem = adapter.getHighlightedItem(); UiResultExceptionHandler handler = new UiResultExceptionHandler(this) { @@ -372,7 +369,7 @@ public abstract class ThreadListActivity imageUris = emptyList(); - public TextInputAttachmentController(View v, EmojiEditText editText, - View sendButton, AttachImageListener listener) { + TextAttachmentController(View v, View sendButton, + TextInputController textInput) { + super(sendButton, textInput, true); imageLayout = v.findViewById(R.id.imageLayout); imageView = v.findViewById(R.id.imageView); @@ -72,20 +70,37 @@ class TextInputAttachmentController implements TextWatcher { v.findViewById(R.id.imageCancelButton); imageButton = v.findViewById(R.id.imageButton); - this.listener = listener; - this.sendButton = sendButton; - this.editText = editText; - this.textHint = editText.getHint().toString(); + textHint = textInput.getHint(); - editText.addTextChangedListener(this); imageButton.setOnClickListener(view -> onImageButtonClicked()); imageCancelButton.setOnClickListener(view -> { - editText.setText(null); + textInput.clearText(); reset(); }); + } + + public void setAttachImageListener(AttachImageListener imageListener) { + this.imageListener = imageListener; showImageButton(true); } + @Override + public void onTextValidityChanged(boolean isEmpty) { + if (imageUris.isEmpty()) showImageButton(isEmpty); + } + + @Override + void onSendButtonClicked() { + if (listener != null) { + if (textInput.isTooLong()) { + textInput.showError(); + return; + } + listener.onSendClick(textInput.getText(), imageUris); + } + reset(); + } + private void onImageButtonClicked() { Intent intent = new Intent(SDK_INT >= 19 ? ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT); @@ -93,7 +108,7 @@ class TextInputAttachmentController implements TextWatcher { intent.setType("image/*"); if (SDK_INT >= 18) // TODO set true to allow attaching multiple images intent.putExtra(EXTRA_ALLOW_MULTIPLE, false); - listener.onAttachImage(intent); + requireNonNull(imageListener).onAttachImage(intent); } void onImageReceived(@Nullable Intent resultData) { @@ -114,7 +129,7 @@ class TextInputAttachmentController implements TextWatcher { private void onNewUris() { if (imageUris.isEmpty()) return; showImageButton(false); - editText.setHint(R.string.image_caption_hint); + textInput.setHint(R.string.image_caption_hint); imageLayout.setVisibility(VISIBLE); GlideApp.with(imageView) .asBitmap() @@ -135,7 +150,7 @@ class TextInputAttachmentController implements TextWatcher { Object model, Target target, DataSource dataSource, boolean isFirstResource) { Palette.from(resource).generate( - TextInputAttachmentController.this::onPaletteGenerated); + TextAttachmentController.this::onPaletteGenerated); return false; } }) @@ -158,11 +173,12 @@ class TextInputAttachmentController implements TextWatcher { private void showImageButton(boolean showImageButton) { if (showImageButton) { imageButton.setVisibility(VISIBLE); + sendButton.setEnabled(false); if (SDK_INT <= 15) { sendButton.setVisibility(INVISIBLE); + imageButton.setEnabled(true); } else { sendButton.clearAnimation(); - sendButton.setEnabled(false); sendButton.animate().alpha(0f).withEndAction(() -> { sendButton.setVisibility(INVISIBLE); imageButton.setEnabled(true); @@ -172,51 +188,25 @@ class TextInputAttachmentController implements TextWatcher { } } else { sendButton.setVisibility(VISIBLE); + // enable/disable buttons right away to allow fast sending + sendButton.setEnabled(true); + imageButton.setEnabled(false); if (SDK_INT <= 15) { imageButton.setVisibility(INVISIBLE); } else { sendButton.clearAnimation(); sendButton.animate().alpha(1f).start(); imageButton.clearAnimation(); - imageButton.setEnabled(false); - imageButton.animate().alpha(0f).withEndAction(() -> { - imageButton.setVisibility(INVISIBLE); - sendButton.setEnabled(true); - }).start(); + imageButton.animate().alpha(0f).withEndAction(() -> + imageButton.setVisibility(INVISIBLE) + ).start(); } } } - @Override - public void beforeTextChanged(CharSequence s, int start, int count, - int after) { - // noop - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, - int count) { - if (start != 0 || !imageUris.isEmpty()) return; - if (s.length() > 0) showImageButton(false); - else showImageButton(true); - } - - @Override - public void afterTextChanged(Editable s) { - // noop - } - - public List getUris() { - return imageUris; - } - - public void saveHint(String hint) { - textHint = hint; - } - - void reset() { + private void reset() { // restore hint - editText.setHint(textHint); + textInput.setHint(textHint); // hide image layout imageLayout.setVisibility(GONE); // reset image URIs diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java new file mode 100644 index 000000000..991f37af1 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java @@ -0,0 +1,165 @@ +package org.briarproject.briar.android.view; + +import android.content.Context; +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.design.widget.Snackbar; +import android.support.v7.widget.AppCompatImageButton; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.view.inputmethod.InputMethodManager; + +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 static android.content.Context.INPUT_METHOD_SERVICE; +import static android.support.design.widget.Snackbar.LENGTH_SHORT; +import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT; +import static java.util.Objects.requireNonNull; +import static org.briarproject.briar.android.view.TextInputView.TextValidityListener; + +@UiThread +@NotNullByDefault +class TextInputController implements TextWatcher { + + private final Context ctx; + private final AppCompatImageButton emojiToggle; + private final EmojiPopup emojiPopup; + private final EmojiEditText editText; + + private @Nullable TextValidityListener listener; + private int maxLength = Integer.MAX_VALUE; + private final boolean emptyTextAllowed; + private boolean isEmpty = true; + + TextInputController(View rootView, AppCompatImageButton emojiToggle, + EmojiEditText editText, RecentEmoji recentEmoji, + boolean emptyTextAllowed) { + ctx = rootView.getContext(); + this.emojiToggle = emojiToggle; + this.editText = editText; + this.editText.addTextChangedListener(this); + this.editText.setOnClickListener(v -> showSoftKeyboard()); + emojiPopup = EmojiPopup.Builder + .fromRootView(rootView) + .setRecentEmoji(recentEmoji) + .setOnEmojiPopupShownListener(this::showKeyboardIcon) + .setOnEmojiPopupDismissListener(this::showEmojiIcon) + .build(this.editText); + this.emojiToggle.setOnClickListener(v -> emojiPopup.toggle()); + this.emptyTextAllowed = emptyTextAllowed; + } + + @Override + public void beforeTextChanged(CharSequence s, int start, int count, + int after) { + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, + int count) { + if (emptyTextAllowed || listener == null) return; + if (s.toString().trim().length() == 0) { + if (!isEmpty) { + isEmpty = true; + listener.onTextValidityChanged(true); + } + } else if (isEmpty) { + isEmpty = false; + listener.onTextValidityChanged(false); + } + } + + @Override + public void afterTextChanged(Editable s) { + } + + void setMaxLength(int maxLength) { + this.maxLength = maxLength; + } + + boolean isTooLong() { + return editText.getText() != null && + editText.getText().toString().trim().length() > maxLength; + } + + /** + * Returns the current text or {@code null}, + * if it is empty or only consists of white-spaces. + */ + @Nullable + String getText() { + Editable editable = editText.getText(); + if (editable == null || editable.toString().trim().length() == 0) + return null; + return editable.toString().trim(); + } + + void clearText() { + editText.setText(null); + } + + CharSequence getHint() { + return editText.getHint(); + } + + void setHint(@StringRes int res) { + setHint(ctx.getString(res)); + } + + void setHint(CharSequence hint) { + editText.setHint(hint); + } + + void setTextValidityListener(@Nullable TextValidityListener listener) { + this.listener = listener; + } + + void showError() { + Snackbar.make(editText, R.string.text_too_long, LENGTH_SHORT).show(); + } + + 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); + } + + private void showKeyboardIcon() { + emojiToggle.setImageResource(R.drawable.ic_keyboard); + } + + public void setEnabled(boolean enabled) { + editText.setEnabled(enabled); + emojiToggle.setEnabled(enabled); + } + +} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index b98aac366..870e756f5 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -6,22 +6,17 @@ import android.content.Intent; import android.content.res.TypedArray; import android.graphics.Rect; import android.net.Uri; -import android.os.IBinder; import android.os.Parcelable; import android.support.annotation.CallSuper; 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.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; -import android.view.inputmethod.InputMethodManager; import com.vanniktech.emoji.EmojiEditText; -import com.vanniktech.emoji.EmojiPopup; import com.vanniktech.emoji.RecentEmoji; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; @@ -34,11 +29,8 @@ import java.util.List; 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.Collections.emptyList; import static java.util.Objects.requireNonNull; @UiThread @@ -49,16 +41,14 @@ public class TextInputView extends KeyboardAwareLinearLayout { @Inject RecentEmoji recentEmoji; - @Nullable - TextInputListener listener; - @Nullable - TextInputAttachmentController attachmentController; - - AppCompatImageButton emojiToggle; + TextInputController textInputController; + TextSendController textSendController; EmojiEditText editText; - EmojiPopup emojiPopup; View sendButton; + @Nullable + TextAttachmentController attachmentController; + public TextInputView(Context context) { this(context, null); } @@ -90,34 +80,42 @@ public class TextInputView extends KeyboardAwareLinearLayout { @CallSuper protected void setUpViews(Context context, @Nullable AttributeSet attrs) { - emojiToggle = findViewById(R.id.emoji_toggle); - editText = findViewById(R.id.input_text); - emojiPopup = EmojiPopup.Builder - .fromRootView(this) - .setRecentEmoji(recentEmoji) - .setOnEmojiPopupShownListener(this::showKeyboardIcon) - .setOnEmojiPopupDismissListener(this::showEmojiIcon) - .build(editText); - sendButton = findViewById(R.id.btn_send); - // get attributes TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.TextInputView); String hint = attributes.getString(R.styleable.TextInputView_hint); + boolean allowEmptyText = attributes + .getBoolean(R.styleable.TextInputView_allowEmptyText, false); + boolean supportsAttachments = attributes + .getBoolean(R.styleable.TextInputView_supportsAttachments, false); attributes.recycle(); - if (hint != null) setHint(hint); + // set up input controller + AppCompatImageButton emojiToggle = findViewById(R.id.emoji_toggle); + editText = findViewById(R.id.input_text); + textInputController = new TextInputController(this, emojiToggle, + editText, recentEmoji, allowEmptyText); + if (hint != null) textInputController.setHint(hint); - emojiToggle.setOnClickListener(v -> emojiPopup.toggle()); - editText.setOnClickListener(v -> showSoftKeyboard()); + // set up sending controller + sendButton = findViewById(R.id.btn_send); + if (supportsAttachments) { + textSendController = new TextAttachmentController(this, sendButton, + textInputController); + } else { + textSendController = new TextSendController(sendButton, + textInputController, allowEmptyText); + } + textInputController.setTextValidityListener(textSendController); + + // support sending with Ctrl+Enter editText.setOnKeyListener((v, keyCode, event) -> { if (keyCode == KEYCODE_ENTER && event.isCtrlPressed()) { - onSendButtonClicked(); + textSendController.onSendButtonClicked(); return true; } return false; }); - sendButton.setOnClickListener(v -> onSendButtonClicked()); } @Nullable @@ -141,41 +139,13 @@ public class TextInputView extends KeyboardAwareLinearLayout { } } - public void setListener(TextInputListener listener) { - this.listener = listener; + public void setListener(SendListener listener) { + textSendController.setSendListener(listener); } - /** - * Call this during onCreate() to enable image attachment support. - * Do not call it twice! - */ public void setAttachImageListener(AttachImageListener imageListener) { - if (attachmentController != null) throw new IllegalStateException(); - attachmentController = new TextInputAttachmentController(getRootView(), - editText, sendButton, imageListener - ); - } - - private void showEmojiIcon() { - emojiToggle.setImageResource(R.drawable.ic_emoji_toggle); - } - - private void showKeyboardIcon() { - emojiToggle.setImageResource(R.drawable.ic_keyboard); - } - - private void onSendButtonClicked() { - if (listener != null) { - Editable editable = editText.getText(); - String text = editable == null || editable.length() == 0 ? - null : editable.toString(); - List imageUris = attachmentController == null ? emptyList() : - attachmentController.getUris(); - listener.onSendClick(text, imageUris); - } - if (attachmentController != null) { - attachmentController.reset(); - } + attachmentController = (TextAttachmentController) textSendController; + attachmentController.setAttachImageListener(imageListener); } public void onImageReceived(@Nullable Intent resultData) { @@ -183,61 +153,54 @@ public class TextInputView extends KeyboardAwareLinearLayout { attachmentController.onImageReceived(resultData); } + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + textInputController.setEnabled(enabled); + textSendController.setEnabled(enabled); + } + @Override public boolean requestFocus(int direction, Rect previouslyFocusedRect) { - return editText.requestFocus(direction, previouslyFocusedRect); + return textInputController + .requestFocus(direction, previouslyFocusedRect); } @Override public void onDetachedFromWindow() { super.onDetachedFromWindow(); - if (emojiPopup.isShowing()) emojiPopup.dismiss(); + textInputController.onDetachedFromWindow(); } - public void setText(String text) { - editText.setText(text); - } - - public boolean isEmpty() { - return editText.getText() == null || editText.getText().length() == 0; + public void clearText() { + textInputController.clearText(); } public void setHint(@StringRes int res) { - setHint(getContext().getString(res)); + textInputController.setHint(getContext().getString(res)); } - public void setHint(String hint) { - if (attachmentController != null) attachmentController.saveHint(hint); - editText.setHint(hint); - } - - public void setSendButtonEnabled(boolean enabled) { - sendButton.setEnabled(enabled); - } - - public void addTextChangedListener(TextWatcher watcher) { - editText.addTextChangedListener(watcher); + public void setMaxTextLength(int maxLength) { + textInputController.setMaxLength(maxLength); } public void showSoftKeyboard() { - Object o = getContext().getSystemService(INPUT_METHOD_SERVICE); - InputMethodManager imm = (InputMethodManager) requireNonNull(o); - imm.showSoftInput(editText, SHOW_IMPLICIT); + textInputController.showSoftKeyboard(); } public 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); + textInputController.hideSoftKeyboard(); + } + + interface TextValidityListener { + void onTextValidityChanged(boolean isEmpty); } public interface AttachImageListener { void onAttachImage(Intent intent); } - public interface TextInputListener { + public interface SendListener { void onSendClick(@Nullable String text, List imageUris); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java new file mode 100644 index 000000000..3d0cb30c1 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java @@ -0,0 +1,62 @@ +package org.briarproject.briar.android.view; + +import android.support.annotation.Nullable; +import android.support.annotation.UiThread; +import android.view.View; + +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.briar.android.view.TextInputView.SendListener; +import org.briarproject.briar.android.view.TextInputView.TextValidityListener; + +import static java.util.Collections.emptyList; + +@UiThread +@NotNullByDefault +class TextSendController implements TextValidityListener { + + protected final TextInputController textInput; + protected final View sendButton; + @Nullable + protected SendListener listener; + protected boolean enabled = true; + + private final boolean allowEmptyText; + private boolean wasEmpty = true; + + TextSendController(View sendButton, TextInputController textInput, + boolean allowEmptyText) { + this.sendButton = sendButton; + this.sendButton.setOnClickListener(v -> onSendButtonClicked()); + this.sendButton.setEnabled(allowEmptyText); + this.textInput = textInput; + this.allowEmptyText = allowEmptyText; + } + + @Override + public void onTextValidityChanged(boolean isEmpty) { + sendButton.setEnabled(enabled && !isEmpty); + wasEmpty = isEmpty; + } + + public void setEnabled(boolean enabled) { + sendButton.setOnClickListener( + enabled ? v -> onSendButtonClicked() : null); + sendButton.setEnabled(!wasEmpty || allowEmptyText); + this.enabled = enabled; + } + + void setSendListener(SendListener listener) { + this.listener = listener; + } + + void onSendButtonClicked() { + if (listener != null) { + if (textInput.isTooLong()) { + textInput.showError(); + return; + } + listener.onSendClick(textInput.getText(), emptyList()); + } + } + +} diff --git a/briar-android/src/main/res/layout/activity_conversation.xml b/briar-android/src/main/res/layout/activity_conversation.xml index 02b0e6ab2..4ae3cedab 100644 --- a/briar-android/src/main/res/layout/activity_conversation.xml +++ b/briar-android/src/main/res/layout/activity_conversation.xml @@ -32,9 +32,9 @@ android:layout_height="match_parent" android:layout_marginLeft="@dimen/margin_medium" android:layout_marginStart="@dimen/margin_medium" + android:ellipsize="end" android:gravity="center" android:maxLines="1" - android:ellipsize="end" android:textColor="@color/action_bar_text" tools:text="Contact Name of someone who chose a long name"/> @@ -54,6 +54,7 @@ android:id="@+id/text_input_container" android:layout_width="match_parent" android:layout_height="wrap_content" - app:hint="@string/message_hint"/> + app:hint="@string/message_hint" + app:supportsAttachments="true"/> \ No newline at end of file diff --git a/briar-android/src/main/res/layout/fragment_message.xml b/briar-android/src/main/res/layout/fragment_message.xml index 7f74c6577..b9061e7ef 100644 --- a/briar-android/src/main/res/layout/fragment_message.xml +++ b/briar-android/src/main/res/layout/fragment_message.xml @@ -5,6 +5,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + app:allowEmptyText="true" app:buttonText="@string/forum_share_button" app:fillHeight="true" app:hint="@string/forum_share_message"/> \ No newline at end of file diff --git a/briar-android/src/main/res/layout/fragment_reblog.xml b/briar-android/src/main/res/layout/fragment_reblog.xml index 401a2bacd..2cfa7e5f5 100644 --- a/briar-android/src/main/res/layout/fragment_reblog.xml +++ b/briar-android/src/main/res/layout/fragment_reblog.xml @@ -39,6 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="bottom" + app:allowEmptyText="true" app:buttonText="@string/blogs_reblog_button" app:hint="@string/blogs_reblog_comment_hint" app:maxLines="5"/> diff --git a/briar-android/src/main/res/layout/introduction_message.xml b/briar-android/src/main/res/layout/introduction_message.xml index 69848a81c..b8020fa28 100644 --- a/briar-android/src/main/res/layout/introduction_message.xml +++ b/briar-android/src/main/res/layout/introduction_message.xml @@ -118,6 +118,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_large" android:visibility="gone" + app:allowEmptyText="true" app:buttonText="@string/introduction_button" app:hint="@string/introduction_message_hint" app:layout_constraintBottom_toBottomOf="parent" diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml index 1ceb3a43b..b5416ff92 100644 --- a/briar-android/src/main/res/layout/text_input_view.xml +++ b/briar-android/src/main/res/layout/text_input_view.xml @@ -78,20 +78,6 @@ android:layout_height="@dimen/text_input_height" android:layout_gravity="bottom"> - - + + diff --git a/briar-android/src/main/res/values/attrs.xml b/briar-android/src/main/res/values/attrs.xml index d2e212bb7..a97af7189 100644 --- a/briar-android/src/main/res/values/attrs.xml +++ b/briar-android/src/main/res/values/attrs.xml @@ -21,6 +21,8 @@ + + From d6c18db9e9bd1ed1caebaf62af4ba7e620c9050a Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 3 Dec 2018 15:25:23 -0200 Subject: [PATCH 5/9] [android] set image preview size to 1/4 of screen height --- .../android/conversation/ConversationActivity.java | 2 +- .../android/view/TextAttachmentController.java | 13 ++++++++++++- .../briar/android/view/TextInputView.java | 6 ++++-- .../src/main/res/layout/text_input_view.xml | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 890e8f16a..5d53b8d19 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -259,7 +259,7 @@ public class ConversationActivity extends BriarActivity textInputView.setEnabled(false); textInputView.setListener(this); if (FEATURE_FLAG_IMAGE_ATTACHMENTS) { - textInputView.setAttachImageListener(this); + textInputView.setAttachImageListener(this, getWindowManager()); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java index fbcc8d53b..ecfc6b02c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java @@ -12,8 +12,11 @@ import android.support.design.widget.FloatingActionButton; import android.support.v4.view.AbsSavedState; import android.support.v7.graphics.Palette; import android.support.v7.widget.AppCompatImageButton; +import android.util.DisplayMetrics; import android.view.View; import android.view.ViewGroup; +import android.view.ViewGroup.LayoutParams; +import android.view.WindowManager; import android.widget.ImageView; import com.bumptech.glide.load.DataSource; @@ -79,8 +82,16 @@ class TextAttachmentController extends TextSendController { }); } - public void setAttachImageListener(AttachImageListener imageListener) { + public void setAttachImageListener(AttachImageListener imageListener, + WindowManager windowManager) { this.imageListener = imageListener; + // set preview size based on screen height + DisplayMetrics displayMetrics = new DisplayMetrics(); + windowManager.getDefaultDisplay().getMetrics(displayMetrics); + LayoutParams layoutParams = imageView.getLayoutParams(); + layoutParams.height = displayMetrics.heightPixels / 4; + imageView.setLayoutParams(layoutParams); + // show image button showImageButton(true); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index 870e756f5..f57311d44 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -15,6 +15,7 @@ import android.support.v7.widget.AppCompatImageButton; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; +import android.view.WindowManager; import com.vanniktech.emoji.EmojiEditText; import com.vanniktech.emoji.RecentEmoji; @@ -143,9 +144,10 @@ public class TextInputView extends KeyboardAwareLinearLayout { textSendController.setSendListener(listener); } - public void setAttachImageListener(AttachImageListener imageListener) { + public void setAttachImageListener(AttachImageListener imageListener, + WindowManager windowManager) { attachmentController = (TextAttachmentController) textSendController; - attachmentController.setAttachImageListener(imageListener); + attachmentController.setAttachImageListener(imageListener, windowManager); } public void onImageReceived(@Nullable Intent resultData) { diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml index b5416ff92..19fce38e0 100644 --- a/briar-android/src/main/res/layout/text_input_view.xml +++ b/briar-android/src/main/res/layout/text_input_view.xml @@ -23,6 +23,7 @@ android:id="@+id/imageView" android:layout_width="match_parent" android:layout_height="@dimen/text_input_image_height" + android:minHeight="@dimen/button_size" tools:background="@color/msg_status_bubble_background" tools:ignore="ContentDescription" tools:srcCompat="@tools:sample/avatars"/> From 419f2d966a7b8417781ba1fc12704e07038dc7b7 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 3 Dec 2018 15:32:03 -0200 Subject: [PATCH 6/9] [android] Show a toast when an image could not be attached --- .../briar/android/view/TextAttachmentController.java | 5 +++++ briar-android/src/main/res/values/strings.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java index ecfc6b02c..04571d012 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java @@ -18,6 +18,7 @@ import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.view.WindowManager; import android.widget.ImageView; +import android.widget.Toast; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.engine.GlideException; @@ -44,6 +45,7 @@ import static android.support.v7.app.AppCompatDelegate.getDefaultNightMode; import static android.view.View.GONE; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; +import static android.widget.Toast.LENGTH_LONG; import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; import static com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.FIT_CENTER; import static java.util.Collections.emptyList; @@ -153,6 +155,9 @@ class TextAttachmentController extends TextSendController { Object model, Target target, boolean isFirstResource) { reset(); + Toast.makeText(imageView.getContext(), + R.string.image_attach_error, LENGTH_LONG) + .show(); return false; } diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index e093fc0fb..f1e45e2b0 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -129,6 +129,7 @@ Type message Add a caption (optional) Attach image + Could not attach image Change contact name Contact name Change From c7f4e976edde9cd2dbb6d5f84c15b9ccc3444e2f Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 4 Dec 2018 12:39:31 -0200 Subject: [PATCH 7/9] [android] Require users of TextInputView to set its controller --- .../briar/android/blog/ReblogFragment.java | 5 +- .../android/blog/WriteBlogPostActivity.java | 5 +- .../conversation/ConversationActivity.java | 17 ++-- .../IntroductionMessageFragment.java | 7 +- .../android/sharing/BaseMessageFragment.java | 5 +- .../android/threaded/ThreadListActivity.java | 5 +- .../android/view/LargeTextInputView.java | 2 +- .../view/TextAttachmentController.java | 37 ++++----- .../android/view/TextInputController.java | 31 +++---- .../briar/android/view/TextInputView.java | 83 +++++++------------ .../android/view/TextSendController.java | 55 +++++++----- .../main/res/layout/activity_conversation.xml | 3 +- briar-android/src/main/res/values/attrs.xml | 1 - 13 files changed, 132 insertions(+), 124 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java index 94f75cb8c..190d957b7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java @@ -20,6 +20,7 @@ import org.briarproject.briar.android.controller.handler.UiResultExceptionHandle 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 java.util.List; @@ -81,6 +82,9 @@ public class ReblogFragment extends BaseFragment implements SendListener { View v = inflater.inflate(R.layout.fragment_reblog, container, false); ui = new ViewHolder(v); ui.post.setTransitionName(postId); + TextSendController sendController = + new TextSendController(ui.input, this, true); + ui.input.setSendController(sendController); ui.input.setEnabled(false); ui.input.setMaxTextLength(MAX_BLOG_POST_TEXT_LENGTH); showProgressBar(); @@ -117,7 +121,6 @@ public class ReblogFragment extends BaseFragment implements SendListener { ui.post.bindItem(item); ui.post.hideReblogButton(); - ui.input.setListener(this); ui.input.setEnabled(true); ui.scrollView.post(() -> ui.scrollView.fullScroll(FOCUS_DOWN)); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java index e26e2e05e..e67fc2a69 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java @@ -22,6 +22,7 @@ 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.api.android.AndroidNotificationManager; import org.briarproject.briar.api.blog.BlogManager; import org.briarproject.briar.api.blog.BlogPost; @@ -75,8 +76,10 @@ public class WriteBlogPostActivity extends BriarActivity setContentView(R.layout.activity_write_blog_post); input = findViewById(R.id.textInput); + TextSendController sendController = + new TextSendController(input, this, false); + input.setSendController(sendController); input.setMaxTextLength(MAX_BLOG_POST_TEXT_LENGTH); - input.setListener(this); progressBar = findViewById(R.id.progressBar); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 5d53b8d19..167b7606a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -63,9 +63,11 @@ import org.briarproject.briar.android.forum.ForumActivity; 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.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.api.android.AndroidNotificationManager; import org.briarproject.briar.api.blog.BlogSharingManager; import org.briarproject.briar.api.client.ProtocolStateException; @@ -166,6 +168,7 @@ public class ConversationActivity extends BriarActivity private BriarRecyclerView list; private LinearLayoutManager layoutManager; private TextInputView textInputView; + private TextSendController sendController; // Fields that are accessed from background threads must be volatile @Inject @@ -255,12 +258,15 @@ public class ConversationActivity extends BriarActivity list.setEmptyText(getString(R.string.no_private_messages)); textInputView = findViewById(R.id.text_input_container); + if (FEATURE_FLAG_IMAGE_ATTACHMENTS) { + sendController = new TextAttachmentController(textInputView, this, + this, getWindowManager()); + } else { + sendController = new TextSendController(textInputView, this, false); + } + textInputView.setSendController(sendController); textInputView.setMaxTextLength(MAX_PRIVATE_MESSAGE_TEXT_LENGTH); textInputView.setEnabled(false); - textInputView.setListener(this); - if (FEATURE_FLAG_IMAGE_ATTACHMENTS) { - textInputView.setAttachImageListener(this, getWindowManager()); - } } @Override @@ -278,7 +284,8 @@ public class ConversationActivity extends BriarActivity snackbar.getView().setBackgroundResource(R.color.briar_primary); snackbar.show(); } else if (request == REQUEST_ATTACH_IMAGE && result == RESULT_OK) { - textInputView.onImageReceived(data); + // remove cast when removing FEATURE_FLAG_IMAGE_ATTACHMENTS + ((TextAttachmentController) sendController).onImageReceived(data); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index 651a05413..1bfaff70e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java @@ -24,6 +24,7 @@ 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.api.introduction.IntroductionManager; import java.util.List; @@ -102,6 +103,9 @@ public class IntroductionMessageFragment extends BaseFragment View v = inflater.inflate(R.layout.introduction_message, container, false); ui = new ViewHolder(v); + TextSendController sendController = + new TextSendController(ui.message, this, true); + ui.message.setSendController(sendController); ui.message.setMaxTextLength(MAX_INTRODUCTION_TEXT_LENGTH); ui.message.setEnabled(false); @@ -162,9 +166,6 @@ public class IntroductionMessageFragment extends BaseFragment ui.progressBar.setVisibility(GONE); if (possible) { - // set button action - ui.message.setListener(IntroductionMessageFragment.this); - // show views ui.notPossible.setVisibility(GONE); ui.message.setVisibility(VISIBLE); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index 7f732a760..c05a0f357 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java @@ -18,6 +18,7 @@ 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 java.util.List; @@ -44,10 +45,12 @@ public abstract class BaseMessageFragment extends BaseFragment View v = inflater.inflate(R.layout.fragment_message, container, false); message = v.findViewById(R.id.messageView); + TextSendController sendController = + new TextSendController(message, this, true); + message.setSendController(sendController); message.setMaxTextLength(listener.getMaximumTextLength()); message.setButtonText(getString(getButtonText())); message.setHint(getHintText()); - message.setListener(this); return v; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index 9429b0ed8..cc63423ab 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -29,6 +29,7 @@ import org.briarproject.briar.android.threaded.ThreadListController.ThreadListLi import org.briarproject.briar.android.view.BriarRecyclerView; 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.UnreadMessageButton; import org.briarproject.briar.api.client.NamedGroup; import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout; @@ -88,8 +89,10 @@ public abstract class ThreadListActivity imageUris = emptyList(); - TextAttachmentController(View v, View sendButton, - TextInputController textInput) { - super(sendButton, textInput, true); + public TextAttachmentController(TextInputView v, SendListener listener, + AttachImageListener imageListener, WindowManager windowManager) { + super(v, listener, true); + this.imageListener = imageListener; imageLayout = v.findViewById(R.id.imageLayout); imageView = v.findViewById(R.id.imageView); @@ -82,11 +83,7 @@ class TextAttachmentController extends TextSendController { textInput.clearText(); reset(); }); - } - public void setAttachImageListener(AttachImageListener imageListener, - WindowManager windowManager) { - this.imageListener = imageListener; // set preview size based on screen height DisplayMetrics displayMetrics = new DisplayMetrics(); windowManager.getDefaultDisplay().getMetrics(displayMetrics); @@ -98,20 +95,16 @@ class TextAttachmentController extends TextSendController { } @Override - public void onTextValidityChanged(boolean isEmpty) { + public void onTextIsEmptyChanged(boolean isEmpty) { if (imageUris.isEmpty()) showImageButton(isEmpty); } @Override void onSendButtonClicked() { - if (listener != null) { - if (textInput.isTooLong()) { - textInput.showError(); - return; - } + if (canSend()) { listener.onSendClick(textInput.getText(), imageUris); + reset(); } - reset(); } private void onImageButtonClicked() { @@ -124,7 +117,7 @@ class TextAttachmentController extends TextSendController { requireNonNull(imageListener).onAttachImage(intent); } - void onImageReceived(@Nullable Intent resultData) { + public void onImageReceived(@Nullable Intent resultData) { if (resultData == null) return; if (resultData.getData() != null) { imageUris = singletonList(resultData.getData()); @@ -205,7 +198,7 @@ class TextAttachmentController extends TextSendController { } else { sendButton.setVisibility(VISIBLE); // enable/disable buttons right away to allow fast sending - sendButton.setEnabled(true); + sendButton.setEnabled(enabled); imageButton.setEnabled(false); if (SDK_INT <= 15) { imageButton.setVisibility(INVISIBLE); @@ -231,6 +224,7 @@ class TextAttachmentController extends TextSendController { showImageButton(true); } + @Override public Parcelable onSaveInstanceState(@Nullable Parcelable superState) { SavedState state = new SavedState(superState == null ? EMPTY_STATE : superState); @@ -238,8 +232,9 @@ class TextAttachmentController extends TextSendController { return state; } + @Override @Nullable - public Parcelable onRestoreInstanceState(Parcelable inState) { + public Parcelable onRestoreInstanceState(@NonNull Parcelable inState) { SavedState state = (SavedState) inState; imageUris = state.imageUris; onNewUris(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java index 991f37af1..4b765c53d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java @@ -6,7 +6,6 @@ import android.os.IBinder; import android.support.annotation.Nullable; import android.support.annotation.StringRes; import android.support.annotation.UiThread; -import android.support.design.widget.Snackbar; import android.support.v7.widget.AppCompatImageButton; import android.text.Editable; import android.text.TextWatcher; @@ -21,9 +20,9 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import static android.content.Context.INPUT_METHOD_SERVICE; -import static android.support.design.widget.Snackbar.LENGTH_SHORT; 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 @@ -35,7 +34,8 @@ class TextInputController implements TextWatcher { private final EmojiPopup emojiPopup; private final EmojiEditText editText; - private @Nullable TextValidityListener listener; + @Nullable + private TextValidityListener listener; private int maxLength = Integer.MAX_VALUE; private final boolean emptyTextAllowed; private boolean isEmpty = true; @@ -66,15 +66,16 @@ class TextInputController implements TextWatcher { @Override public void onTextChanged(CharSequence s, int start, int before, int count) { - if (emptyTextAllowed || listener == null) return; - if (s.toString().trim().length() == 0) { + // Need to start at position 0 to change empty + if (start != 0 || emptyTextAllowed || listener == null) return; + if (s.length() == 0) { if (!isEmpty) { isEmpty = true; - listener.onTextValidityChanged(true); + listener.onTextIsEmptyChanged(true); } } else if (isEmpty) { isEmpty = false; - listener.onTextValidityChanged(false); + listener.onTextIsEmptyChanged(false); } } @@ -86,9 +87,13 @@ class TextInputController implements TextWatcher { this.maxLength = maxLength; } + boolean isEmpty() { + return getText() == null; + } + boolean isTooLong() { return editText.getText() != null && - editText.getText().toString().trim().length() > maxLength; + utf8IsTooLong(editText.getText().toString().trim(), maxLength); } /** @@ -98,9 +103,9 @@ class TextInputController implements TextWatcher { @Nullable String getText() { Editable editable = editText.getText(); - if (editable == null || editable.toString().trim().length() == 0) - return null; - return editable.toString().trim(); + String str = editable == null ? null : editable.toString().trim(); + if (str == null || str.length() == 0) return null; + return str; } void clearText() { @@ -123,10 +128,6 @@ class TextInputController implements TextWatcher { this.listener = listener; } - void showError() { - Snackbar.make(editText, R.string.text_too_long, LENGTH_SHORT).show(); - } - boolean requestFocus(int direction, Rect previouslyFocusedRect) { return editText.requestFocus(direction, previouslyFocusedRect); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index f57311d44..21e4c0950 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java @@ -14,8 +14,6 @@ import android.support.annotation.UiThread; import android.support.v7.widget.AppCompatImageButton; import android.util.AttributeSet; import android.view.LayoutInflater; -import android.view.View; -import android.view.WindowManager; import com.vanniktech.emoji.EmojiEditText; import com.vanniktech.emoji.RecentEmoji; @@ -43,12 +41,9 @@ public class TextInputView extends KeyboardAwareLinearLayout { RecentEmoji recentEmoji; TextInputController textInputController; + @Nullable TextSendController textSendController; EmojiEditText editText; - View sendButton; - - @Nullable - TextAttachmentController attachmentController; public TextInputView(Context context) { this(context, null); @@ -87,8 +82,6 @@ public class TextInputView extends KeyboardAwareLinearLayout { String hint = attributes.getString(R.styleable.TextInputView_hint); boolean allowEmptyText = attributes .getBoolean(R.styleable.TextInputView_allowEmptyText, false); - boolean supportsAttachments = attributes - .getBoolean(R.styleable.TextInputView_supportsAttachments, false); attributes.recycle(); // set up input controller @@ -97,16 +90,34 @@ public class TextInputView extends KeyboardAwareLinearLayout { textInputController = new TextInputController(this, emojiToggle, editText, recentEmoji, allowEmptyText); if (hint != null) textInputController.setHint(hint); + } - // set up sending controller - sendButton = findViewById(R.id.btn_send); - if (supportsAttachments) { - textSendController = new TextAttachmentController(this, sendButton, - textInputController); - } else { - textSendController = new TextSendController(sendButton, - textInputController, allowEmptyText); + @Nullable + @Override + protected Parcelable onSaveInstanceState() { + Parcelable superState = super.onSaveInstanceState(); + if (textSendController != null) { + superState = textSendController.onSaveInstanceState(superState); } + return superState; + } + + @Override + protected void onRestoreInstanceState(Parcelable state) { + if (textSendController != null) { + Parcelable outState = + textSendController.onRestoreInstanceState(state); + super.onRestoreInstanceState(outState); + } else { + super.onRestoreInstanceState(state); + } + } + + /** + * Call this in onCreate() before any other methods of this class. + */ + public void setSendController(T controller) { + textSendController = controller; textInputController.setTextValidityListener(textSendController); // support sending with Ctrl+Enter @@ -119,47 +130,15 @@ public class TextInputView extends KeyboardAwareLinearLayout { }); } - @Nullable - @Override - protected Parcelable onSaveInstanceState() { - Parcelable superState = super.onSaveInstanceState(); - if (attachmentController != null) { - superState = attachmentController.onSaveInstanceState(superState); - } - return superState; - } - - @Override - protected void onRestoreInstanceState(Parcelable state) { - if (attachmentController != null) { - Parcelable outState = - attachmentController.onRestoreInstanceState(state); - super.onRestoreInstanceState(outState); - } else { - super.onRestoreInstanceState(state); - } - } - - public void setListener(SendListener listener) { - textSendController.setSendListener(listener); - } - - public void setAttachImageListener(AttachImageListener imageListener, - WindowManager windowManager) { - attachmentController = (TextAttachmentController) textSendController; - attachmentController.setAttachImageListener(imageListener, windowManager); - } - - public void onImageReceived(@Nullable Intent resultData) { - if (attachmentController == null) throw new IllegalStateException(); - attachmentController.onImageReceived(resultData); + public TextInputController getTextInputController() { + return textInputController; } @Override public void setEnabled(boolean enabled) { super.setEnabled(enabled); textInputController.setEnabled(enabled); - textSendController.setEnabled(enabled); + requireNonNull(textSendController).setEnabled(enabled); } @Override @@ -195,7 +174,7 @@ public class TextInputView extends KeyboardAwareLinearLayout { } interface TextValidityListener { - void onTextValidityChanged(boolean isEmpty); + void onTextIsEmptyChanged(boolean isEmpty); } public interface AttachImageListener { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java index 3d0cb30c1..fc04484a7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java @@ -1,62 +1,77 @@ package org.briarproject.briar.android.view; +import android.os.Parcelable; +import android.support.annotation.CallSuper; import android.support.annotation.Nullable; import android.support.annotation.UiThread; +import android.support.design.widget.Snackbar; 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.TextInputView.TextValidityListener; +import static android.support.design.widget.Snackbar.LENGTH_SHORT; import static java.util.Collections.emptyList; @UiThread @NotNullByDefault -class TextSendController implements TextValidityListener { +public class TextSendController implements TextValidityListener { protected final TextInputController textInput; protected final View sendButton; - @Nullable - protected SendListener listener; + protected final SendListener listener; protected boolean enabled = true; private final boolean allowEmptyText; private boolean wasEmpty = true; - TextSendController(View sendButton, TextInputController textInput, + public TextSendController(TextInputView v, SendListener listener, boolean allowEmptyText) { - this.sendButton = sendButton; - this.sendButton.setOnClickListener(v -> onSendButtonClicked()); + this.sendButton = v.findViewById(R.id.btn_send); + this.sendButton.setOnClickListener(view -> onSendButtonClicked()); this.sendButton.setEnabled(allowEmptyText); - this.textInput = textInput; + this.listener = listener; + this.textInput = v.getTextInputController(); this.allowEmptyText = allowEmptyText; } @Override - public void onTextValidityChanged(boolean isEmpty) { + public void onTextIsEmptyChanged(boolean isEmpty) { sendButton.setEnabled(enabled && !isEmpty); wasEmpty = isEmpty; } + @Nullable + public Parcelable onSaveInstanceState(@Nullable Parcelable superState) { + return superState; + } + + @Nullable + public Parcelable onRestoreInstanceState(Parcelable state) { + return state; + } + + @CallSuper public void setEnabled(boolean enabled) { - sendButton.setOnClickListener( - enabled ? v -> onSendButtonClicked() : null); - sendButton.setEnabled(!wasEmpty || allowEmptyText); + sendButton.setEnabled(enabled && (!wasEmpty || allowEmptyText)); this.enabled = enabled; } - void setSendListener(SendListener listener) { - this.listener = listener; - } - void onSendButtonClicked() { - if (listener != null) { - if (textInput.isTooLong()) { - textInput.showError(); - return; - } + if (canSend()) { 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()); + } + } diff --git a/briar-android/src/main/res/layout/activity_conversation.xml b/briar-android/src/main/res/layout/activity_conversation.xml index 4ae3cedab..a3afa6b6d 100644 --- a/briar-android/src/main/res/layout/activity_conversation.xml +++ b/briar-android/src/main/res/layout/activity_conversation.xml @@ -54,7 +54,6 @@ android:id="@+id/text_input_container" android:layout_width="match_parent" android:layout_height="wrap_content" - app:hint="@string/message_hint" - app:supportsAttachments="true"/> + app:hint="@string/message_hint"/> \ No newline at end of file diff --git a/briar-android/src/main/res/values/attrs.xml b/briar-android/src/main/res/values/attrs.xml index a97af7189..eab6a660a 100644 --- a/briar-android/src/main/res/values/attrs.xml +++ b/briar-android/src/main/res/values/attrs.xml @@ -22,7 +22,6 @@ - From 5fbacb4ee4e5f7c0752ab36c05a21b80ae708c4c Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 5 Dec 2018 12:39:13 -0200 Subject: [PATCH 8/9] [android] Split out an EmojiTextInputView from TextInputViews This also removes the TextInputController whose job is now done by the view. --- .../briar/android/AndroidComponent.java | 4 +- .../briar/android/blog/ReblogFragment.java | 2 +- .../android/blog/WriteBlogPostActivity.java | 2 +- .../conversation/ConversationActivity.java | 4 +- .../IntroductionMessageFragment.java | 2 +- .../android/sharing/BaseMessageFragment.java | 2 +- .../android/threaded/ThreadListActivity.java | 4 +- ...ontroller.java => EmojiTextInputView.java} | 193 ++++-- .../view}/KeyboardAwareLinearLayout.java | 63 +- .../android/view/LargeTextInputView.java | 28 +- .../view/TextAttachmentController.java | 15 +- .../briar/android/view/TextInputView.java | 109 +-- .../android/view/TextSendController.java | 55 +- .../java/org/thoughtcrime/securesms/LICENSE | 621 ------------------ .../src/main/res/drawable/ic_image.xml | 11 +- .../main/res/layout/emoji_text_input_view.xml | 34 + .../src/main/res/layout/text_input_view.xml | 25 +- .../main/res/layout/text_input_view_large.xml | 35 +- briar-android/src/main/res/values/attrs.xml | 6 + 19 files changed, 294 insertions(+), 921 deletions(-) rename briar-android/src/main/java/org/briarproject/briar/android/view/{TextInputController.java => EmojiTextInputView.java} (51%) rename briar-android/src/main/java/org/{thoughtcrime/securesms/components => briarproject/briar/android/view}/KeyboardAwareLinearLayout.java (81%) delete mode 100644 briar-android/src/main/java/org/thoughtcrime/securesms/LICENSE create mode 100644 briar-android/src/main/res/layout/emoji_text_input_view.xml diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java index eb3016781..90a76e6da 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java +++ b/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); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java index 190d957b7..b4ebb3b85 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogFragment.java +++ b/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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java index e67fc2a69..0acda8309 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/WriteBlogPostActivity.java +++ b/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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 167b7606a..9ba1051df 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java index 1bfaff70e..a1e6d2a6e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/IntroductionMessageFragment.java +++ b/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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java index c05a0f357..1f6fad3ff 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/sharing/BaseMessageFragment.java +++ b/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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index cc63423ab..863e08e94 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java similarity index 51% rename from briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java rename to briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java index 4b765c53d..cff9bcd0d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputController.java +++ b/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 -@NotNullByDefault -class TextInputController implements TextWatcher { +public class EmojiTextInputView extends KeyboardAwareLinearLayout 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, - EmojiEditText editText, RecentEmoji recentEmoji, - boolean emptyTextAllowed) { - ctx = rootView.getContext(); - this.emojiToggle = emojiToggle; - this.editText = editText; - this.editText.addTextChangedListener(this); - this.editText.setOnClickListener(v -> showSoftKeyboard()); + public EmojiTextInputView(Context context) { + this(context, null); + } + + public EmojiTextInputView(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + 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); - this.emojiToggle.setOnClickListener(v -> emojiPopup.toggle()); - this.emptyTextAllowed = emptyTextAllowed; + .build((EmojiEditText) editText); + emojiToggle.setOnClickListener(v -> emojiPopup.toggle()); } @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() { - return getText() == null; - } - - boolean isTooLong() { - return editText.getText() != null && - utf8IsTooLong(editText.getText().toString().trim(), maxLength); + void setMaxLines(int maxLines) { + editText.setMaxLines(maxLines); } /** @@ -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) { - editText.setEnabled(enabled); - emojiToggle.setEnabled(enabled); + void showSoftKeyboard() { + Object o = getContext().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 = getContext().getSystemService(INPUT_METHOD_SERVICE); + InputMethodManager imm = (InputMethodManager) requireNonNull(o); + imm.hideSoftInputFromWindow(token, 0); + } + + interface TextInputListener { + void onTextIsEmptyChanged(boolean isEmpty); + void onSendEvent(); } } diff --git a/briar-android/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/briar-android/src/main/java/org/briarproject/briar/android/view/KeyboardAwareLinearLayout.java similarity index 81% rename from briar-android/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java rename to briar-android/src/main/java/org/briarproject/briar/android/view/KeyboardAwareLinearLayout.java index 213bf2a6e..fa4028aeb 100644 --- a/briar-android/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java +++ b/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 hiddenListeners = - new HashSet<>(); private final Set 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 listeners = - new HashSet<>(hiddenListeners); - for (OnKeyboardHiddenListener listener : listeners) { - listener.onKeyboardHidden(); - } - } - private void notifyShownListeners() { // Make a copy as listeners may remove themselves when called Set listeners = new HashSet<>(shownListeners); @@ -262,11 +218,8 @@ public class KeyboardAwareLinearLayout extends LinearLayout { } } - public interface OnKeyboardHiddenListener { - void onKeyboardHidden(); - } - public interface OnKeyboardShownListener { void onKeyboardShown(); } + } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java index 87b9b9dec..5ed4ce0f1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/LargeTextInputView.java +++ b/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(); - editParams.height = MATCH_PARENT; - editText.setLayoutParams(editParams); + ViewGroup.LayoutParams inputParams = textInput.getLayoutParams(); + inputParams.height = MATCH_PARENT; + textInput.setLayoutParams(inputParams); } + textInput.setGravity(BOTTOM); + } + + @Override + protected int getLayout() { + return R.layout.text_input_view_large; } public void setButtonText(String text) { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java index b61d76452..531737f4a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java +++ b/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); + } + } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java index 21e4c0950..1b414c3d6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java +++ b/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 com.vanniktech.emoji.EmojiEditText; -import com.vanniktech.emoji.RecentEmoji; +import android.widget.LinearLayout; 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.thoughtcrime.securesms.components.KeyboardAwareLinearLayout; - -import java.util.List; - -import javax.inject.Inject; +import org.briarproject.briar.android.view.KeyboardAwareLinearLayout.OnKeyboardShownListener; 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()) { - BriarApplication app = - (BriarApplication) context.getApplicationContext(); - app.getApplicationComponent().inject(this); - } + setSaveEnabled(true); 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 - AppCompatImageButton emojiToggle = findViewById(R.id.emoji_toggle); - editText = findViewById(R.id.input_text); - textInputController = new TextInputController(this, emojiToggle, - editText, recentEmoji, allowEmptyText); - if (hint != null) textInputController.setHint(hint); + textInput = findViewById(R.id.emojiTextInput); + textInput.setAllowEmptyText(allowEmptyText); + if (hint != null) textInput.setHint(hint); + } + + @LayoutRes + protected int getLayout() { + return R.layout.text_input_view; } @Nullable @@ -118,71 +94,56 @@ public class TextInputView extends KeyboardAwareLinearLayout { */ public void setSendController(T controller) { textSendController = controller; - textInputController.setTextValidityListener(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; + textInput.setTextInputListener(textSendController); } @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 - .requestFocus(direction, previouslyFocusedRect); + return textInput.requestFocus(direction, previouslyFocusedRect); } - @Override - public void onDetachedFromWindow() { - super.onDetachedFromWindow(); - textInputController.onDetachedFromWindow(); + EmojiTextInputView getEmojiTextInputView() { + return textInput; } 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 { - void onTextIsEmptyChanged(boolean isEmpty); + public void addOnKeyboardShownListener(OnKeyboardShownListener listener) { + textInput.addOnKeyboardShownListener(listener); } - public interface AttachImageListener { - void onAttachImage(Intent intent); - } - - public interface SendListener { - void onSendClick(@Nullable String text, List imageUris); + public void removeOnKeyboardShownListener( + OnKeyboardShownListener listener) { + textInput.removeOnKeyboardShownListener(listener); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java index fc04484a7..ad35f728f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java +++ b/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.TextInputView.TextValidityListener; +import org.briarproject.briar.android.view.EmojiTextInputView.TextInputListener; + +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() { - if (canSend()) { - 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()); + public interface SendListener { + void onSendClick(@Nullable String text, List imageUris); } } diff --git a/briar-android/src/main/java/org/thoughtcrime/securesms/LICENSE b/briar-android/src/main/java/org/thoughtcrime/securesms/LICENSE deleted file mode 100644 index 94a045322..000000000 --- a/briar-android/src/main/java/org/thoughtcrime/securesms/LICENSE +++ /dev/null @@ -1,621 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - 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 diff --git a/briar-android/src/main/res/drawable/ic_image.xml b/briar-android/src/main/res/drawable/ic_image.xml index 46efff4c9..4529c9559 100644 --- a/briar-android/src/main/res/drawable/ic_image.xml +++ b/briar-android/src/main/res/drawable/ic_image.xml @@ -1,8 +1,9 @@ - + diff --git a/briar-android/src/main/res/layout/emoji_text_input_view.xml b/briar-android/src/main/res/layout/emoji_text_input_view.xml new file mode 100644 index 000000000..02c8a2867 --- /dev/null +++ b/briar-android/src/main/res/layout/emoji_text_input_view.xml @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml index 19fce38e0..d50ee521a 100644 --- a/briar-android/src/main/res/layout/text_input_view.xml +++ b/briar-android/src/main/res/layout/text_input_view.xml @@ -48,31 +48,12 @@ android:layout_height="wrap_content" android:background="@color/card_background"> - - - + app:maxTextLines="4"/> - - - - - - - + app:textPaddingBottom="10dp" + app:textPaddingEnd="@dimen/margin_medium"/> diff --git a/briar-android/src/main/res/values/attrs.xml b/briar-android/src/main/res/values/attrs.xml index eab6a660a..588dc4b8d 100644 --- a/briar-android/src/main/res/values/attrs.xml +++ b/briar-android/src/main/res/values/attrs.xml @@ -19,6 +19,12 @@ + + + + + + From e6229a3a13eec3302d460402cf585b56fe523439 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 6 Dec 2018 16:21:03 -0200 Subject: [PATCH 9/9] [android] Factor out image preview into its own view class --- .../conversation/ConversationActivity.java | 6 +- .../briar/android/view/ImagePreview.java | 119 ++++++++++++++++++ .../view/TextAttachmentController.java | 102 +++------------ .../main/res/layout/activity_conversation.xml | 11 +- .../src/main/res/layout/image_preview.xml | 49 ++++++++ .../src/main/res/layout/text_input_view.xml | 31 ----- briar-android/src/main/res/values/dimens.xml | 1 - 7 files changed, 199 insertions(+), 120 deletions(-) create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java create mode 100644 briar-android/src/main/res/layout/image_preview.xml diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 9ba1051df..3d3611f90 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -63,6 +63,7 @@ import org.briarproject.briar.android.forum.ForumActivity; 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.ImagePreview; import org.briarproject.briar.android.view.TextAttachmentController; import org.briarproject.briar.android.view.TextAttachmentController.AttachImageListener; import org.briarproject.briar.android.view.TextInputView; @@ -259,8 +260,9 @@ public class ConversationActivity extends BriarActivity textInputView = findViewById(R.id.text_input_container); if (FEATURE_FLAG_IMAGE_ATTACHMENTS) { - sendController = new TextAttachmentController(textInputView, this, - this, getWindowManager()); + ImagePreview imagePreview = findViewById(R.id.imagePreview); + sendController = new TextAttachmentController(textInputView, + imagePreview, this, this); } else { sendController = new TextSendController(textInputView, this, false); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java new file mode 100644 index 000000000..c19c9d771 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java @@ -0,0 +1,119 @@ +package org.briarproject.briar.android.view; + +import android.content.Context; +import android.graphics.Bitmap; +import android.net.Uri; +import android.support.annotation.Nullable; +import android.support.constraint.ConstraintLayout; +import android.support.v7.graphics.Palette; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.widget.ImageView; +import android.widget.Toast; + +import com.bumptech.glide.load.DataSource; +import com.bumptech.glide.load.engine.GlideException; +import com.bumptech.glide.request.RequestListener; +import com.bumptech.glide.request.target.Target; + +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.briar.R; +import org.briarproject.briar.android.conversation.glide.GlideApp; + +import java.util.List; + +import static android.content.Context.LAYOUT_INFLATER_SERVICE; +import static android.graphics.Color.BLACK; +import static android.graphics.Color.WHITE; +import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_YES; +import static android.support.v7.app.AppCompatDelegate.getDefaultNightMode; +import static android.widget.Toast.LENGTH_LONG; +import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; +import static com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.FIT_CENTER; +import static java.util.Objects.requireNonNull; + +@NotNullByDefault +public class ImagePreview extends ConstraintLayout { + + private final ImageView imageView; + private final int backgroundColor = + getDefaultNightMode() == MODE_NIGHT_YES ? BLACK : WHITE; + + @Nullable + private ImagePreviewListener listener; + + public ImagePreview(Context context) { + this(context, null); + } + + public ImagePreview(Context context, @Nullable AttributeSet attrs) { + this(context, attrs, 0); + } + + public ImagePreview(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.image_preview, this, true); + + // find image view and set background color + imageView = findViewById(R.id.imageView); + imageView.setBackgroundColor(backgroundColor); + + // set cancel listener + findViewById(R.id.imageCancelButton).setOnClickListener(view -> { + if (listener != null) listener.onCancel(); + }); + } + + void setImagePreviewListener(ImagePreviewListener listener) { + this.listener = listener; + } + + void showPreview(List imageUris) { + setVisibility(VISIBLE); + GlideApp.with(imageView) + .asBitmap() + .load(imageUris.get(0)) // TODO show more than the first + .diskCacheStrategy(NONE) + .downsample(FIT_CENTER) + .addListener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, + Object model, Target target, + boolean isFirstResource) { + if (listener != null) listener.onCancel(); + Toast.makeText(imageView.getContext(), + R.string.image_attach_error, LENGTH_LONG) + .show(); + return false; + } + + @Override + public boolean onResourceReady(Bitmap resource, + Object model, Target target, + DataSource dataSource, boolean isFirstResource) { + Palette.from(resource).generate( + ImagePreview.this::onPaletteGenerated); + return false; + } + }) + .into(imageView); + } + + void onPaletteGenerated(@Nullable Palette palette) { + if (palette == null) return; + int color = getDefaultNightMode() == MODE_NIGHT_YES ? + palette.getDarkMutedColor(backgroundColor) : + palette.getLightMutedColor(backgroundColor); + imageView.setBackgroundColor(color); + } + + interface ImagePreviewListener { + void onCancel(); + } + +} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java index 531737f4a..883119cf2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java @@ -2,31 +2,17 @@ package org.briarproject.briar.android.view; import android.content.ClipData; import android.content.Intent; -import android.graphics.Bitmap; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.UiThread; -import android.support.design.widget.FloatingActionButton; import android.support.v4.view.AbsSavedState; -import android.support.v7.graphics.Palette; import android.support.v7.widget.AppCompatImageButton; -import android.util.DisplayMetrics; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.view.WindowManager; -import android.widget.ImageView; -import android.widget.Toast; - -import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.GlideException; -import com.bumptech.glide.request.RequestListener; -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.ImagePreview.ImagePreviewListener; import java.util.ArrayList; import java.util.List; @@ -35,59 +21,39 @@ import static android.content.Intent.ACTION_GET_CONTENT; import static android.content.Intent.ACTION_OPEN_DOCUMENT; import static android.content.Intent.CATEGORY_OPENABLE; import static android.content.Intent.EXTRA_ALLOW_MULTIPLE; -import static android.graphics.Color.BLACK; -import static android.graphics.Color.WHITE; import static android.os.Build.VERSION.SDK_INT; import static android.support.v4.view.AbsSavedState.EMPTY_STATE; -import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_YES; -import static android.support.v7.app.AppCompatDelegate.getDefaultNightMode; import static android.view.View.GONE; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; -import static android.widget.Toast.LENGTH_LONG; -import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; -import static com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.FIT_CENTER; import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static java.util.Objects.requireNonNull; @UiThread -public class TextAttachmentController extends TextSendController { +public class TextAttachmentController extends TextSendController + implements ImagePreviewListener { private final AppCompatImageButton imageButton; - private final ViewGroup imageLayout; - private final ImageView imageView; + private final ImagePreview imagePreview; private final AttachImageListener imageListener; private CharSequence textHint; private List imageUris = emptyList(); - public TextAttachmentController(TextInputView v, SendListener listener, - AttachImageListener imageListener, WindowManager windowManager) { + public TextAttachmentController(TextInputView v, ImagePreview imagePreview, + SendListener listener, AttachImageListener imageListener) { super(v, listener, false); this.imageListener = imageListener; + this.imagePreview = imagePreview; + this.imagePreview.setImagePreviewListener(this); - imageLayout = v.findViewById(R.id.imageLayout); - imageView = v.findViewById(R.id.imageView); - FloatingActionButton imageCancelButton = - v.findViewById(R.id.imageCancelButton); imageButton = v.findViewById(R.id.imageButton); + imageButton.setOnClickListener(view -> onImageButtonClicked()); textHint = textInput.getHint(); - imageButton.setOnClickListener(view -> onImageButtonClicked()); - imageCancelButton.setOnClickListener(view -> { - textInput.clearText(); - reset(); - }); - - // set preview size based on screen height - DisplayMetrics displayMetrics = new DisplayMetrics(); - windowManager.getDefaultDisplay().getMetrics(displayMetrics); - LayoutParams layoutParams = imageView.getLayoutParams(); - layoutParams.height = displayMetrics.heightPixels / 4; - imageView.setLayoutParams(layoutParams); // show image button showImageButton(true); } @@ -139,47 +105,7 @@ public class TextAttachmentController extends TextSendController { if (imageUris.isEmpty()) return; showImageButton(false); textInput.setHint(R.string.image_caption_hint); - imageLayout.setVisibility(VISIBLE); - GlideApp.with(imageView) - .asBitmap() - .load(imageUris.get(0)) // TODO show more than the first - .diskCacheStrategy(NONE) - .downsample(FIT_CENTER) - .addListener(new RequestListener() { - @Override - public boolean onLoadFailed(@Nullable GlideException e, - Object model, Target target, - boolean isFirstResource) { - reset(); - Toast.makeText(imageView.getContext(), - R.string.image_attach_error, LENGTH_LONG) - .show(); - return false; - } - - @Override - public boolean onResourceReady(Bitmap resource, - Object model, Target target, - DataSource dataSource, boolean isFirstResource) { - Palette.from(resource).generate( - TextAttachmentController.this::onPaletteGenerated); - return false; - } - }) - .into(imageView); - } - - @UiThread - private void onPaletteGenerated(@Nullable Palette palette) { - int color; - if (palette == null) { - color = getDefaultNightMode() == MODE_NIGHT_YES ? BLACK : WHITE; - } else { - color = getDefaultNightMode() == MODE_NIGHT_YES ? - palette.getDarkMutedColor(BLACK) : - palette.getLightMutedColor(WHITE); - } - imageView.setBackgroundColor(color); + imagePreview.showPreview(imageUris); } private void showImageButton(boolean showImageButton) { @@ -220,7 +146,7 @@ public class TextAttachmentController extends TextSendController { // restore hint textInput.setHint(textHint); // hide image layout - imageLayout.setVisibility(GONE); + imagePreview.setVisibility(GONE); // reset image URIs imageUris = emptyList(); // show the image button again, so images can get attached @@ -244,6 +170,12 @@ public class TextAttachmentController extends TextSendController { return state.getSuperState(); } + @Override + public void onCancel() { + textInput.clearText(); + reset(); + } + private static class SavedState extends AbsSavedState { private List imageUris; diff --git a/briar-android/src/main/res/layout/activity_conversation.xml b/briar-android/src/main/res/layout/activity_conversation.xml index a3afa6b6d..f27144b06 100644 --- a/briar-android/src/main/res/layout/activity_conversation.xml +++ b/briar-android/src/main/res/layout/activity_conversation.xml @@ -5,6 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:animateLayoutChanges="true" android:orientation="vertical" tools:context=".android.conversation.ConversationActivity"> @@ -48,7 +49,15 @@ android:id="@+id/conversationView" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"/> + android:layout_weight="2"/> + + + + + + + + + + + diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml index d50ee521a..3ca815785 100644 --- a/briar-android/src/main/res/layout/text_input_view.xml +++ b/briar-android/src/main/res/layout/text_input_view.xml @@ -12,37 +12,6 @@ style="@style/Divider.Horizontal" android:layout_alignParentTop="true"/> - - - - - - - - 42dp - 150dp 16sp 32sp 2dp