Skip to content

Fixes #3506: Image height remains zero for some time on bad network #3513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
misaochan merged 5 commits into from
Apr 7, 2020
Merged

Fixes #3506: Image height remains zero for some time on bad network #3513

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
88a8a52
optimise width loading
kbhardwaj123 Mar 13, 2020
1dc0dec
amending as per the reviews
kbhardwaj123 Apr 2, 2020
47c1894
aspect ratio updates after layout completion
kbhardwaj123 Apr 7, 2020
39dcc10
MediaDetailFragment: update aspect ratio using onGlobalLayoutListener
kbhardwaj123 Apr 7, 2020
86b7aa5
remove unnecessary imports
kbhardwaj123 Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewTreeObserver;
import android.view.ViewTreeObserver.OnGlobalLayoutListener;
import android.view.WindowManager;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
Expand Down Expand Up @@ -64,6 +67,7 @@
import io.reactivex.schedulers.Schedulers;
import timber.log.Timber;

import static android.content.Context.WINDOW_SERVICE;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;

Expand Down Expand Up @@ -224,7 +228,15 @@ public void onResume() {
.setVisibility(View.GONE);
}
media = detailProvider.getMediaAtPosition(index);
displayMediaDetails();
scrollView.getViewTreeObserver().addOnGlobalLayoutListener(
new OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
scrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
displayMediaDetails();
}
}
);
}

private void displayMediaDetails() {
Expand All @@ -243,7 +255,8 @@ private void displayMediaDetails() {

private void updateAspectRatio(ImageInfo imageInfo) {
if (imageInfo != null) {
int finalHeight = (scrollView.getWidth()*imageInfo.getHeight()) / imageInfo.getWidth();
int screenWidth = scrollView.getWidth();
int finalHeight = (screenWidth*imageInfo.getHeight()) / imageInfo.getWidth();
ViewGroup.LayoutParams params = image.getLayoutParams();
params.height = finalHeight;
image.setLayoutParams(params);
Expand Down