diff options
Diffstat (limited to 'app/src')
9 files changed, 49 insertions, 30 deletions
diff --git a/app/src/main/java/com/camilstaps/common/DisablableViewPager.java b/app/src/main/java/com/camilstaps/common/DisablableViewPager.java index 1d39b0a..c2c033a 100644 --- a/app/src/main/java/com/camilstaps/common/DisablableViewPager.java +++ b/app/src/main/java/com/camilstaps/common/DisablableViewPager.java @@ -3,14 +3,16 @@ package com.camilstaps.common; import android.content.Context; import android.support.v4.view.ViewPager; import android.util.AttributeSet; +import android.util.Log; import android.view.MotionEvent; +import android.view.View; /** * Created by camilstaps on 15-4-15. */ public class DisablableViewPager extends ViewPager { - private boolean enabled = true; + private boolean pagingEnabled = true; public DisablableViewPager(Context context) { super(context); @@ -20,17 +22,36 @@ public class DisablableViewPager extends ViewPager { super(context, attrs); } - @Override + /*@Override public boolean onTouchEvent(MotionEvent event) { - return this.enabled && super.onTouchEvent(event); - } + int eventType = isRightSwipeTouchEvent(event); + Log.i("DVP", "Event: " + eventType); + switch (eventType) { + case SWIPE_LEFT: + if (pagingLeftEnabled) { + return super.onTouchEvent(event); + } else { + setCurrentItem(getCurrentItem()); + return false; + } + case SWIPE_RIGHT: + if (pagingRightEnabled) { + return super.onTouchEvent(event); + } else { + setCurrentItem(getCurrentItem()); + return false; + } + default: + return super.onTouchEvent(event); + } + }*/ @Override public boolean onInterceptTouchEvent(MotionEvent event) { - return this.enabled && super.onInterceptTouchEvent(event); + return pagingEnabled && super.onInterceptTouchEvent(event); } public void setPagingEnabled(boolean set) { - enabled = set; + pagingEnabled = set; } } diff --git a/app/src/main/java/com/camilstaps/taize/DailyMeditationFragment.java b/app/src/main/java/com/camilstaps/taize/DailyMeditationFragment.java index 4e1d4be..05d56d6 100644 --- a/app/src/main/java/com/camilstaps/taize/DailyMeditationFragment.java +++ b/app/src/main/java/com/camilstaps/taize/DailyMeditationFragment.java @@ -5,6 +5,7 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; +import android.text.Html; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -83,7 +84,7 @@ public class DailyMeditationFragment extends Fragment { Taize.getDailyMeditation(context, new Listener<DailyMeditation>() { @Override public void success(DailyMeditation data) { - ((TextView) rootView.findViewById(R.id.textDailyMeditation)).setText(data.getString()); + ((TextView) rootView.findViewById(R.id.textDailyMeditation)).setText(Html.fromHtml(data.getString())); listener.success(data); } diff --git a/app/src/main/java/com/camilstaps/taize/DailyReading.java b/app/src/main/java/com/camilstaps/taize/DailyReading.java index 151f7e3..b4ce568 100644 --- a/app/src/main/java/com/camilstaps/taize/DailyReading.java +++ b/app/src/main/java/com/camilstaps/taize/DailyReading.java @@ -43,7 +43,7 @@ public class DailyReading extends DatedString { } private Matcher referenceMatcher() { - Pattern bible_ref = Pattern.compile("\\((\\d? ?[a-zA-Z]+) (\\d{1,2})(?::|,)?(\\d+)?-?(\\d+?)?\\)"); + Pattern bible_ref = Pattern.compile("\\((\\d? ?[a-zA-Z]+) (\\d{1,3})(?::|,)?(\\d+)?-?(\\d+?)?\\)"); return bible_ref.matcher(string); } diff --git a/app/src/main/java/com/camilstaps/taize/MainActivity.java b/app/src/main/java/com/camilstaps/taize/MainActivity.java index 3478569..c82c40d 100644 --- a/app/src/main/java/com/camilstaps/taize/MainActivity.java +++ b/app/src/main/java/com/camilstaps/taize/MainActivity.java @@ -40,12 +40,11 @@ public class MainActivity extends ActionBarActivity { pagerAdapter = new TaizePagerAdapter(getSupportFragmentManager()); viewPager = (DisablableViewPager) findViewById(R.id.pager); viewPager.setAdapter(pagerAdapter); + viewPager.setOffscreenPageLimit(3); final ActionBar actionBar = getSupportActionBar(); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); - PreferenceManager.getDefaultSharedPreferences(this).edit().remove("dailyreadingbibletexts").apply(); - tabListener = new ActionBar.TabListener() { @Override public void onTabSelected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { @@ -58,7 +57,6 @@ public class MainActivity extends ActionBarActivity { break; case 2: viewPager.setCurrentItem(TaizePagerAdapter.PODCAST_TODAY, false); - viewPager.setPagingEnabled(false); break; } } @@ -83,10 +81,6 @@ public class MainActivity extends ActionBarActivity { } @Override - public void onRestoreInstanceState(Bundle savedInstanceState) { - } - - @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.global, menu); @@ -150,6 +144,8 @@ public class MainActivity extends ActionBarActivity { Fragment fragment = null; + viewPager.setPagingEnabled(true); + if (i >= DAILYREADING_PAST_LIMIT && i <= DAILYREADING_FUTURE_LIMIT) { fragment = new DailyReadingFragment(); Bundle args = new Bundle(); @@ -161,6 +157,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) { + viewPager.setPagingEnabled(false); fragment = new PodcastFragment(); } diff --git a/app/src/main/res/layout/pager_content_dailymeditation.xml b/app/src/main/res/layout/pager_content_dailymeditation.xml index 2d096f0..234819b 100644 --- a/app/src/main/res/layout/pager_content_dailymeditation.xml +++ b/app/src/main/res/layout/pager_content_dailymeditation.xml @@ -31,8 +31,7 @@ android:text="Daily Meditation" android:id="@+id/textDailyMeditation" android:layout_gravity="left|top" - android:layout_marginBottom="10dp" - android:textIsSelectable="true"/> + android:layout_marginBottom="10dp"/> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/pager_content_dailyreading.xml b/app/src/main/res/layout/pager_content_dailyreading.xml index 2297baa..28fca31 100644 --- a/app/src/main/res/layout/pager_content_dailyreading.xml +++ b/app/src/main/res/layout/pager_content_dailyreading.xml @@ -31,8 +31,7 @@ android:text="Daily Reading" android:id="@+id/textDailyReading" android:layout_gravity="left|top" - android:layout_marginBottom="10dp" - android:textIsSelectable="true"/> + android:layout_marginBottom="10dp"/> <TextView android:layout_width="wrap_content" @@ -48,8 +47,7 @@ android:layout_height="wrap_content" android:text="Daily Reading Bible text" android:id="@+id/textDailyReadingBibleText" - android:layout_gravity="left|top" - android:textIsSelectable="true"/> + android:layout_gravity="left|top"/> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/pager_content_podcast_item.xml b/app/src/main/res/layout/pager_content_podcast_item.xml index 22e45d0..90e150a 100644 --- a/app/src/main/res/layout/pager_content_podcast_item.xml +++ b/app/src/main/res/layout/pager_content_podcast_item.xml @@ -2,12 +2,14 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical" + android:padding="@dimen/podcast_row_padding"> <TextView android:id="@+id/podcast_date" android:layout_width="wrap_content" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" + android:textSize="@dimen/large_text_size"/> <TextView android:id="@+id/podcast_title" diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml index 63fc816..314b03e 100644 --- a/app/src/main/res/values-w820dp/dimens.xml +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -1,6 +1,6 @@ <resources> - <!-- Example customization of dimensions originally defined in res/values/dimens.xml - (such as screen margins) for screens with more than 820dp of available width. This - would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). --> - <dimen name="activity_horizontal_margin">64dp</dimen> + + <dimen name="podcast_row_padding">20dp</dimen> + <dimen name="large_text_size">32sp</dimen> + </resources> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 47c8224..8486494 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,5 +1,6 @@ <resources> - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> - <dimen name="activity_vertical_margin">16dp</dimen> + + <dimen name="podcast_row_padding">10dp</dimen> + <dimen name="large_text_size">18sp</dimen> + </resources> |