mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Changes made (#4354)

Browse source
This commit is contained in:
Vinayak Aggarwal 2021-04-15 20:15:10 +05:30 • committed by Josephine Lim
parent 3416504cda
commit 09d8443e98
2 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/explore/ExploreListRootFragment.java
View file

@ -117,8 +117,9 @@ public class ExploreListRootFragment extends CommonsDaggerSupportFragment implem
container.setVisibility(View.VISIBLE); container.setVisibility(View.VISIBLE);
((ExploreFragment)getParentFragment()).tabLayout.setVisibility(View.GONE); ((ExploreFragment)getParentFragment()).tabLayout.setVisibility(View.GONE);
mediaDetails = new MediaDetailPagerFragment(false, true); mediaDetails = new MediaDetailPagerFragment(false, true);
mediaDetails.showImage(position); ((ExploreFragment) getParentFragment()).setScroll(false);
setFragment(mediaDetails, listFragment); setFragment(mediaDetails, listFragment);
mediaDetails.showImage(position);
} }
/** /**

45
app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java
View file

@ -92,24 +92,13 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
adapter = new MediaDetailAdapter(getChildFragmentManager()); adapter = new MediaDetailAdapter(getChildFragmentManager());
((BaseActivity)getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true); ((BaseActivity)getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
pager.setAdapter(adapter);
if (savedInstanceState != null) { if (savedInstanceState != null) {
final int pageNumber = savedInstanceState.getInt("current-page"); final int pageNumber = savedInstanceState.getInt("current-page");
// Adapter doesn't seem to be loading immediately. pager.setCurrentItem(pageNumber, false);
// Dear God, please forgive us for our sins getActivity().invalidateOptionsMenu();
view.postDelayed(() -> { adapter.notifyDataSetChanged();
pager.setAdapter(adapter);
pager.setCurrentItem(pageNumber, false);
if (getActivity() == null) {
Timber.d("Returning as activity is destroyed!");
return;
}
getActivity().supportInvalidateOptionsMenu();
adapter.notifyDataSetChanged();
}, 100);
} else {
pager.setAdapter(adapter);
} }
if (getActivity() instanceof MainActivity) { if (getActivity() instanceof MainActivity) {
((MainActivity)getActivity()).hideTabs(); ((MainActivity)getActivity()).hideTabs();
@ -304,13 +293,31 @@ public class MediaDetailPagerFragment extends CommonsDaggerSupportFragment imple
public void showImage(int i, boolean isWikipediaButtonDisplayed) { public void showImage(int i, boolean isWikipediaButtonDisplayed) {
this.isWikipediaButtonDisplayed = isWikipediaButtonDisplayed; this.isWikipediaButtonDisplayed = isWikipediaButtonDisplayed;
Handler handler = new Handler(); setViewPagerCurrentItem(i);
handler.postDelayed(() -> pager.setCurrentItem(i), 5);
} }
public void showImage(int i) { public void showImage(int i) {
Handler handler = new Handler(); setViewPagerCurrentItem(i);
handler.postDelayed(() -> pager.setCurrentItem(i), 5); }
/**
* This function waits for the item to load then sets the item to current item
* @param position current item that to be shown
*/
private void setViewPagerCurrentItem(int position) {
final Boolean[] currentItemNotShown = {true};
Runnable runnable = new Runnable() {
@Override
public void run() {
while(currentItemNotShown[0]){
if(adapter.getCount() > position){
pager.setCurrentItem(position, false);
currentItemNotShown[0] = false;
}
}
}
};
new Thread(runnable).start();
} }
/** /**