Organized imports, added drawables to navigation buttons

4 files changed, 52 insertions, 23 deletions

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;