diff options
Diffstat (limited to 'app/src/main/java/com/camilstaps/taize/MainActivity.java')
| -rw-r--r-- | app/src/main/java/com/camilstaps/taize/MainActivity.java | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/app/src/main/java/com/camilstaps/taize/MainActivity.java b/app/src/main/java/com/camilstaps/taize/MainActivity.java index 4e05109..3478569 100644 --- a/app/src/main/java/com/camilstaps/taize/MainActivity.java +++ b/app/src/main/java/com/camilstaps/taize/MainActivity.java @@ -1,5 +1,6 @@ package com.camilstaps.taize; +import android.content.Context; import android.content.Intent; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; @@ -11,15 +12,19 @@ import android.support.v4.view.ViewPager; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.os.Bundle; +import android.util.AttributeSet; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.ViewGroup; import android.widget.PopupMenu; +import com.camilstaps.common.DisablableViewPager; + public class MainActivity extends ActionBarActivity { - ViewPager viewPager; + DisablableViewPager viewPager; PagerAdapter pagerAdapter; ActionBar.TabListener tabListener; @@ -33,7 +38,7 @@ public class MainActivity extends ActionBarActivity { setContentView(R.layout.activity_main); pagerAdapter = new TaizePagerAdapter(getSupportFragmentManager()); - viewPager = (ViewPager) findViewById(R.id.pager); + viewPager = (DisablableViewPager) findViewById(R.id.pager); viewPager.setAdapter(pagerAdapter); final ActionBar actionBar = getSupportActionBar(); @@ -46,18 +51,25 @@ public class MainActivity extends ActionBarActivity { public void onTabSelected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { switch (tab.getPosition()) { case 0: - viewPager.setCurrentItem(TaizePagerAdapter.DAILYREADING_TODAY); + viewPager.setCurrentItem(TaizePagerAdapter.DAILYREADING_TODAY, false); break; case 1: - viewPager.setCurrentItem(TaizePagerAdapter.DAILYMEDITATION_TODAY); + viewPager.setCurrentItem(TaizePagerAdapter.DAILYMEDITATION_TODAY, false); break; case 2: - viewPager.setCurrentItem(TaizePagerAdapter.PODCAST_TODAY); + viewPager.setCurrentItem(TaizePagerAdapter.PODCAST_TODAY, false); + viewPager.setPagingEnabled(false); + break; } } @Override public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { + switch (tab.getPosition()) { + case 2: + viewPager.setPagingEnabled(true); + break; + } } @Override @@ -67,7 +79,7 @@ public class MainActivity extends ActionBarActivity { actionBar.addTab(actionBar.newTab().setText("Reading").setIcon(R.drawable.ic_action_reading).setTabListener(tabListener)); actionBar.addTab(actionBar.newTab().setText("Meditation").setIcon(R.drawable.ic_action_meditation).setTabListener(tabListener)); - //actionBar.addTab(actionBar.newTab().setText("Podcast").setIcon(R.drawable.ic_action_podcast).setTabListener(tabListener)); + actionBar.addTab(actionBar.newTab().setText("Podcast").setIcon(R.drawable.ic_action_podcast).setTabListener(tabListener)); } @Override @@ -126,8 +138,8 @@ public class MainActivity extends ActionBarActivity { public static final int DAILYREADING_PAST_LIMIT = 100, DAILYREADING_TODAY = 200, DAILYREADING_FUTURE_LIMIT = 299; public static final int DAILYMEDITATION_PAST_LIMIT = 300, DAILYMEDITATION_TODAY = 400, DAILYMEDITATION_FUTURE_LIMIT = 499; - public static final int PODCAST_PAST_LIMIT = 500, PODCAST_TODAY = 600, PODCAST_FUTURE_LIMIT = 699; - public static final int COUNT = 700; + public static final int PODCAST_PAST_LIMIT = 500, PODCAST_TODAY = 500, PODCAST_FUTURE_LIMIT = 500; + public static final int COUNT = 501; public TaizePagerAdapter(FragmentManager fm) { super(fm); @@ -149,7 +161,7 @@ public class MainActivity extends ActionBarActivity { args.putInt("dateOffset", i - DAILYMEDITATION_TODAY); fragment.setArguments(args); } else if (i >= PODCAST_PAST_LIMIT && i <= PODCAST_FUTURE_LIMIT) { - return getItem(DAILYREADING_TODAY); + fragment = new PodcastFragment(); } return fragment; |