From db4d1f5c8fd9fd9d5fc723f40a23ebefc3776cdb Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 5 Jul 2016 19:03:50 +1200 Subject: [PATCH 1/4] Add comments --- .../fr/free/nrw/commons/media/MediaDetailPagerFragment.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 58e08fc6c..2b74d628b 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -54,6 +54,8 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa public void registerDataSetObserver(DataSetObserver observer); public void unregisterDataSetObserver(DataSetObserver observer); } + + //FragmentStatePagerAdapter allows user to swipe across collection of images (no. of images undetermined) private class MediaDetailAdapter extends FragmentStatePagerAdapter { public MediaDetailAdapter(FragmentManager fm) { From f9037e13608073356e743b58077e711fd5b1dce8 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 5 Jul 2016 19:04:08 +1200 Subject: [PATCH 2/4] Put constructor at top of page --- .../commons/media/MediaDetailPagerFragment.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 2b74d628b..98395ca88 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -35,6 +35,15 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa private ViewPager pager; private Boolean editable; private CommonsApplication app; + + public MediaDetailPagerFragment() { + this(false); + } + + @SuppressLint("ValidFragment") + public MediaDetailPagerFragment(Boolean editable) { + this.editable = editable; + } public void onPageScrolled(int i, float v, int i2) { getActivity().supportInvalidateOptionsMenu(); @@ -81,14 +90,6 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa } } - public MediaDetailPagerFragment() { - this(false); - } - - @SuppressLint("ValidFragment") - public MediaDetailPagerFragment(Boolean editable) { - this.editable = editable; - } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { From 433f39ae24e85bc1c462f14bd06469868109ff73 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 5 Jul 2016 19:05:06 +1200 Subject: [PATCH 3/4] Classes at top, methods at bottom --- .../media/MediaDetailPagerFragment.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 98395ca88..17e67a4c4 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -35,7 +35,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa private ViewPager pager; private Boolean editable; private CommonsApplication app; - + public MediaDetailPagerFragment() { this(false); } @@ -45,17 +45,6 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa this.editable = editable; } - public void onPageScrolled(int i, float v, int i2) { - getActivity().supportInvalidateOptionsMenu(); - } - - public void onPageSelected(int i) { - } - - public void onPageScrollStateChanged(int i) { - - } - public interface MediaDetailProvider { public Media getMediaAtPosition(int i); public int getTotalMediaCount(); @@ -90,7 +79,6 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa } } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_media_detail_pager, container, false); @@ -287,4 +275,15 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa public void showImage(int i) { pager.setCurrentItem(i); } + + public void onPageScrolled(int i, float v, int i2) { + getActivity().supportInvalidateOptionsMenu(); + } + + public void onPageSelected(int i) { + } + + public void onPageScrollStateChanged(int i) { + + } } \ No newline at end of file From b45695fddadc57974fdabf7d370343ab35ad0b72 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 5 Jul 2016 19:11:11 +1200 Subject: [PATCH 4/4] Add comments --- .../fr/free/nrw/commons/media/MediaDetailPagerFragment.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java index 17e67a4c4..a9a2b2066 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailPagerFragment.java @@ -178,6 +178,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa Uri imageUri = Uri.parse(imageUrl); DownloadManager.Request req = new DownloadManager.Request(imageUri); + //These are not the image title and description fields, they are download descs for notifications req.setDescription(getString(R.string.app_name)); req.setTitle(m.getDisplayTitle()); req.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, fileName); @@ -275,7 +276,7 @@ public class MediaDetailPagerFragment extends Fragment implements ViewPager.OnPa public void showImage(int i) { pager.setCurrentItem(i); } - + public void onPageScrolled(int i, float v, int i2) { getActivity().supportInvalidateOptionsMenu(); }