aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/com/camilstaps/rss/RssParser.java4
-rw-r--r--app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java8
-rw-r--r--app/src/main/java/com/camilstaps/taize/MainActivity.java45
-rw-r--r--app/src/main/res/drawable-hdpi/ic_action_social_share.pngbin0 -> 676 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/ic_action_social_share.pngbin0 -> 402 bytes
-rw-r--r--app/src/main/res/drawable-xhdpi/ic_action_social_share.pngbin0 -> 904 bytes
-rw-r--r--app/src/main/res/drawable-xxhdpi/ic_action_social_share.pngbin0 -> 1308 bytes
-rw-r--r--app/src/main/res/layout/activity_main.xml1
-rw-r--r--app/src/main/res/menu/global.xml6
-rw-r--r--app/src/main/res/menu/share_popup.xml12
-rw-r--r--app/src/main/res/values/strings.xml2
11 files changed, 49 insertions, 29 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 {
diff --git a/app/src/main/res/drawable-hdpi/ic_action_social_share.png b/app/src/main/res/drawable-hdpi/ic_action_social_share.png
new file mode 100644
index 0000000..8feefd9
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_action_social_share.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_social_share.png b/app/src/main/res/drawable-mdpi/ic_action_social_share.png
new file mode 100644
index 0000000..840adad
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_action_social_share.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_social_share.png b/app/src/main/res/drawable-xhdpi/ic_action_social_share.png
new file mode 100644
index 0000000..98387ec
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_action_social_share.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_social_share.png b/app/src/main/res/drawable-xxhdpi/ic_action_social_share.png
new file mode 100644
index 0000000..37e8534
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_action_social_share.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d11f106..bb0f448 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,4 +9,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="0dp"/>
+
</android.support.v4.widget.SwipeRefreshLayout> \ No newline at end of file
diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml
index a2c2ee2..0b80db5 100644
--- a/app/src/main/res/menu/global.xml
+++ b/app/src/main/res/menu/global.xml
@@ -8,11 +8,7 @@
<item
android:id="@+id/action_share"
android:title="@string/action_share"
+ android:icon="@drawable/ic_action_social_share"
android:orderInCategory="50"
app:showAsAction="ifRoom"/>
- <item
- android:id="@+id/action_today"
- android:title="@string/action_today"
- android:orderInCategory="30"
- app:showAsAction="ifRoom"/>
</menu>
diff --git a/app/src/main/res/menu/share_popup.xml b/app/src/main/res/menu/share_popup.xml
new file mode 100644
index 0000000..6751a65
--- /dev/null
+++ b/app/src/main/res/menu/share_popup.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+ xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/action_share_reading"
+ android:title="@string/action_share_reading"/>
+ <item
+ android:id="@+id/action_share_bibletext"
+ android:title="@string/action_share_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 8d7d9c9..856aa2f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,8 @@
<string name="action_settings">Settings</string>
<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_today">Today</string>
<string name="title_activity_settings" translatable="false">@string/action_settings</string>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-15 12:28:56 +0000