From 2e9bd1f07e35dd08358f5f7d2ff7a8fef462a79f Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Wed, 5 Sep 2012 17:20:57 +0200
Subject: Added player fragment to main activity

---
 src/de/danoeh/antennapod/activity/MainActivity.java      |  9 +++++++++
 .../antennapod/fragment/ExternalPlayerFragment.java      | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java
index 31907dde3..4c9b58003 100644
--- a/src/de/danoeh/antennapod/activity/MainActivity.java
+++ b/src/de/danoeh/antennapod/activity/MainActivity.java
@@ -7,6 +7,7 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.Log;
@@ -20,6 +21,7 @@ import com.viewpagerindicator.TabPageIndicator;
 
 import de.danoeh.antennapod.asynctask.OpmlExportWorker;
 import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.fragment.ExternalPlayerFragment;
 import de.danoeh.antennapod.fragment.FeedlistFragment;
 import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.UnreadItemlistFragment;
@@ -38,6 +40,7 @@ public class MainActivity extends SherlockFragmentActivity {
 	private ViewPager viewpager;
 	private MainPagerAdapter pagerAdapter;
 	private TabPageIndicator tabs;
+	private ExternalPlayerFragment externalPlayerFragment;
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -53,6 +56,12 @@ public class MainActivity extends SherlockFragmentActivity {
 
 		viewpager.setAdapter(pagerAdapter);
 		tabs.setViewPager(viewpager);
+
+		FragmentTransaction transaction = getSupportFragmentManager()
+				.beginTransaction();
+		externalPlayerFragment = new ExternalPlayerFragment();
+		transaction.replace(R.id.playerFragment, externalPlayerFragment);
+		transaction.commit();
 	}
 
 	@Override
diff --git a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index bc336e754..a03c4612d 100644
--- a/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -21,7 +21,6 @@ import com.actionbarsherlock.app.SherlockFragment;
 
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.AudioplayerActivity;
 import de.danoeh.antennapod.asynctask.FeedImageLoader;
 import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.receiver.PlayerWidget;
@@ -48,6 +47,10 @@ public class ExternalPlayerFragment extends SherlockFragment {
 
 	private boolean mediaInfoLoaded = false;
 
+	public ExternalPlayerFragment() {
+		super();
+	}
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
@@ -85,7 +88,7 @@ public class ExternalPlayerFragment extends SherlockFragment {
 					PlayerStatus status = playbackService.getStatus();
 					if (status == PlayerStatus.PLAYING) {
 						playbackService.pause(true);
-					} else if (status == PlayerStatus.PAUSED){
+					} else if (status == PlayerStatus.PAUSED) {
 						playbackService.play();
 					}
 				}
@@ -217,9 +220,12 @@ public class ExternalPlayerFragment extends SherlockFragment {
 		if (AppConfig.DEBUG)
 			Log.d(TAG, "Refreshing fragment state");
 		if (playbackService == null) {
-			getActivity().bindService(
-					new Intent(getActivity(), PlaybackService.class),
-					mConnection, 0);
+			fragmentLayout.setVisibility(View.GONE);
+			if (PlaybackService.isRunning) {
+				getActivity().bindService(
+						new Intent(getActivity(), PlaybackService.class),
+						mConnection, 0);
+			}
 		} else {
 			PlayerStatus status = playbackService.getStatus();
 			if ((status == PlayerStatus.PAUSED || status == PlayerStatus.PLAYING)) {
-- 
cgit v1.2.3