summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/danoeh/antennapod')
-rw-r--r--src/de/danoeh/antennapod/activity/MediaplayerActivity.java14
-rw-r--r--src/de/danoeh/antennapod/adapter/SCListAdapter.java123
-rw-r--r--src/de/danoeh/antennapod/feed/FeedItem.java21
-rw-r--r--src/de/danoeh/antennapod/feed/FeedManager.java8
-rw-r--r--src/de/danoeh/antennapod/fragment/CoverFragment.java4
5 files changed, 149 insertions, 21 deletions
diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 1023fd8f7..1ce365c2a 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -28,6 +28,8 @@ import android.view.SurfaceHolder;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter;
import android.widget.ImageButton;
import android.widget.LinearLayout;
@@ -166,9 +168,8 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements
AlertDialog.Builder stDialog = new AlertDialog.Builder(this);
stDialog.setTitle(R.string.sleep_timer_label);
stDialog.setMessage(getString(R.string.time_left_label)
- + Converter
- .getDurationStringLong((int) playbackService
- .getSleepTimerTimeLeft()));
+ + Converter.getDurationStringLong((int) playbackService
+ .getSleepTimerTimeLeft()));
stDialog.setPositiveButton(R.string.disable_sleeptimer_label,
new DialogInterface.OnClickListener() {
@@ -367,9 +368,11 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements
@Override
protected void onProgressUpdate(Void... v) {
super.onProgressUpdate();
+ int currentPosition = playbackService.getPlayer()
+ .getCurrentPosition();
+ media.setPosition(currentPosition);
txtvPosition.setText(Converter
- .getDurationStringLong(playbackService.getPlayer()
- .getCurrentPosition()));
+ .getDurationStringLong(currentPosition));
txtvLength.setText(Converter
.getDurationStringLong(playbackService.getPlayer()
.getDuration()));
@@ -788,6 +791,7 @@ public class MediaplayerActivity extends SherlockFragmentActivity implements
sCChapterFragment.setListAdapter(new SCListAdapter(
activity, 0, activity.media.getItem()
.getSimpleChapters()));
+
return sCChapterFragment;
default:
return CoverFragment.newInstance(null);
diff --git a/src/de/danoeh/antennapod/adapter/SCListAdapter.java b/src/de/danoeh/antennapod/adapter/SCListAdapter.java
index f0c9c0e93..0764735ab 100644
--- a/src/de/danoeh/antennapod/adapter/SCListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/SCListAdapter.java
@@ -12,10 +12,19 @@ import de.danoeh.antennapod.storage.DownloadRequester;
import de.danoeh.antennapod.util.Converter;
import android.content.Context;
import android.graphics.Color;
+import android.text.Layout;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.Spanned;
import android.text.format.DateUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.util.Linkify;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.MotionEvent;
import android.view.View;
+import android.view.View.OnTouchListener;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
@@ -45,32 +54,136 @@ public class SCListAdapter extends ArrayAdapter<SimpleChapter> {
convertView = inflater.inflate(R.layout.simplechapter_item, null);
holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
holder.start = (TextView) convertView.findViewById(R.id.txtvStart);
+ holder.link = (TextView) convertView.findViewById(R.id.txtvLink);
convertView.setTag(holder);
} else {
holder = (Holder) convertView.getTag();
}
-
+
holder.title.setText(sc.getTitle());
- holder.start.setText(Converter.getDurationStringLong((int) sc.getStart()));
-
+ holder.start.setText(Converter.getDurationStringLong((int) sc
+ .getStart()));
+ if (sc.getLink() != null) {
+ holder.link.setVisibility(View.VISIBLE);
+ holder.link.setText(sc.getLink());
+ Linkify.addLinks(holder.link, Linkify.WEB_URLS);
+ } else {
+ holder.link.setVisibility(View.GONE);
+ }
+ holder.link.setMovementMethod(null);
+ holder.link.setOnTouchListener(new OnTouchListener() {
+
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ TextView widget = (TextView) v;
+ Object text = widget.getText();
+ if (text instanceof Spanned) {
+ Spannable buffer = (Spannable) text;
+
+ int action = event.getAction();
+
+ if (action == MotionEvent.ACTION_UP
+ || action == MotionEvent.ACTION_DOWN) {
+ int x = (int) event.getX();
+ int y = (int) event.getY();
+
+ x -= widget.getTotalPaddingLeft();
+ y -= widget.getTotalPaddingTop();
+
+ x += widget.getScrollX();
+ y += widget.getScrollY();
+
+ Layout layout = widget.getLayout();
+ int line = layout.getLineForVertical(y);
+ int off = layout.getOffsetForHorizontal(line, x);
+
+ ClickableSpan[] link = buffer.getSpans(off, off,
+ ClickableSpan.class);
+
+ if (link.length != 0) {
+ if (action == MotionEvent.ACTION_UP) {
+ link[0].onClick(widget);
+ } else if (action == MotionEvent.ACTION_DOWN) {
+ Selection.setSelection(buffer,
+ buffer.getSpanStart(link[0]),
+ buffer.getSpanEnd(link[0]));
+ }
+ return true;
+ }
+ }
+
+ }
+
+ return false;
+
+ }
+ });
SimpleChapter current = sc.getItem().getCurrentChapter();
if (current != null) {
if (current == sc) {
- holder.title.setTextColor(convertView.getResources().getColor(R.color.bright_blue));
+ holder.title.setTextColor(convertView.getResources().getColor(
+ R.color.bright_blue));
} else {
holder.title.setTextColor(Color.parseColor("black"));
}
} else {
Log.w(TAG, "Could not find out what the current chapter is.");
}
-
+
return convertView;
}
static class Holder {
TextView title;
TextView start;
+ TextView link;
}
+ private LinkMovementMethod linkMovementMethod = new LinkMovementMethod() {
+
+ @Override
+ public boolean onTouchEvent(TextView widget, Spannable buffer,
+ MotionEvent event) {
+ Object text = widget.getText();
+ if (text instanceof Spanned) {
+ int action = event.getAction();
+
+ if (action == MotionEvent.ACTION_UP
+ || action == MotionEvent.ACTION_DOWN) {
+ int x = (int) event.getX();
+ int y = (int) event.getY();
+
+ x -= widget.getTotalPaddingLeft();
+ y -= widget.getTotalPaddingTop();
+
+ x += widget.getScrollX();
+ y += widget.getScrollY();
+
+ Layout layout = widget.getLayout();
+ int line = layout.getLineForVertical(y);
+ int off = layout.getOffsetForHorizontal(line, x);
+
+ ClickableSpan[] link = buffer.getSpans(off, off,
+ ClickableSpan.class);
+
+ if (link.length != 0) {
+ if (action == MotionEvent.ACTION_UP) {
+ link[0].onClick(widget);
+ } else if (action == MotionEvent.ACTION_DOWN) {
+ Selection.setSelection(buffer,
+ buffer.getSpanStart(link[0]),
+ buffer.getSpanEnd(link[0]));
+ }
+ return true;
+ }
+ }
+
+ }
+
+ return false;
+
+ }
+
+ };
}
diff --git a/src/de/danoeh/antennapod/feed/FeedItem.java b/src/de/danoeh/antennapod/feed/FeedItem.java
index 6b526ad35..075f58f45 100644
--- a/src/de/danoeh/antennapod/feed/FeedItem.java
+++ b/src/de/danoeh/antennapod/feed/FeedItem.java
@@ -38,18 +38,25 @@ public class FeedItem extends FeedComponent {
this.read = true;
}
- public SimpleChapter getCurrentChapter() {
+ /** Get the chapter that fits the position. */
+ public SimpleChapter getCurrentChapter(int position) {
+ SimpleChapter current = null;
if (simpleChapters != null) {
- SimpleChapter current = simpleChapters.get(0);
+ current = simpleChapters.get(0);
for (SimpleChapter sc : simpleChapters) {
- if (media.getPosition() > current.getStart() &&
- media.getPosition() <= sc.getStart()) {
- return current;
+ if (sc.getStart() > position) {
+ break;
+ } else {
+ current = sc;
}
- current = sc;
}
}
- return null;
+ return current;
+ }
+
+ /** Calls getCurrentChapter with current position. */
+ public SimpleChapter getCurrentChapter() {
+ return getCurrentChapter(media.getPosition());
}
public String getTitle() {
diff --git a/src/de/danoeh/antennapod/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java
index c5e97e4a0..c79a21037 100644
--- a/src/de/danoeh/antennapod/feed/FeedManager.java
+++ b/src/de/danoeh/antennapod/feed/FeedManager.java
@@ -505,9 +505,11 @@ public class FeedManager {
/** Get a Feed Item by its id and its feed */
public FeedItem getFeedItem(long id, Feed feed) {
- for (FeedItem item : feed.getItems()) {
- if (item.getId() == id) {
- return item;
+ if (feed != null) {
+ for (FeedItem item : feed.getItems()) {
+ if (item.getId() == id) {
+ return item;
+ }
}
}
Log.e(TAG, "Couldn't find FeedItem with id " + id);
diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java
index da0ebcced..08e09cea5 100644
--- a/src/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -53,7 +53,9 @@ public class CoverFragment extends SherlockFragment {
if (feedId != -1 && itemId != -1) {
Feed feed = manager.getFeed(feedId);
item = manager.getFeedItem(itemId, feed);
- media = item.getMedia();
+ if (item != null) {
+ media = item.getMedia();
+ }
} else {
Log.e(TAG, TAG + " was called with invalid arguments");
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 17:31:01 +0000