diff options
Diffstat (limited to 'app/src/main/java/com')
3 files changed, 33 insertions, 24 deletions
diff --git a/app/src/main/java/com/camilstaps/rss/RssParser.java b/app/src/main/java/com/camilstaps/rss/RssParser.java index 2c32abd..c93f652 100644 --- a/app/src/main/java/com/camilstaps/rss/RssParser.java +++ b/app/src/main/java/com/camilstaps/rss/RssParser.java @@ -92,13 +92,13 @@ public class RssParser extends DefaultHandler { @Override public void startDocument() throws SAXException { - Log.i("LOG", "StartDocument"); + Log.d("LOG", "StartDocument"); } @Override public void endDocument() throws SAXException { - Log.i("LOG", "EndDocument"); + Log.d("LOG", "EndDocument"); } diff --git a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java index e3b93e8..7d07746 100644 --- a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java +++ b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java @@ -29,6 +29,7 @@ public class DailyReadingFragment extends Fragment { private Date date; private String reading; private String bibleText; + private String reference; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -68,11 +69,11 @@ public class DailyReadingFragment extends Fragment { } public String getReading() { - return reading; + return reading + " (" + reference + ")"; } public String getBibleText() { - return bibleText; + return reference + ": " + bibleText; } protected void setupContent() { @@ -85,10 +86,11 @@ public class DailyReadingFragment extends Fragment { @Override public void success(DailyReading data) { ((TextView) rootView.findViewById(R.id.textDailyReading)).setText(data.getTextWithoutReference()); - reading = data.getString(); + reading = data.getTextWithoutReference(); BibleText bt = data.getBibleReference(); if (bt != null) { ((TextView) rootView.findViewById(R.id.refDailyReadingBibleText)).setText(bt.toString()); + reference = bt.toString(); } listener.success(data); } diff --git a/app/src/main/java/com/camilstaps/taize/MainActivity.java b/app/src/main/java/com/camilstaps/taize/MainActivity.java index 5ce8b5f..e740cfd 100644 --- a/app/src/main/java/com/camilstaps/taize/MainActivity.java +++ b/app/src/main/java/com/camilstaps/taize/MainActivity.java @@ -16,6 +16,7 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.ViewGroup; +import android.widget.PopupMenu; import com.camilstaps.common.Listener; @@ -40,7 +41,7 @@ public class MainActivity extends ActionBarActivity implements SwipeRefreshLayou pager = (ViewPager) findViewById(R.id.pager); pagerAdapter = new PagerAdapter(getSupportFragmentManager()); pager.setAdapter(pagerAdapter); - goToToday(); + pager.setCurrentItem(PagerAdapter.COUNT - PagerAdapter.LOOKAHEAD - 1, false); final ActionBar actionBar = getSupportActionBar(); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); @@ -81,14 +82,30 @@ public class MainActivity extends ActionBarActivity implements SwipeRefreshLayou startActivity(intent); return true; case R.id.action_share: - intent = new Intent(); - intent.setAction(Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_TEXT, ((DailyReadingFragment) pagerAdapter.instantiateItem(pager, pager.getCurrentItem())).getReading()); - intent.setType("text/plain"); - startActivity(intent); - return true; - case R.id.action_today: - goToToday(); + PopupMenu popup = new PopupMenu(this, findViewById(R.id.action_share)); + MenuInflater inflater = popup.getMenuInflater(); + inflater.inflate(R.menu.share_popup, popup.getMenu()); + + popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { + @Override + public boolean onMenuItemClick(MenuItem item) { + Intent intent = new Intent(); + intent.setAction(Intent.ACTION_SEND); + intent.setType("text/plain"); + switch (item.getItemId()) { + case R.id.action_share_bibletext: + intent.putExtra(Intent.EXTRA_TEXT, ((DailyReadingFragment) pagerAdapter.instantiateItem(pager, pager.getCurrentItem())).getBibleText()); + break; + case R.id.action_share_reading: + intent.putExtra(Intent.EXTRA_TEXT, ((DailyReadingFragment) pagerAdapter.instantiateItem(pager, pager.getCurrentItem())).getReading()); + break; + } + startActivity(intent); + return false; + } + }); + + popup.show(); return true; } @@ -140,12 +157,6 @@ public class MainActivity extends ActionBarActivity implements SwipeRefreshLayou } } - protected void goToToday() { - Log.d("MAIN", "Going to scroll from " + pager.getCurrentItem() + " to " + (PagerAdapter.COUNT - PagerAdapter.LOOKAHEAD - 1) + "..."); - pager.setCurrentItem(PagerAdapter.COUNT - PagerAdapter.LOOKAHEAD - 1, false); - - } - private class PagerAdapter extends FragmentStatePagerAdapter { public static final int COUNT = Integer.MAX_VALUE; public static final int LOOKAHEAD = 31; @@ -156,8 +167,6 @@ public class MainActivity extends ActionBarActivity implements SwipeRefreshLayou @Override public Fragment getItem(int i) { - Log.d("PA", "Get " + i); - Fragment fragment = new DailyReadingFragment(); Bundle args = new Bundle(); @@ -179,7 +188,6 @@ public class MainActivity extends ActionBarActivity implements SwipeRefreshLayou @Override public Object instantiateItem(ViewGroup container, int position) { - Log.d("PA", "Instantiate " + position); if (position < 2) { return super.instantiateItem(container, position); } else { @@ -189,7 +197,6 @@ public class MainActivity extends ActionBarActivity implements SwipeRefreshLayou @Override public void destroyItem(ViewGroup container, int position, Object object) { - Log.d("PA", "Destroy " + position); if (position < 2) { super.destroyItem(container, position, object); } else { |