Merge pull request #1561 from mfietz/redesign_audio_player

Audio player redesign (Part 2)

2 files changed, 198 insertions, 199 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java
deleted file mode 100644
index cf0532cf1..000000000
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChapterListAdapter.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package de.danoeh.antennapod.adapter;
-
-import android.content.Context;
-import android.text.Layout;
-import android.text.Selection;
-import android.text.Spannable;
-import android.text.Spanned;
-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.ImageButton;
-import android.widget.TextView;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.feed.Chapter;
-import de.danoeh.antennapod.core.util.ChapterUtils;
-import de.danoeh.antennapod.core.util.Converter;
-import de.danoeh.antennapod.core.util.playback.Playable;
-
-import java.util.List;
-
-public class ChapterListAdapter extends ArrayAdapter<Chapter> {
-
-	private static final String TAG = "ChapterListAdapter";
-
-	private List<Chapter> chapters;
-	private Playable media;
-	
-	private int defaultTextColor;
-    private final Callback callback;
-
-	public ChapterListAdapter(Context context, int textViewResourceId,
-			List<Chapter> objects, Playable media, Callback callback) {
-		super(context, textViewResourceId, objects);
-		this.chapters = objects;
-		this.media = media;
-        this.callback = callback;
-	}
-
-	@Override
-	public View getView(final int position, View convertView, ViewGroup parent) {
-		Holder holder;
-
-		Chapter sc = getItem(position);
-
-		// Inflate Layout
-		if (convertView == null) {
-			holder = new Holder();
-			LayoutInflater inflater = (LayoutInflater) getContext()
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-			convertView = inflater.inflate(R.layout.simplechapter_item, parent, false);
-			holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-			defaultTextColor = holder.title.getTextColors().getDefaultColor();
-			holder.start = (TextView) convertView.findViewById(R.id.txtvStart);
-			holder.link = (TextView) convertView.findViewById(R.id.txtvLink);
-            holder.butPlayChapter = (ImageButton) convertView.findViewById(R.id.butPlayChapter);
-			convertView.setTag(holder);
-		} else {
-			holder = (Holder) convertView.getTag();
-
-		}
-
-		holder.title.setText(sc.getTitle());
-		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) {
-				// from
-				// http://stackoverflow.com/questions/7236840/android-textview-linkify-intercepts-with-parent-view-gestures
-				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;
-
-			}
-		});
-        holder.butPlayChapter.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (callback != null) {
-                    callback.onPlayChapterButtonClicked(position);
-                }
-            }
-        });
-		Chapter current = ChapterUtils.getCurrentChapter(media);
-		if (current != null) {
-			if (current == sc) {
-				holder.title.setTextColor(convertView.getResources().getColor(
-						R.color.holo_blue_light));
-                holder.start.setTextColor(convertView.getResources().getColor(
-                        R.color.holo_blue_light));
-			} else {
-				holder.title.setTextColor(defaultTextColor);
-                holder.start.setTextColor(defaultTextColor);
-			}
-		} else {
-			Log.w(TAG, "Could not find out what the current chapter is.");
-		}
-
-		return convertView;
-	}
-
-	static class Holder {
-		TextView title;
-		TextView start;
-		TextView link;
-        ImageButton butPlayChapter;
-	}
-
-	@Override
-	public int getCount() {
-		// ignore invalid chapters
-		int counter = 0;
-		if (chapters != null) {
-			for (Chapter chapter : chapters) {
-				if (!ignoreChapter(chapter)) {
-					counter++;
-				}
-			}
-		}
-		return counter;
-	}
-
-	private boolean ignoreChapter(Chapter c) {
-		return media.getDuration() > 0 && media.getDuration() < c.getStart();
-	}
-
-	@Override
-	public Chapter getItem(int position) {
-		int i = 0;
-		for (Chapter chapter : chapters) {
-			if (!ignoreChapter(chapter)) {
-				if (i == position) {
-					return chapter;
-				} else {
-					i++;
-				}
-			}
-		}
-		return super.getItem(position);
-	}
-
-    public static interface Callback {
-        public void onPlayChapterButtonClicked(int position);
-    }
-
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
new file mode 100644
index 000000000..1c9439ee6
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -0,0 +1,198 @@
+package de.danoeh.antennapod.adapter;
+
+import android.content.Context;
+import android.text.Layout;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.Spanned;
+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.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageButton;
+import android.widget.TextView;
+
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+import de.danoeh.antennapod.core.util.ChapterUtils;
+import de.danoeh.antennapod.core.util.Converter;
+import de.danoeh.antennapod.core.util.playback.Playable;
+
+public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
+
+    private static final String TAG = "ChapterListAdapter";
+
+    private Playable media;
+
+    private int defaultTextColor;
+    private final Callback callback;
+
+    public ChaptersListAdapter(Context context, int textViewResourceId, Callback callback) {
+        super(context, textViewResourceId);
+        this.callback = callback;
+    }
+
+    public void setMedia(Playable media) {
+        this.media = media;
+    }
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        Holder holder;
+
+        Chapter sc = getItem(position);
+
+        // Inflate Layout
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) getContext()
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            convertView = inflater.inflate(R.layout.simplechapter_item, parent, false);
+            holder.view = convertView;
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            defaultTextColor = holder.title.getTextColors().getDefaultColor();
+            holder.start = (TextView) convertView.findViewById(R.id.txtvStart);
+            holder.link = (TextView) convertView.findViewById(R.id.txtvLink);
+            holder.butPlayChapter = (ImageButton) convertView.findViewById(R.id.butPlayChapter);
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+
+        }
+
+        holder.title.setText(sc.getTitle());
+        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((v, event) -> {
+            // from
+            // http://stackoverflow.com/questions/7236840/android-textview-linkify-intercepts-with-parent-view-gestures
+            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;
+
+        });
+        holder.butPlayChapter.setOnClickListener(v -> {
+            if (callback != null) {
+                callback.onPlayChapterButtonClicked(position);
+            }
+        });
+        Chapter current = ChapterUtils.getCurrentChapter(media);
+        if (current != null) {
+            if (current == sc) {
+                int playingBackGroundColor;
+                if(UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark) {
+                    playingBackGroundColor = getContext().getResources().getColor(R.color.highlight_dark);
+                } else {
+                    playingBackGroundColor = getContext().getResources().getColor(R.color.highlight_light);
+                }
+                holder.view.setBackgroundColor(playingBackGroundColor);
+            } else {
+                holder.view.setBackgroundColor(getContext().getResources().getColor(android.R.color.transparent));
+                holder.title.setTextColor(defaultTextColor);
+                holder.start.setTextColor(defaultTextColor);
+            }
+        } else {
+            Log.w(TAG, "Could not find out what the current chapter is.");
+        }
+
+        return convertView;
+    }
+
+    static class Holder {
+        View view;
+        TextView title;
+        TextView start;
+        TextView link;
+        ImageButton butPlayChapter;
+    }
+
+    @Override
+    public int getCount() {
+        if(media == null || media.getChapters() == null) {
+            return 0;
+        }
+        // ignore invalid chapters
+        int counter = 0;
+        for (Chapter chapter : media.getChapters()) {
+            if (!ignoreChapter(chapter)) {
+                counter++;
+            }
+        }
+        return counter;
+    }
+
+    private boolean ignoreChapter(Chapter c) {
+        return media.getDuration() > 0 && media.getDuration() < c.getStart();
+    }
+
+    @Override
+    public Chapter getItem(int position) {
+        int i = 0;
+        for (Chapter chapter : media.getChapters()) {
+            if (!ignoreChapter(chapter)) {
+                if (i == position) {
+                    return chapter;
+                } else {
+                    i++;
+                }
+            }
+        }
+        return super.getItem(position);
+    }
+
+    public interface Callback {
+        void onPlayChapterButtonClicked(int position);
+    }
+
+}