diff options
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java | 50 | ||||
| -rw-r--r-- | app/src/main/res/menu/share_popup_reading.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
3 files changed, 30 insertions, 24 deletions
diff --git a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java index dd06f69..4daefbd 100644 --- a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java +++ b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java @@ -5,7 +5,6 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,11 +13,11 @@ import android.widget.TextView; import com.camilstaps.common.Date; import com.camilstaps.common.Listener; -import com.camilstaps.common.NullListener; import com.camilstaps.common.Sharable; /** - * Created by camilstaps on 8-4-15. + * Fragment for displaying one daily reading + * @author Camil Staps */ public class DailyReadingFragment extends Fragment implements Sharable { @@ -46,19 +45,6 @@ public class DailyReadingFragment extends Fragment implements Sharable { setupContent(); - onScrollChangedListener = new ViewTreeObserver.OnScrollChangedListener() { - @Override - public void onScrollChanged() { - /*Log.d("DRF", "Scrolling to (" + rootView.getScrollX() + "," + rootView.getScrollY() + ")"); - if (rootView.getScrollY() > 0) { - ((MainActivity) context).swipeRefreshLayout.setEnabled(false); - } else { - ((MainActivity) context).swipeRefreshLayout.setEnabled(true); - }*/ - } - }; - rootView.findViewById(R.id.pager_content).getViewTreeObserver().addOnScrollChangedListener(onScrollChangedListener); - return rootView; } @@ -80,12 +66,18 @@ public class DailyReadingFragment extends Fragment implements Sharable { PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); } + /** + * Setup all content of the Fragment + */ protected void setupContent() { - setDailyReading(new NullListener<DailyReading>()); - setDailyReadingBibleText(new NullListener<String>()); + setDailyReading(); + setDailyReadingBibleText(); } - public void setDailyReading(final Listener<DailyReading> listener) { + /** + * Set the daily reading + */ + public void setDailyReading() { Taize.getDailyReading(context, new Listener<DailyReading>() { @Override public void success(DailyReading data) { @@ -96,13 +88,11 @@ public class DailyReadingFragment extends Fragment implements Sharable { ((TextView) rootView.findViewById(R.id.refDailyReadingBibleText)).setText(bt.toString()); reference = bt.toString(); } - listener.success(data); } @Override public void failure() { ((TextView) rootView.findViewById(R.id.textDailyReading)).setText("No reading found."); - listener.failure(); } }, date); @@ -111,34 +101,46 @@ public class DailyReadingFragment extends Fragment implements Sharable { ((TextView) rootView.findViewById(R.id.dateDailyReading)).setText(niceDate); } - public void setDailyReadingBibleText(final Listener<String> listener) { + /** + * Set the Bible text + */ + public void setDailyReadingBibleText() { Taize.getDailyReadingBibleText(context, new Listener<String>() { @Override public void success(String data) { ((TextView) rootView.findViewById(R.id.textDailyReadingBibleText)).setText(data); bibleText = data; - listener.success(data); } @Override public void failure() { ((TextView) rootView.findViewById(R.id.textDailyReadingBibleText)).setText("No bible text found."); - listener.failure(); } }, date); } + /** + * The user can choose to share the reading, the Bible text or both + * @param id the XML id the resource is linked to + * @return + */ @Override public Object getItem(int id) { switch (id) { case R.id.action_share_bibletext: return reference + ": " + bibleText; + case R.id.action_share_reading_with_bibletext: + return reading + "\n\n" + reference + ": " + bibleText; case R.id.action_share_reading: default: return reading + " (" + reference + ")"; } } + /** + * The user can choose to share the reading, the Bible text or both + * @return + */ @Override public int getMenuId() { return R.menu.share_popup_reading; diff --git a/app/src/main/res/menu/share_popup_reading.xml b/app/src/main/res/menu/share_popup_reading.xml index 6751a65..6e17004 100644 --- a/app/src/main/res/menu/share_popup_reading.xml +++ b/app/src/main/res/menu/share_popup_reading.xml @@ -8,5 +8,8 @@ <item android:id="@+id/action_share_bibletext" android:title="@string/action_share_bibletext"/> + <item + android:id="@+id/action_share_reading_with_bibletext" + android:title="@string/action_share_reading_with_bibletext"/> </menu>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4324ff7..68af279 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,7 @@ <string name="action_share">Share</string> <string name="action_share_reading">Share reading</string> <string name="action_share_bibletext">Share bible text</string> + <string name="action_share_reading_with_bibletext">Share both</string> <string name="action_today">Today</string> <string name="title_activity_settings" translatable="false">@string/action_settings</string> |