empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix gif sizing in conversation.

Browse source
This commit is contained in:
Alex Hart 2023-02-16 12:26:56 -04:00 • committed by Greyson Parrelli
parent 01f477a587
commit 1e10b82769
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.kt
View file

@ -170,13 +170,13 @@ class ConversationItemThumbnail @JvmOverloads constructor(
fun setMinimumThumbnailWidth(@Px width: Int) { fun setMinimumThumbnailWidth(@Px width: Int) {
minimumThumbnailWidth = width minimumThumbnailWidth = width
state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minimumThumbnailWidth = width)) state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minWidth = width))
state.thumbnailViewState.applyState(thumbnail) state.thumbnailViewState.applyState(thumbnail)
} }
fun setMaximumThumbnailHeight(@Px height: Int) { fun setMaximumThumbnailHeight(@Px height: Int) {
maximumThumbnailHeight = height maximumThumbnailHeight = height
state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maximumThumbnailHeight = height)) state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maxHeight = height))
state.thumbnailViewState.applyState(thumbnail) state.thumbnailViewState.applyState(thumbnail)
} }
@ -200,11 +200,11 @@ class ConversationItemThumbnail @JvmOverloads constructor(
setThumbnailBounds(normalBounds) setThumbnailBounds(normalBounds)
if (minimumThumbnailWidth != -1) { if (minimumThumbnailWidth != -1) {
state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minimumThumbnailWidth = minimumThumbnailWidth)) state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(minWidth = minimumThumbnailWidth))
} }
if (maximumThumbnailHeight != -1) { if (maximumThumbnailHeight != -1) {
state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maximumThumbnailHeight = maximumThumbnailHeight)) state = state.copy(thumbnailViewState = state.thumbnailViewState.copy(maxHeight = maximumThumbnailHeight))
} }
} }

4
app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnailState.kt
View file

@ -32,8 +32,6 @@ data class ConversationItemThumbnailState(
private val downloadClickListener: SlidesClickedListener? = null, private val downloadClickListener: SlidesClickedListener? = null,
@IgnoredOnParcel @IgnoredOnParcel
private val longClickListener: OnLongClickListener? = null, private val longClickListener: OnLongClickListener? = null,
private val minimumThumbnailWidth: Int = -1,
private val maximumThumbnailHeight: Int = -1,
private val visibility: Int = View.GONE, private val visibility: Int = View.GONE,
private val minWidth: Int = -1, private val minWidth: Int = -1,
private val maxWidth: Int = -1, private val maxWidth: Int = -1,
@ -59,8 +57,6 @@ data class ConversationItemThumbnailState(
thumbnailView.get().setDownloadClickListener(downloadClickListener) thumbnailView.get().setDownloadClickListener(downloadClickListener)
thumbnailView.get().setOnLongClickListener(longClickListener) thumbnailView.get().setOnLongClickListener(longClickListener)
thumbnailView.get().setBounds(minWidth, maxWidth, minHeight, maxHeight) thumbnailView.get().setBounds(minWidth, maxWidth, minHeight, maxHeight)
thumbnailView.get().setMinimumThumbnailWidth(minimumThumbnailWidth)
thumbnailView.get().setMaximumThumbnailHeight(maximumThumbnailHeight)
} }
} }

3
app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
View file

@ -26,7 +26,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.Request; import com.bumptech.glide.request.Request;
import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.transition.Transition;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@ -43,7 +42,6 @@ import org.thoughtcrime.securesms.mms.VideoSlide;
import org.thoughtcrime.securesms.stories.StoryTextPostModel; import org.thoughtcrime.securesms.stories.StoryTextPostModel;
import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.thoughtcrime.securesms.util.ViewUtil;
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
import org.thoughtcrime.securesms.util.concurrent.SettableFuture; import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
import org.thoughtcrime.securesms.util.views.Stub; import org.thoughtcrime.securesms.util.views.Stub;
@ -51,7 +49,6 @@ import org.thoughtcrime.securesms.util.views.Stub;
import java.util.Collections; import java.util.Collections;
import java.util.Locale; import java.util.Locale;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade; import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;