diff options
author | David Morrissey <davemorrissey@gmail.com> | 2015-03-08 22:20:26 +0000 |
---|---|---|
committer | David Morrissey <davemorrissey@gmail.com> | 2015-03-08 22:20:26 +0000 |
commit | 242513e3610a8461338f3eae9b92aed575770744 (patch) | |
tree | 9db3e5a863b188de3e1040c071de19b473891e4f /sample/src | |
parent | 0d041ffebfe858ceba863b50f7361952ead56669 (diff) | |
download | subsampling-scale-image-view-242513e3610a8461338f3eae9b92aed575770744.tar.gz |
Sample updated to v3.0.0.
Diffstat (limited to 'sample/src')
3 files changed, 4 insertions, 71 deletions
diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/SampleActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/SampleActivity.java deleted file mode 100644 index f9c1cb2..0000000 --- a/sample/src/com/davemorrissey/labs/subscaleview/sample/SampleActivity.java +++ /dev/null @@ -1,69 +0,0 @@ -/* -Copyright 2014 David Morrissey - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package com.davemorrissey.labs.subscaleview.sample; - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import com.davemorrissey.labs.subscaleview.sample.viewpager.ViewPagerFragment; - -public class SampleActivity extends FragmentActivity { - - private static final String[] IMAGES = { "card1.png", "card2.png", "card3.png", "DSC04285.JPG", "DSC03250.JPG" }; - - private ViewPager page; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.main); - PagerAdapter pagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); - page = (ViewPager)findViewById(R.id.pager); - page.setAdapter(pagerAdapter); - } - - @Override - public void onBackPressed() { - if (page.getCurrentItem() == 0) { - super.onBackPressed(); - } else { - page.setCurrentItem(page.getCurrentItem() - 1); - } - } - - private class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter { - public ScreenSlidePagerAdapter(FragmentManager fm) { - super(fm); - } - - @Override - public Fragment getItem(int position) { - return new ViewPagerFragment(IMAGES[position]); - } - - @Override - public int getCount() { - return IMAGES.length; - } - } - - -} diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java index 25b0bed..c2ad3d9 100644 --- a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java +++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerActivity.java @@ -66,7 +66,9 @@ public class ViewPagerActivity extends FragmentActivity { @Override public Fragment getItem(int position) { - return new ViewPagerFragment(IMAGES[position]); + ViewPagerFragment fragment = new ViewPagerFragment(); + fragment.setAsset(IMAGES[position]); + return fragment; } @Override diff --git a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java index 7120b92..7392185 100644 --- a/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java +++ b/sample/src/com/davemorrissey/labs/subscaleview/sample/viewpager/ViewPagerFragment.java @@ -36,7 +36,7 @@ public class ViewPagerFragment extends Fragment { public ViewPagerFragment() { } - public ViewPagerFragment(String asset) { + public void setAsset(String asset) { this.asset = asset; } |