TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 09:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use FitCenter sizing for stickers.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-12-30 16:13:18 -05:00 committed by Alan Evans
parent 6551689a0c
commit 8083596f19
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/sticker_view.xml
View File

@ -17,6 +17,7 @@
android:id="@+id/sticker_thumbnail" android:id="@+id/sticker_thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:thumbnail_radius="0dp"/> app:thumbnail_radius="0dp"
app:thumbnail_fit="fit_center"/>
</merge> </merge>

4
res/values/attrs.xml
View File

@ -266,6 +266,10 @@
<attr name="minHeight" format="dimension" /> <attr name="minHeight" format="dimension" />
<attr name="maxHeight" format="dimension" /> <attr name="maxHeight" format="dimension" />
<attr name="thumbnail_radius" format="dimension" /> <attr name="thumbnail_radius" format="dimension" />
<attr name="thumbnail_fit" format="enum">
<enum name="center_crop" value="0" />
<enum name="fit_center" value="1" />
</attr>
</declare-styleable> </declare-styleable>
<declare-styleable name="DeliveryStatusView"> <declare-styleable name="DeliveryStatusView">

5
src/org/thoughtcrime/securesms/components/ThumbnailView.java
View File

@ -17,6 +17,7 @@ import com.bumptech.glide.RequestBuilder;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
import com.bumptech.glide.load.resource.bitmap.CenterCrop; import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.FitCenter;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.RequestOptions;
@ -68,6 +69,7 @@ public class ThumbnailView extends FrameLayout {
private SlideClickListener thumbnailClickListener = null; private SlideClickListener thumbnailClickListener = null;
private SlidesClickedListener downloadClickListener = null; private SlidesClickedListener downloadClickListener = null;
private Slide slide = null; private Slide slide = null;
private BitmapTransformation fit = new CenterCrop();
private int radius; private int radius;
@ -97,6 +99,7 @@ public class ThumbnailView extends FrameLayout {
bounds[MIN_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_minHeight, 0); bounds[MIN_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_minHeight, 0);
bounds[MAX_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_maxHeight, 0); bounds[MAX_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_maxHeight, 0);
radius = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_thumbnail_radius, getResources().getDimensionPixelSize(R.dimen.thumbnail_default_radius)); radius = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_thumbnail_radius, getResources().getDimensionPixelSize(R.dimen.thumbnail_default_radius));
fit = typedArray.getInt(R.styleable.ThumbnailView_thumbnail_fit, 0) == 1 ? new FitCenter() : new CenterCrop();
typedArray.recycle(); typedArray.recycle();
} else { } else {
radius = getResources().getDimensionPixelSize(R.dimen.message_corner_collapse_radius); radius = getResources().getDimensionPixelSize(R.dimen.message_corner_collapse_radius);
@ -394,7 +397,7 @@ public class ThumbnailView extends FrameLayout {
private GlideRequest buildThumbnailGlideRequest(@NonNull GlideRequests glideRequests, @NonNull Slide slide) { private GlideRequest buildThumbnailGlideRequest(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
GlideRequest request = applySizing(glideRequests.load(new DecryptableUri(slide.getThumbnailUri())) GlideRequest request = applySizing(glideRequests.load(new DecryptableUri(slide.getThumbnailUri()))
.diskCacheStrategy(DiskCacheStrategy.RESOURCE) .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
.transition(withCrossFade()), new CenterCrop()); .transition(withCrossFade()), fit);
if (slide.isInProgress()) return request; if (slide.isInProgress()) return request;
else return request.apply(RequestOptions.errorOf(R.drawable.ic_missing_thumbnail_picture)); else return request.apply(RequestOptions.errorOf(R.drawable.ic_missing_thumbnail_picture));