Commit 183a4e99 authored by Varun Patil's avatar Varun Patil

Fix full size image not loading from back stack

parent d899134b
......@@ -79,8 +79,7 @@ public final class Utils {
ft.commit();
}
public static void updateSharedElementFragment(final TransitionTargetFragment ttFragment, Fragment currentFragment, Map<View, String> sharedElements) {
Fragment fragment = (Fragment) ttFragment;
public static void updateSharedElementFragment(final Fragment fragment, final Fragment currentFragment, Map<View, String> sharedElements) {
FragmentTransaction ft = currentFragment.getActivity().getSupportFragmentManager().beginTransaction();
Transition transition = new DetailsTransition();
......@@ -89,7 +88,7 @@ public final class Utils {
fragment.setSharedElementEnterTransition(transition);
fragment.setEnterTransition(new Slide());
currentFragment.setExitTransition(new Fade());
fragment.setSharedElementReturnTransition(new DetailsTransition());
fragment.setSharedElementReturnTransition(transition);
transition.addListener(new Transition.TransitionListener() {
@Override
......@@ -98,7 +97,13 @@ public final class Utils {
@Override
public void onTransitionEnd(Transition transition) {
ttFragment.transitionEnd();
if (fragment instanceof TransitionTargetFragment) {
((TransitionTargetFragment) fragment).transitionEnd();
}
if (currentFragment instanceof TransitionTargetFragment) {
((TransitionTargetFragment) currentFragment).transitionEnd();
}
}
@Override
......
......@@ -125,7 +125,8 @@ public class BodyFragment extends BackHandledFragment implements TransitionTarge
@Override
public void transitionEnd() {
bodyPicture = (ImageView) getActivity().findViewById(R.id.body_picture);
if (getActivity() == null || getView() == null) return;
bodyPicture = (ImageView) getView().findViewById(R.id.body_picture);
Utils.loadImageWithPlaceholder(bodyPicture, body.getBodyImageURL());
transitionEnded = true;
}
......
......@@ -89,6 +89,7 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
@Override
public void transitionEnd() {
if (getActivity() == null || getView() == null) return;
Utils.loadImageWithPlaceholder(eventPicture, event.getEventImageURL());
}
......
......@@ -93,6 +93,7 @@ public class UserFragment extends BackHandledFragment implements TransitionTarge
@Override
public void transitionEnd() {
if (getActivity() == null || getView() == null) return;
if (showingMin) {
showingMin = false;
loadUser(user.getUserID());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment