mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2025-01-01 13:57:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Lower the threshold for image preview width and height.

Browse Source
This commit is contained in:
Alex Ning 2020-12-02 17:49:03 +08:00
parent 95fd7ce8ba
commit 58a19c9ad1
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/CommentAndPostRecyclerViewAdapter.java
View File

@ -1451,27 +1451,29 @@ public class CommentAndPostRecyclerViewAdapter extends RecyclerView.Adapter<Recy
previewIndex = 0; previewIndex = 0;
} }
preview = previews.get(previewIndex); preview = previews.get(previewIndex);
if (preview.getPreviewWidth() * preview.getPreviewHeight() >= 65 * 1000 * 1000) { if (preview.getPreviewWidth() * preview.getPreviewHeight() > 35_000_000) {
for (int i = previews.size() - 1; i >= 1; i--) { for (int i = previews.size() - 1; i >= 1; i--) {
preview = previews.get(i); preview = previews.get(i);
if (mImageViewWidth >= preview.getPreviewWidth()) { if (mImageViewWidth >= preview.getPreviewWidth()) {
if (preview.getPreviewWidth() * preview.getPreviewHeight() <= 75 * 1000 * 1000) { if (preview.getPreviewWidth() * preview.getPreviewHeight() <= 35_000_000) {
return preview; return preview;
} }
} else { } else {
int height = mImageViewWidth / preview.getPreviewWidth() * preview.getPreviewHeight(); int height = mImageViewWidth / preview.getPreviewWidth() * preview.getPreviewHeight();
if (mImageViewWidth * height <= 75 * 1000 * 1000) { if (mImageViewWidth * height <= 35_000_000) {
return preview; return preview;
} }
} }
} }
} }
if (preview.getPreviewWidth() * preview.getPreviewHeight() > 35_000_000) {
int divisor = 2; int divisor = 2;
while (preview.getPreviewWidth() * preview.getPreviewHeight() / divisor / divisor > 75 * 1000 * 1000) { do {
preview.setPreviewWidth(preview.getPreviewWidth() / divisor); preview.setPreviewWidth(preview.getPreviewWidth() / divisor);
preview.setPreviewHeight(preview.getPreviewHeight() / divisor); preview.setPreviewHeight(preview.getPreviewHeight() / divisor);
divisor *= 2; divisor *= 2;
} while (preview.getPreviewWidth() * preview.getPreviewHeight() / divisor / divisor > 35_000_000);
} }
return preview; return preview;

22
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
View File

@ -69,6 +69,12 @@ import im.ene.toro.media.PlaybackInfo;
import im.ene.toro.widget.Container; import im.ene.toro.widget.Container;
import jp.wasabeef.glide.transformations.BlurTransformation; import jp.wasabeef.glide.transformations.BlurTransformation;
import jp.wasabeef.glide.transformations.RoundedCornersTransformation; import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
import ml.docilealligator.infinityforreddit.FetchGfycatOrRedgifsVideoLinks;
import ml.docilealligator.infinityforreddit.NetworkState;
import ml.docilealligator.infinityforreddit.R;
import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
import ml.docilealligator.infinityforreddit.SaveThing;
import ml.docilealligator.infinityforreddit.VoteThing;
import ml.docilealligator.infinityforreddit.activities.FilteredThingActivity; import ml.docilealligator.infinityforreddit.activities.FilteredThingActivity;
import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity; import ml.docilealligator.infinityforreddit.activities.LinkResolverActivity;
import ml.docilealligator.infinityforreddit.activities.ViewImageOrGifActivity; import ml.docilealligator.infinityforreddit.activities.ViewImageOrGifActivity;
@ -83,18 +89,12 @@ import ml.docilealligator.infinityforreddit.bottomsheetfragments.ShareLinkBottom
import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper; import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
import ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView; import ml.docilealligator.infinityforreddit.customviews.AspectRatioGifImageView;
import ml.docilealligator.infinityforreddit.events.PostUpdateEventToDetailActivity; import ml.docilealligator.infinityforreddit.events.PostUpdateEventToDetailActivity;
import ml.docilealligator.infinityforreddit.FetchGfycatOrRedgifsVideoLinks;
import ml.docilealligator.infinityforreddit.NetworkState;
import ml.docilealligator.infinityforreddit.post.Post; import ml.docilealligator.infinityforreddit.post.Post;
import ml.docilealligator.infinityforreddit.post.PostDataSource; import ml.docilealligator.infinityforreddit.post.PostDataSource;
import ml.docilealligator.infinityforreddit.R;
import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase;
import ml.docilealligator.infinityforreddit.SaveThing;
import ml.docilealligator.infinityforreddit.user.UserDao; import ml.docilealligator.infinityforreddit.user.UserDao;
import ml.docilealligator.infinityforreddit.utils.APIUtils; import ml.docilealligator.infinityforreddit.utils.APIUtils;
import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils; import ml.docilealligator.infinityforreddit.utils.SharedPreferencesUtils;
import ml.docilealligator.infinityforreddit.utils.Utils; import ml.docilealligator.infinityforreddit.utils.Utils;
import ml.docilealligator.infinityforreddit.VoteThing;
import pl.droidsonroids.gif.GifImageView; import pl.droidsonroids.gif.GifImageView;
import retrofit2.Retrofit; import retrofit2.Retrofit;
@ -994,27 +994,29 @@ public class PostRecyclerViewAdapter extends PagedListAdapter<Post, RecyclerView
previewIndex = 0; previewIndex = 0;
} }
preview = previews.get(previewIndex); preview = previews.get(previewIndex);
if (preview.getPreviewWidth() * preview.getPreviewHeight() >= 75_000_000) { if (preview.getPreviewWidth() * preview.getPreviewHeight() > 35_000_000) {
for (int i = previews.size() - 1; i >= 1; i--) { for (int i = previews.size() - 1; i >= 1; i--) {
preview = previews.get(i); preview = previews.get(i);
if (mImageViewWidth >= preview.getPreviewWidth()) { if (mImageViewWidth >= preview.getPreviewWidth()) {
if (preview.getPreviewWidth() * preview.getPreviewHeight() <= 75_000_000) { if (preview.getPreviewWidth() * preview.getPreviewHeight() <= 35_000_000) {
return preview; return preview;
} }
} else { } else {
int height = mImageViewWidth / preview.getPreviewWidth() * preview.getPreviewHeight(); int height = mImageViewWidth / preview.getPreviewWidth() * preview.getPreviewHeight();
if (mImageViewWidth * height <= 75_000_000) { if (mImageViewWidth * height <= 35_000_000) {
return preview; return preview;
} }
} }
} }
} }
if (preview.getPreviewWidth() * preview.getPreviewHeight() > 35_000_000) {
int divisor = 2; int divisor = 2;
while (preview.getPreviewWidth() * preview.getPreviewHeight() / divisor / divisor > 75_000_000) { do {
preview.setPreviewWidth(preview.getPreviewWidth() / divisor); preview.setPreviewWidth(preview.getPreviewWidth() / divisor);
preview.setPreviewHeight(preview.getPreviewHeight() / divisor); preview.setPreviewHeight(preview.getPreviewHeight() / divisor);
divisor *= 2; divisor *= 2;
} while (preview.getPreviewWidth() * preview.getPreviewHeight() / divisor / divisor > 35_000_000);
} }
return preview; return preview;