diff --git a/res/drawable-hdpi/navigation_chapters.png b/res/drawable-hdpi/navigation_chapters.png new file mode 100755 index 000000000..b034459bc Binary files /dev/null and b/res/drawable-hdpi/navigation_chapters.png differ diff --git a/res/drawable-hdpi/navigation_chapters_dark.png b/res/drawable-hdpi/navigation_chapters_dark.png new file mode 100755 index 000000000..7b0d4889c Binary files /dev/null and b/res/drawable-hdpi/navigation_chapters_dark.png differ diff --git a/res/drawable-hdpi/navigation_shownotes.png b/res/drawable-hdpi/navigation_shownotes.png new file mode 100755 index 000000000..c5f6c97b2 Binary files /dev/null and b/res/drawable-hdpi/navigation_shownotes.png differ diff --git a/res/drawable-hdpi/navigation_shownotes_dark.png b/res/drawable-hdpi/navigation_shownotes_dark.png new file mode 100755 index 000000000..e45ea1fd9 Binary files /dev/null and b/res/drawable-hdpi/navigation_shownotes_dark.png differ diff --git a/res/drawable-mdpi/navigation_chapters.png b/res/drawable-mdpi/navigation_chapters.png new file mode 100755 index 000000000..b1884726c Binary files /dev/null and b/res/drawable-mdpi/navigation_chapters.png differ diff --git a/res/drawable-mdpi/navigation_chapters_dark.png b/res/drawable-mdpi/navigation_chapters_dark.png new file mode 100755 index 000000000..1042294e4 Binary files /dev/null and b/res/drawable-mdpi/navigation_chapters_dark.png differ diff --git a/res/drawable-mdpi/navigation_shownotes.png b/res/drawable-mdpi/navigation_shownotes.png new file mode 100755 index 000000000..ec6a2bf8f Binary files /dev/null and b/res/drawable-mdpi/navigation_shownotes.png differ diff --git a/res/drawable-mdpi/navigation_shownotes_dark.png b/res/drawable-mdpi/navigation_shownotes_dark.png new file mode 100755 index 000000000..9c748b0b5 Binary files /dev/null and b/res/drawable-mdpi/navigation_shownotes_dark.png differ diff --git a/res/drawable-xhdpi/navigation_chapters.png b/res/drawable-xhdpi/navigation_chapters.png new file mode 100755 index 000000000..d527454c6 Binary files /dev/null and b/res/drawable-xhdpi/navigation_chapters.png differ diff --git a/res/drawable-xhdpi/navigation_chapters_dark.png b/res/drawable-xhdpi/navigation_chapters_dark.png new file mode 100755 index 000000000..e53d5eb16 Binary files /dev/null and b/res/drawable-xhdpi/navigation_chapters_dark.png differ diff --git a/res/drawable-xhdpi/navigation_shownotes.png b/res/drawable-xhdpi/navigation_shownotes.png new file mode 100755 index 000000000..a0a156a94 Binary files /dev/null and b/res/drawable-xhdpi/navigation_shownotes.png differ diff --git a/res/drawable-xhdpi/navigation_shownotes_dark.png b/res/drawable-xhdpi/navigation_shownotes_dark.png new file mode 100755 index 000000000..95708234a Binary files /dev/null and b/res/drawable-xhdpi/navigation_shownotes_dark.png differ diff --git a/res/layout/mediaplayer_activity.xml b/res/layout/mediaplayer_activity.xml index 4ed699e85..34788216b 100644 --- a/res/layout/mediaplayer_activity.xml +++ b/res/layout/mediaplayer_activity.xml @@ -17,6 +17,7 @@ android:layout_height="match_parent" android:layout_alignParentLeft="true" android:background="?attr/borderless_button" + android:padding="4dp" android:src="?attr/default_cover" /> + + diff --git a/res/values/styles.xml b/res/values/styles.xml index 3878031a8..e79979e48 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -23,6 +23,8 @@ @drawable/navigation_collapse @drawable/navigation_refresh @drawable/navigation_up + @drawable/navigation_shownotes + @drawable/navigation_chapters @drawable/social_share @drawable/stat_playlist @drawable/type_audio @@ -71,6 +73,8 @@ @drawable/navigation_collapse_dark @drawable/navigation_refresh_dark @drawable/navigation_up_dark + @drawable/navigation_shownotes_dark + @drawable/navigation_chapters_dark @drawable/social_share_dark @drawable/stat_playlist_dark @drawable/type_audio_dark diff --git a/src/de/danoeh/antennapod/PodcastApp.java b/src/de/danoeh/antennapod/PodcastApp.java index 58dbf2a23..c5dbc4fd8 100644 --- a/src/de/danoeh/antennapod/PodcastApp.java +++ b/src/de/danoeh/antennapod/PodcastApp.java @@ -11,7 +11,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; -import android.preference.PreferenceActivity; import android.preference.PreferenceManager; import android.util.Log; import de.danoeh.antennapod.activity.OpmlImportActivity; diff --git a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java index 33521ad65..f2feb66c6 100644 --- a/src/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/src/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -1,26 +1,24 @@ package de.danoeh.antennapod.activity; import android.content.Intent; +import android.content.res.TypedArray; import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.app.FragmentTransaction; -import android.support.v4.view.ViewPager; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.ArrayAdapter; import android.widget.ImageButton; +import android.widget.ImageView.ScaleType; import android.widget.ListView; import android.widget.TextView; -import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockListFragment; -import com.viewpagerindicator.TabPageIndicator; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.ChapterListAdapter; +import de.danoeh.antennapod.asynctask.FeedImageLoader; import de.danoeh.antennapod.feed.Chapter; import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.feed.SimpleChapter; @@ -44,8 +42,6 @@ public class AudioplayerActivity extends MediaplayerActivity { private SherlockListFragment chapterFragment; private Fragment currentlyShownFragment; - /** Fragment that was shown before the chapter fragment was displayed. */ - private int leftFragmentPosition = -1; private int currentlyShownPosition = -1; private TextView txtvTitle; @@ -57,7 +53,7 @@ public class AudioplayerActivity extends MediaplayerActivity { super(); detachedFragments = new Fragment[NUM_CONTENT_FRAGMENTS]; } - + private void resetFragmentView() { currentlyShownFragment = null; coverFragment = null; @@ -155,11 +151,53 @@ public class AudioplayerActivity extends MediaplayerActivity { } ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN); ft.commit(); + updateNavButtonDrawable(); } } } } + private void updateNavButtonDrawable() { + TypedArray drawables = obtainStyledAttributes(new int[] { + R.attr.navigation_shownotes, R.attr.navigation_chapters }); + final FeedMedia media = controller.getMedia(); + if (butNavLeft != null && butNavRight != null && media != null) { + switch (currentlyShownPosition) { + case POS_COVER: + butNavLeft.setScaleType(ScaleType.CENTER); + butNavLeft.setImageDrawable(drawables.getDrawable(0)); + butNavRight.setImageDrawable(drawables.getDrawable(1)); + break; + case POS_DESCR: + butNavLeft.setScaleType(ScaleType.CENTER_CROP); + butNavLeft.post(new Runnable() { + + @Override + public void run() { + FeedImageLoader.getInstance().loadThumbnailBitmap( + media.getItem().getFeed().getImage(), + butNavLeft); + } + }); + butNavRight.setImageDrawable(drawables.getDrawable(1)); + break; + case POS_CHAPTERS: + butNavLeft.setScaleType(ScaleType.CENTER_CROP); + butNavLeft.post(new Runnable() { + + @Override + public void run() { + FeedImageLoader.getInstance().loadThumbnailBitmap( + media.getItem().getFeed().getImage(), + butNavLeft); + } + }); + butNavRight.setImageDrawable(drawables.getDrawable(0)); + break; + } + } + } + @Override protected void setupGUI() { super.setupGUI(); @@ -176,27 +214,25 @@ public class AudioplayerActivity extends MediaplayerActivity { if (currentlyShownFragment == null || currentlyShownPosition == POS_DESCR) { switchToFragment(POS_COVER); - } else if (currentlyShownPosition == POS_COVER){ + } else if (currentlyShownPosition == POS_COVER) { switchToFragment(POS_DESCR); } else if (currentlyShownPosition == POS_CHAPTERS) { - switchToFragment(leftFragmentPosition); - leftFragmentPosition = -1; + switchToFragment(POS_COVER); } } }); - + butNavRight.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { if (currentlyShownPosition == POS_CHAPTERS) { - switchToFragment(leftFragmentPosition); - leftFragmentPosition = -1; + switchToFragment(POS_DESCR); } else { - leftFragmentPosition = currentlyShownPosition; switchToFragment(POS_CHAPTERS); } - }}); + } + }); } @Override diff --git a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java b/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java index b93620b05..6e1163508 100644 --- a/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java +++ b/src/de/danoeh/antennapod/activity/DirectoryChooserActivity.java @@ -5,11 +5,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import org.apache.commons.io.FileUtils; - import android.app.Activity; import android.app.AlertDialog; -import android.app.AlertDialog.Builder; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; diff --git a/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java b/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java index 13d5da1cc..05d346bb4 100644 --- a/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java +++ b/src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java @@ -6,7 +6,6 @@ import android.annotation.SuppressLint; import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.View; diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java index 8b3f87179..fa0c42b37 100644 --- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java +++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java @@ -2,15 +2,12 @@ package de.danoeh.antennapod.activity; import java.io.File; -import android.app.Activity; import android.content.Intent; -import android.content.SharedPreferences; import android.content.res.Resources.Theme; import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; -import android.preference.PreferenceManager; import android.util.Log; import com.actionbarsherlock.app.SherlockPreferenceActivity; diff --git a/src/de/danoeh/antennapod/adapter/AbstractFeedItemlistAdapter.java b/src/de/danoeh/antennapod/adapter/AbstractFeedItemlistAdapter.java index c1535c819..5c720d652 100644 --- a/src/de/danoeh/antennapod/adapter/AbstractFeedItemlistAdapter.java +++ b/src/de/danoeh/antennapod/adapter/AbstractFeedItemlistAdapter.java @@ -2,11 +2,11 @@ package de.danoeh.antennapod.adapter; import java.util.List; +import android.content.Context; +import android.widget.ArrayAdapter; import de.danoeh.antennapod.PodcastApp; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.util.EpisodeFilter; -import android.content.Context; -import android.widget.ArrayAdapter; public abstract class AbstractFeedItemlistAdapter extends ArrayAdapter { diff --git a/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java b/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java index b10d3181d..145ca4230 100644 --- a/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java +++ b/src/de/danoeh/antennapod/adapter/ChapterListAdapter.java @@ -3,7 +3,6 @@ package de.danoeh.antennapod.adapter; import java.util.List; import android.content.Context; -import android.graphics.Color; import android.text.Layout; import android.text.Selection; import android.text.Spannable; diff --git a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java index c319c518e..3ca63e97f 100644 --- a/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java +++ b/src/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java @@ -7,28 +7,20 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Typeface; import android.text.format.DateUtils; -import android.util.Log; -import android.view.ContextMenu; import android.view.LayoutInflater; -import android.view.MenuInflater; import android.view.View; -import android.view.ContextMenu.ContextMenuInfo; import android.view.View.OnClickListener; -import android.view.View.OnCreateContextMenuListener; import android.view.ViewGroup; import android.widget.Adapter; -import android.widget.ArrayAdapter; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; -import de.danoeh.antennapod.PodcastApp; import de.danoeh.antennapod.R; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.feed.MediaType; import de.danoeh.antennapod.storage.DownloadRequester; import de.danoeh.antennapod.util.Converter; -import de.danoeh.antennapod.util.EpisodeFilter; import de.danoeh.antennapod.util.ThemeUtils; public class FeedItemlistAdapter extends AbstractFeedItemlistAdapter { diff --git a/src/de/danoeh/antennapod/fragment/CoverFragment.java b/src/de/danoeh/antennapod/fragment/CoverFragment.java index 0c3398edf..f1fde24d8 100644 --- a/src/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/src/de/danoeh/antennapod/fragment/CoverFragment.java @@ -1,13 +1,11 @@ package de.danoeh.antennapod.fragment; import android.os.Bundle; -import android.provider.MediaStore.Audio.AudioColumns; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.TextView; import com.actionbarsherlock.app.SherlockFragment; diff --git a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java index c46bb6c90..387823348 100644 --- a/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java +++ b/src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java @@ -5,12 +5,10 @@ import org.apache.commons.lang3.StringEscapeUtils; import android.annotation.SuppressLint; import android.app.Activity; import android.content.res.TypedArray; -import android.database.Cursor; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.util.Log; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java index 2a4b47112..cdccdc338 100644 --- a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java +++ b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java @@ -9,22 +9,14 @@ import android.content.IntentFilter; import android.os.Bundle; import android.util.Log; import android.view.ContextMenu; +import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.View; -import android.view.ContextMenu.ContextMenuInfo; -import android.view.View.OnClickListener; -import android.view.View.OnCreateContextMenuListener; -import android.view.View.OnLongClickListener; import android.view.ViewGroup; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemLongClickListener; import android.widget.ListView; import com.actionbarsherlock.app.SherlockListFragment; -import com.actionbarsherlock.view.ActionMode; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; diff --git a/src/de/danoeh/antennapod/service/download/Downloader.java b/src/de/danoeh/antennapod/service/download/Downloader.java index 70727879a..9ed9d9a76 100644 --- a/src/de/danoeh/antennapod/service/download/Downloader.java +++ b/src/de/danoeh/antennapod/service/download/Downloader.java @@ -1,6 +1,5 @@ package de.danoeh.antennapod.service.download; -import android.os.Handler; import de.danoeh.antennapod.R; import de.danoeh.antennapod.asynctask.DownloadStatus; diff --git a/src/de/danoeh/antennapod/syndication/namespace/NSMedia.java b/src/de/danoeh/antennapod/syndication/namespace/NSMedia.java index e480a0266..053a81270 100644 --- a/src/de/danoeh/antennapod/syndication/namespace/NSMedia.java +++ b/src/de/danoeh/antennapod/syndication/namespace/NSMedia.java @@ -5,7 +5,6 @@ import java.util.concurrent.TimeUnit; import org.xml.sax.Attributes; import android.util.Log; - import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.feed.FeedMedia; import de.danoeh.antennapod.syndication.handler.HandlerState; diff --git a/src/de/danoeh/antennapod/util/StorageUtils.java b/src/de/danoeh/antennapod/util/StorageUtils.java index ec398b810..cc0ba7136 100644 --- a/src/de/danoeh/antennapod/util/StorageUtils.java +++ b/src/de/danoeh/antennapod/util/StorageUtils.java @@ -5,7 +5,6 @@ import java.io.File; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.os.Environment; import android.os.StatFs; import android.util.Log; import de.danoeh.antennapod.AppConfig; diff --git a/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java b/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java index 515359730..dff6d77e8 100644 --- a/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java +++ b/src/de/danoeh/antennapod/util/id3reader/ID3Reader.java @@ -2,7 +2,6 @@ package de.danoeh.antennapod.util.id3reader; import java.io.IOException; import java.io.InputStream; -import java.io.PushbackInputStream; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java index 389814815..9cdf8eec2 100644 --- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java +++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java @@ -3,16 +3,9 @@ package de.danoeh.antennapod.util.menuhandler; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.os.Debug; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; - -import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.asynctask.FlattrClickWorker; import de.danoeh.antennapod.feed.FeedItem; -import de.danoeh.antennapod.feed.FeedItem.State; import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.storage.DownloadRequestException; import de.danoeh.antennapod.storage.DownloadRequester;