Commit 9b796c7c authored by akwizgran's avatar akwizgran

Merge branch '1438-send-image-attachments-multiple' into 'master'

UX for sending multiple image attachments

See merge request !1015
parents 68572524 532edff6
Pipeline #2946 passed with stage
in 8 minutes and 56 seconds
...@@ -105,7 +105,6 @@ dependencies { ...@@ -105,7 +105,6 @@ dependencies {
implementation "com.android.support:cardview-v7:$supportVersion" implementation "com.android.support:cardview-v7:$supportVersion"
implementation "com.android.support:support-annotations:$supportVersion" implementation "com.android.support:support-annotations:$supportVersion"
implementation "com.android.support:exifinterface:$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 'com.android.support.constraint:constraint-layout:1.1.3'
implementation "android.arch.lifecycle:extensions:1.1.1" implementation "android.arch.lifecycle:extensions:1.1.1"
......
...@@ -10,12 +10,12 @@ import android.view.View; ...@@ -10,12 +10,12 @@ import android.view.View;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R; 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.isBottomRow;
import static org.briarproject.briar.android.conversation.ImageAdapter.isLeft; 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.isTopRow;
import static org.briarproject.briar.android.conversation.ImageAdapter.singleInRow; import static org.briarproject.briar.android.conversation.ImageAdapter.singleInRow;
import static org.briarproject.briar.android.util.UiUtils.isRtl;
@NotNullByDefault @NotNullByDefault
class ImageItemDecoration extends ItemDecoration { class ImageItemDecoration extends ItemDecoration {
...@@ -35,7 +35,7 @@ class ImageItemDecoration extends ItemDecoration { ...@@ -35,7 +35,7 @@ class ImageItemDecoration extends ItemDecoration {
border = realBorderSize / 2; border = realBorderSize / 2;
// find out if we are showing a RTL language // find out if we are showing a RTL language
isRtl = UiUtils.isRtl(ctx); isRtl = isRtl(ctx);
} }
@Override @Override
......
package org.briarproject.briar.android.view; package org.briarproject.briar.android.view;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.constraint.ConstraintLayout; import android.support.constraint.ConstraintLayout;
import android.support.v7.graphics.Palette; import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; 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.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R; 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.content.Context.LAYOUT_INFLATER_SERVICE;
import static android.graphics.Color.BLACK; import static android.support.v4.content.ContextCompat.getColor;
import static android.graphics.Color.WHITE; import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
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; import static java.util.Objects.requireNonNull;
@NotNullByDefault @NotNullByDefault
public class ImagePreview extends ConstraintLayout { public class ImagePreview extends ConstraintLayout {
private final ImageView imageView; private final RecyclerView imageList;
private final int backgroundColor =
getDefaultNightMode() == MODE_NIGHT_YES ? BLACK : WHITE;
@Nullable @Nullable
private ImagePreviewListener listener; private ImagePreviewListener listener;
...@@ -59,9 +43,12 @@ public class ImagePreview extends ConstraintLayout { ...@@ -59,9 +43,12 @@ public class ImagePreview extends ConstraintLayout {
context.getSystemService(LAYOUT_INFLATER_SERVICE)); context.getSystemService(LAYOUT_INFLATER_SERVICE));
inflater.inflate(R.layout.image_preview, this, true); inflater.inflate(R.layout.image_preview, this, true);
// find image view and set background color // set background color
imageView = findViewById(R.id.imageView); setBackgroundColor(getColor(context, R.color.card_background));
imageView.setBackgroundColor(backgroundColor);
// find list
imageList = findViewById(R.id.imageList);
imageList.addItemDecoration(new ImagePreviewDecoration(context));
// set cancel listener // set cancel listener
findViewById(R.id.imageCancelButton).setOnClickListener(view -> { findViewById(R.id.imageCancelButton).setOnClickListener(view -> {
...@@ -73,46 +60,27 @@ public class ImagePreview extends ConstraintLayout { ...@@ -73,46 +60,27 @@ public class ImagePreview extends ConstraintLayout {
this.listener = listener; this.listener = listener;
} }
void showPreview(List<Uri> imageUris) { void showPreview(Collection<Uri> 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); setVisibility(VISIBLE);
GlideApp.with(imageView) imageList.setAdapter(new ImagePreviewAdapter(imageUris, listener));
.asBitmap()
.load(imageUris.get(0)) // TODO show more than the first
.diskCacheStrategy(NONE)
.downsample(FIT_CENTER)
.addListener(new RequestListener<Bitmap>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e,
Object model, Target<Bitmap> 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<Bitmap> target,
DataSource dataSource, boolean isFirstResource) {
Palette.from(resource).generate(
ImagePreview.this::onPaletteGenerated);
return false;
}
})
.into(imageView);
} }
void onPaletteGenerated(@Nullable Palette palette) { void removeUri(Uri uri) {
if (palette == null) return; ImagePreviewAdapter adapter =
int color = getDefaultNightMode() == MODE_NIGHT_YES ? (ImagePreviewAdapter) imageList.getAdapter();
palette.getDarkMutedColor(backgroundColor) : requireNonNull(adapter).removeUri(uri);
palette.getLightMutedColor(backgroundColor);
imageView.setBackgroundColor(color);
} }
interface ImagePreviewListener { interface ImagePreviewListener {
void onUriError(Uri uri);
void onCancel(); void onCancel();
} }
......
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<ImagePreviewViewHolder> {
private final List<Uri> items;
private final ImagePreviewListener listener;
@LayoutRes
private final int layout;
ImagePreviewAdapter(Collection<Uri> 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);
}
}
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;
}
}
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<Drawable>() {
@Override
public boolean onLoadFailed(@Nullable GlideException e,
Object model, Target<Drawable> target,
boolean isFirstResource) {
listener.onUriError(uri);
progressBar.setVisibility(INVISIBLE);
return false;
}
@Override
public boolean onResourceReady(Drawable resource,
Object model, Target<Drawable> target,
DataSource dataSource, boolean isFirstResource) {
progressBar.setVisibility(INVISIBLE);
return false;
}
})
.into(imageView);
}
}
...@@ -5,12 +5,13 @@ import android.content.Intent; ...@@ -5,12 +5,13 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.support.v4.view.AbsSavedState; import android.support.v4.view.AbsSavedState;
import android.support.v7.widget.AppCompatImageButton; 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.R;
import org.briarproject.briar.android.view.ImagePreview.ImagePreviewListener; import org.briarproject.briar.android.view.ImagePreview.ImagePreviewListener;
...@@ -26,11 +27,12 @@ import static android.support.v4.view.AbsSavedState.EMPTY_STATE; ...@@ -26,11 +27,12 @@ import static android.support.v4.view.AbsSavedState.EMPTY_STATE;
import static android.view.View.GONE; import static android.view.View.GONE;
import static android.view.View.INVISIBLE; import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static java.util.Objects.requireNonNull; import static java.util.Objects.requireNonNull;
@UiThread @UiThread
@NotNullByDefault
public class TextAttachmentController extends TextSendController public class TextAttachmentController extends TextSendController
implements ImagePreviewListener { implements ImagePreviewListener {
...@@ -81,15 +83,15 @@ public class TextAttachmentController extends TextSendController ...@@ -81,15 +83,15 @@ public class TextAttachmentController extends TextSendController
ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT); ACTION_OPEN_DOCUMENT : ACTION_GET_CONTENT);
intent.addCategory(CATEGORY_OPENABLE); intent.addCategory(CATEGORY_OPENABLE);
intent.setType("image/*"); intent.setType("image/*");
if (SDK_INT >= 18) // TODO set true to allow attaching multiple images if (SDK_INT >= 18) intent.putExtra(EXTRA_ALLOW_MULTIPLE, true);
intent.putExtra(EXTRA_ALLOW_MULTIPLE, false);
requireNonNull(imageListener).onAttachImage(intent); requireNonNull(imageListener).onAttachImage(intent);
} }
public void onImageReceived(@Nullable Intent resultData) { public void onImageReceived(@Nullable Intent resultData) {
if (resultData == null) return; if (resultData == null) return;
if (resultData.getData() != null) { if (resultData.getData() != null) {
imageUris = singletonList(resultData.getData()); imageUris = new ArrayList<>(1);
imageUris.add(resultData.getData());
onNewUris(); onNewUris();
} else if (SDK_INT >= 18 && resultData.getClipData() != null) { } else if (SDK_INT >= 18 && resultData.getClipData() != null) {
ClipData clipData = resultData.getClipData(); ClipData clipData = resultData.getClipData();
...@@ -163,13 +165,22 @@ public class TextAttachmentController extends TextSendController ...@@ -163,13 +165,22 @@ public class TextAttachmentController extends TextSendController
@Override @Override
@Nullable @Nullable
public Parcelable onRestoreInstanceState(@NonNull Parcelable inState) { public Parcelable onRestoreInstanceState(Parcelable inState) {
SavedState state = (SavedState) inState; SavedState state = (SavedState) inState;
imageUris = state.imageUris; imageUris = requireNonNull(state.imageUris);
onNewUris(); onNewUris();
return state.getSuperState(); 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 @Override
public void onCancel() { public void onCancel() {
textInput.clearText(); textInput.clearText();
...@@ -177,6 +188,8 @@ public class TextAttachmentController extends TextSendController ...@@ -177,6 +188,8 @@ public class TextAttachmentController extends TextSendController
} }
private static class SavedState extends AbsSavedState { private static class SavedState extends AbsSavedState {
@Nullable
private List<Uri> imageUris; private List<Uri> imageUris;
private SavedState(Parcelable superState) { private SavedState(Parcelable superState) {
...@@ -195,16 +208,18 @@ public class TextAttachmentController extends TextSendController ...@@ -195,16 +208,18 @@ public class TextAttachmentController extends TextSendController
out.writeList(imageUris); out.writeList(imageUris);
} }
public static final Parcelable.Creator<SavedState> CREATOR public static final Creator<SavedState> CREATOR =
= new Parcelable.Creator<SavedState>() { new Creator<SavedState>() {
public SavedState createFromParcel(Parcel in) { @Override
return new SavedState(in); 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 { public interface AttachImageListener {
......
...@@ -13,21 +13,23 @@ ...@@ -13,21 +13,23 @@
android:id="@+id/divider" android:id="@+id/divider"
style="@style/Divider.Horizontal" style="@style/Divider.Horizontal"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
app:layout_constraintBottom_toTopOf="@+id/imageView" app:layout_constraintBottom_toTopOf="@+id/imageList"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>
<ImageView <android.support.v7.widget.RecyclerView
android:id="@+id/imageView" android:id="@+id/imageList"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"
app:layoutManager="android.support.v7.widget.LinearLayoutManager"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" app:layout_constraintTop_toBottomOf="@+id/divider"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:srcCompat="@tools:sample/avatars"/> tools:listitem="@layout/list_item_image"/>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/imageCancelButton" android:id="@+id/imageCancelButton"
......
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="match_parent"
tools:layout_height="200dp">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView
android:id="@+id/imageView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription"
tools:srcCompat="@tools:sample/avatars"
tools:visibility="visible"/>
</android.support.constraint.ConstraintLayout>
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout_height="200dp">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView
android:id="@+id/imageView"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription"
tools:srcCompat="@tools:sample/backgrounds/scenic"
tools:visibility="visible"/>
</android.support.constraint.ConstraintLayout>
...@@ -40,7 +40,6 @@ dependencyVerification { ...@@ -40,7 +40,6 @@ dependencyVerification {
'com.android.support:interpolator:28.0.0:interpolator-28.0.0.aar:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea', '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: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: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-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: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', 'com.android.support:print:28.0.0:print-28.0.0.aar:4be8a812d73e4a80e35b91ceae127def3f0bb9726bf3bc439aa0cc81503f5728',
......
...@@ -27,6 +27,7 @@ dependencyVerification { ...@@ -27,6 +27,7 @@ dependencyVerification {
'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f', 'javax.annotation:jsr250-api:1.0:jsr250-api-1.0.jar:a1a922d0d9b6d183ed3800dfac01d1e1eb159f0e8c6f94736931c1def54a941f',
'javax.inject:javax.inject:1:javax.inject-1.jar:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', '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', '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-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', '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', 'org.apiguardian:apiguardian-api:1.0.0:apiguardian-api-1.0.0.jar:1f58b77470d8d147a0538d515347dd322f49a83b9e884b8970051160464b65b3',
...@@ -63,6 +64,7 @@ dependencyVerification { ...@@ -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-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.kotlin:kotlin-stdlib:1.2.71:kotlin-stdlib-1.2.71.jar:4c895c270b87f5fec2a2796e1d89c15407ee821de961527c28588bb46afbc68b',
'org.jetbrains:annotations:13.0:annotations-13.0.jar:ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478', '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-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-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', 'org.junit.jupiter:junit-jupiter-params:5.3.1:junit-jupiter-params-5.3.1.jar:72fe344712d4cd88dd0cb4bfa304322d512d2cb27173ed64cb5036a573d29f4c',
......