diff --git a/briar-android/build.gradle b/briar-android/build.gradle index e0463f369..c52aced57 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -105,7 +105,6 @@ 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/conversation/ImageItemDecoration.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java index 92df42e40..e72d44cce 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java @@ -10,12 +10,12 @@ import android.view.View; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; -import org.briarproject.briar.android.util.UiUtils; import static org.briarproject.briar.android.conversation.ImageAdapter.isBottomRow; import static org.briarproject.briar.android.conversation.ImageAdapter.isLeft; import static org.briarproject.briar.android.conversation.ImageAdapter.isTopRow; import static org.briarproject.briar.android.conversation.ImageAdapter.singleInRow; +import static org.briarproject.briar.android.util.UiUtils.isRtl; @NotNullByDefault class ImageItemDecoration extends ItemDecoration { @@ -35,7 +35,7 @@ class ImageItemDecoration extends ItemDecoration { border = realBorderSize / 2; // find out if we are showing a RTL language - isRtl = UiUtils.isRtl(ctx); + isRtl = isRtl(ctx); } @Override 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 index c19c9d771..8921b668c 100644 --- 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 @@ -1,43 +1,27 @@ 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.support.v7.widget.RecyclerView; 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 java.util.Collection; 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 android.support.v4.content.ContextCompat.getColor; +import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; 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; + private final RecyclerView imageList; @Nullable private ImagePreviewListener listener; @@ -59,9 +43,12 @@ public class ImagePreview extends ConstraintLayout { 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 background color + setBackgroundColor(getColor(context, R.color.card_background)); + + // find list + imageList = findViewById(R.id.imageList); + imageList.addItemDecoration(new ImagePreviewDecoration(context)); // set cancel listener findViewById(R.id.imageCancelButton).setOnClickListener(view -> { @@ -73,46 +60,27 @@ public class ImagePreview extends ConstraintLayout { this.listener = listener; } - void showPreview(List imageUris) { + void showPreview(Collection imageUris) { + if (listener == null) throw new IllegalStateException(); + if (imageUris.size() == 1) { + LayoutParams params = (LayoutParams) imageList.getLayoutParams(); + params.width = MATCH_PARENT; + imageList.setLayoutParams(params); + } 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); + imageList.setAdapter(new ImagePreviewAdapter(imageUris, listener)); } - void onPaletteGenerated(@Nullable Palette palette) { - if (palette == null) return; - int color = getDefaultNightMode() == MODE_NIGHT_YES ? - palette.getDarkMutedColor(backgroundColor) : - palette.getLightMutedColor(backgroundColor); - imageView.setBackgroundColor(color); + void removeUri(Uri uri) { + ImagePreviewAdapter adapter = + (ImagePreviewAdapter) imageList.getAdapter(); + requireNonNull(adapter).removeUri(uri); } interface ImagePreviewListener { + + void onUriError(Uri uri); + void onCancel(); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java new file mode 100644 index 000000000..20bf9d4c3 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java @@ -0,0 +1,61 @@ +package org.briarproject.briar.android.view; + +import android.net.Uri; +import android.support.annotation.LayoutRes; +import android.support.v7.widget.RecyclerView.Adapter; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.briar.R; +import org.briarproject.briar.android.view.ImagePreview.ImagePreviewListener; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static java.util.Objects.requireNonNull; + +@NotNullByDefault +class ImagePreviewAdapter extends Adapter { + + private final List items; + private final ImagePreviewListener listener; + @LayoutRes + private final int layout; + + ImagePreviewAdapter(Collection items, ImagePreviewListener listener) { + this.items = new ArrayList<>(items); + this.listener = listener; + this.layout = items.size() == 1 ? + R.layout.list_item_image_preview_single : + R.layout.list_item_image_preview; + } + + @Override + public ImagePreviewViewHolder onCreateViewHolder(ViewGroup viewGroup, + int type) { + View v = LayoutInflater.from(viewGroup.getContext()) + .inflate(layout, viewGroup, false); + return new ImagePreviewViewHolder(v, requireNonNull(listener)); + } + + @Override + public void onBindViewHolder(ImagePreviewViewHolder viewHolder, + int position) { + viewHolder.bind(items.get(position)); + } + + @Override + public int getItemCount() { + return items.size(); + } + + void removeUri(Uri uri) { + int pos = items.indexOf(uri); + items.remove(uri); + notifyItemRemoved(pos); + } + +} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java new file mode 100644 index 000000000..5c14ab760 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java @@ -0,0 +1,34 @@ +package org.briarproject.briar.android.view; + +import android.content.Context; +import android.content.res.Resources; +import android.graphics.Rect; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.RecyclerView.ItemDecoration; +import android.support.v7.widget.RecyclerView.State; +import android.view.View; + +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; +import org.briarproject.briar.R; + +@NotNullByDefault +class ImagePreviewDecoration extends ItemDecoration { + + private final int border; + + ImagePreviewDecoration(Context ctx) { + Resources res = ctx.getResources(); + border = res.getDimensionPixelSize(R.dimen.message_bubble_border); + } + + @Override + public void getItemOffsets(Rect outRect, View view, RecyclerView parent, + State state) { + if (state.getItemCount() == parent.getChildAdapterPosition(view) + 1) { + // no decoration for last item in the list + return; + } + outRect.right = border; + } + +} diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java new file mode 100644 index 000000000..d63569024 --- /dev/null +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewViewHolder.java @@ -0,0 +1,73 @@ +package org.briarproject.briar.android.view; + +import android.graphics.drawable.Drawable; +import android.net.Uri; +import android.support.annotation.DrawableRes; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView.ViewHolder; +import android.view.View; +import android.widget.ImageView; +import android.widget.ProgressBar; + +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 org.briarproject.briar.android.view.ImagePreview.ImagePreviewListener; + +import static android.view.View.INVISIBLE; +import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE; +import static com.bumptech.glide.load.resource.bitmap.DownsampleStrategy.FIT_CENTER; +import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade; + +@NotNullByDefault +class ImagePreviewViewHolder extends ViewHolder { + + @DrawableRes + private static final int ERROR_RES = R.drawable.ic_image_broken; + + private final ImagePreviewListener listener; + + private final ImageView imageView; + private final ProgressBar progressBar; + + ImagePreviewViewHolder(View v, ImagePreviewListener listener) { + super(v); + this.listener = listener; + this.imageView = v.findViewById(R.id.imageView); + this.progressBar = v.findViewById(R.id.progressBar); + } + + void bind(Uri uri) { + GlideApp.with(imageView) + .load(uri) + .diskCacheStrategy(NONE) + .error(ERROR_RES) + .downsample(FIT_CENTER) + .transition(withCrossFade()) + .addListener(new RequestListener() { + @Override + public boolean onLoadFailed(@Nullable GlideException e, + Object model, Target target, + boolean isFirstResource) { + listener.onUriError(uri); + progressBar.setVisibility(INVISIBLE); + return false; + } + + @Override + public boolean onResourceReady(Drawable resource, + Object model, Target target, + DataSource dataSource, boolean isFirstResource) { + progressBar.setVisibility(INVISIBLE); + return false; + } + }) + .into(imageView); + } + +} 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 883119cf2..f7d60de2c 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 @@ -5,12 +5,13 @@ import android.content.Intent; 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.v4.view.AbsSavedState; import android.support.v7.widget.AppCompatImageButton; +import android.widget.Toast; +import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; import org.briarproject.briar.android.view.ImagePreview.ImagePreviewListener; @@ -26,11 +27,12 @@ import static android.support.v4.view.AbsSavedState.EMPTY_STATE; 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 java.util.Collections.emptyList; -import static java.util.Collections.singletonList; import static java.util.Objects.requireNonNull; @UiThread +@NotNullByDefault public class TextAttachmentController extends TextSendController implements ImagePreviewListener { @@ -81,15 +83,15 @@ public class TextAttachmentController extends TextSendController ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT); intent.addCategory(CATEGORY_OPENABLE); intent.setType("image/*"); - if (SDK_INT >= 18) // TODO set true to allow attaching multiple images - intent.putExtra(EXTRA_ALLOW_MULTIPLE, false); + if (SDK_INT >= 18) intent.putExtra(EXTRA_ALLOW_MULTIPLE, true); requireNonNull(imageListener).onAttachImage(intent); } public void onImageReceived(@Nullable Intent resultData) { if (resultData == null) return; if (resultData.getData() != null) { - imageUris = singletonList(resultData.getData()); + imageUris = new ArrayList<>(1); + imageUris.add(resultData.getData()); onNewUris(); } else if (SDK_INT >= 18 && resultData.getClipData() != null) { ClipData clipData = resultData.getClipData(); @@ -163,13 +165,22 @@ public class TextAttachmentController extends TextSendController @Override @Nullable - public Parcelable onRestoreInstanceState(@NonNull Parcelable inState) { + public Parcelable onRestoreInstanceState(Parcelable inState) { SavedState state = (SavedState) inState; - imageUris = state.imageUris; + imageUris = requireNonNull(state.imageUris); onNewUris(); return state.getSuperState(); } + @Override + public void onUriError(Uri uri) { + imageUris.remove(uri); + imagePreview.removeUri(uri); + if (imageUris.isEmpty()) onCancel(); + Toast.makeText(textInput.getContext(), R.string.image_attach_error, + LENGTH_LONG).show(); + } + @Override public void onCancel() { textInput.clearText(); @@ -177,6 +188,8 @@ public class TextAttachmentController extends TextSendController } private static class SavedState extends AbsSavedState { + + @Nullable private List imageUris; private SavedState(Parcelable superState) { @@ -195,16 +208,18 @@ public class TextAttachmentController extends TextSendController out.writeList(imageUris); } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } + public static final Creator CREATOR = + new Creator() { + @Override + public SavedState createFromParcel(Parcel in) { + return new SavedState(in); + } - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; + @Override + public SavedState[] newArray(int size) { + return new SavedState[size]; + } + }; } public interface AttachImageListener { diff --git a/briar-android/src/main/res/layout/image_preview.xml b/briar-android/src/main/res/layout/image_preview.xml index 456cf2a21..e21a322b7 100644 --- a/briar-android/src/main/res/layout/image_preview.xml +++ b/briar-android/src/main/res/layout/image_preview.xml @@ -13,21 +13,23 @@ android:id="@+id/divider" style="@style/Divider.Horizontal" android:layout_alignParentTop="true" - app:layout_constraintBottom_toTopOf="@+id/imageView" + app:layout_constraintBottom_toTopOf="@+id/imageList" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"/> - + tools:listitem="@layout/list_item_image"/> + + + + + + + diff --git a/briar-android/src/main/res/layout/list_item_image_preview_single.xml b/briar-android/src/main/res/layout/list_item_image_preview_single.xml new file mode 100644 index 000000000..038e52bbc --- /dev/null +++ b/briar-android/src/main/res/layout/list_item_image_preview_single.xml @@ -0,0 +1,33 @@ + + + + + + + + diff --git a/briar-android/witness.gradle b/briar-android/witness.gradle index eaf6c6271..ee7273494 100644 --- a/briar-android/witness.gradle +++ b/briar-android/witness.gradle @@ -40,7 +40,6 @@ 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', diff --git a/briar-headless/witness.gradle b/briar-headless/witness.gradle index 4708ccda1..bf270b363 100644 --- a/briar-headless/witness.gradle +++ b/briar-headless/witness.gradle @@ -27,6 +27,7 @@ dependencyVerification { 'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f', 'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'javax.servlet:javax.servlet-api:3.1.0:javax.servlet-api-3.1.0.jar:af456b2dd41c4e82cf54f3e743bc678973d9fe35bd4d3071fa05c7e5333b8482', + 'khttp:khttp:0.1.0:khttp-0.1.0.jar:48ab3bd22e461f2c2e74e3446d8f9568e24aab157f61fdc85ded6c0bfbe9a926', 'net.bytebuddy:byte-buddy-agent:1.8.22:byte-buddy-agent-1.8.22.jar:ebc20e83fbb13e7911e4c704c9548a4166d7e83922f80de700ae5c5c983943d5', 'net.bytebuddy:byte-buddy:1.8.22:byte-buddy-1.8.22.jar:d330d2ef290a2852bbaf06eab03bc93d24501599c8a836da9d946f82c48e276c', 'org.apiguardian:apiguardian-api:1.0.0:apiguardian-api-1.0.0.jar:1f58b77470d8d147a0538d515347dd322f49a83b9e884b8970051160464b65b3', @@ -63,6 +64,7 @@ dependencyVerification { 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71:kotlin-stdlib-jdk8-1.2.71.jar:ac3c8abf47790b64b4f7e2509a53f0c145e061ac1612a597520535d199946ea9', 'org.jetbrains.kotlin:kotlin-stdlib:1.2.71:kotlin-stdlib-1.2.71.jar:4c895c270b87f5fec2a2796e1d89c15407ee821de961527c28588bb46afbc68b', 'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478', + 'org.json:json:20150729:json-20150729.jar:38c21b9c3d6d24919cd15d027d20afab0a019ac9205f7ed9083b32bdd42a2353', 'org.junit.jupiter:junit-jupiter-api:5.3.1:junit-jupiter-api-5.3.1.jar:7923e21f030a9964d70a0e48007ca873280c66ddf0f0620b2d969852c23d5653', 'org.junit.jupiter:junit-jupiter-engine:5.3.1:junit-jupiter-engine-5.3.1.jar:04f4354548a30827e126bdf6fcbe3640789ad8335a6f3f0762bf7f9f74e51fbf', 'org.junit.jupiter:junit-jupiter-params:5.3.1:junit-jupiter-params-5.3.1.jar:72fe344712d4cd88dd0cb4bfa304322d512d2cb27173ed64cb5036a573d29f4c',