Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

[android] Add gap between attached image previews

Browse Source
This commit is contained in:
Torsten Grote
2018-12-14 10:16:31 -02:00
parent 9eacbfa659
commit 42bca09d16
3 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageItemDecoration.java
View File

@@ -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 {
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

1
briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java
View File

@@ -48,6 +48,7 @@ public class ImagePreview extends ConstraintLayout {
// find list // find list
imageList = findViewById(R.id.imageList); 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 -> {

34
briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewDecoration.java Normal file
View File

@@ -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;
}
}