From 238beaaef61601a65751f43649d5ab3fa2e74b16 Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Sun, 4 Apr 2010 10:10:39 -0500 Subject: [PATCH] Combine code to handle playback control buttons --- .../kreed/vanilla/FullPlaybackActivity.java | 27 +++++-------------- .../kreed/vanilla/MiniPlaybackActivity.java | 24 ++++------------- src/org/kreed/vanilla/PlaybackActivity.java | 22 +++++++++++++++ 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java index e4e42968..f1851a28 100644 --- a/src/org/kreed/vanilla/FullPlaybackActivity.java +++ b/src/org/kreed/vanilla/FullPlaybackActivity.java @@ -30,7 +30,6 @@ import android.os.Handler; import android.os.Message; import android.os.RemoteException; import android.preference.PreferenceManager; -import android.util.Log; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; @@ -49,9 +48,7 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli private View mControlsTop; private View mControlsBottom; - private View mPreviousButton; private ImageView mPlayPauseButton; - private View mNextButton; private SeekBar mSeekBar; private TextView mSeekText; @@ -84,15 +81,15 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli mControlsTop = findViewById(R.id.controls_top); mControlsBottom = findViewById(R.id.controls_bottom); - mPreviousButton = findViewById(R.id.previous); - mPreviousButton.setOnClickListener(this); - mPreviousButton.setOnFocusChangeListener(this); + View previousButton = findViewById(R.id.previous); + previousButton.setOnClickListener(this); + previousButton.setOnFocusChangeListener(this); mPlayPauseButton = (ImageView)findViewById(R.id.play_pause); mPlayPauseButton.setOnClickListener(this); mPlayPauseButton.setOnFocusChangeListener(this); - mNextButton = findViewById(R.id.next); - mNextButton.setOnClickListener(this); - mNextButton.setOnFocusChangeListener(this); + View nextButton = findViewById(R.id.next); + nextButton.setOnClickListener(this); + nextButton.setOnFocusChangeListener(this); mSeekText = (TextView)findViewById(R.id.seek_text); mSeekBar = (SeekBar)findViewById(R.id.seek_bar); @@ -313,17 +310,7 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli updateProgress(); } } else { - try { - if (view == mNextButton) - mCoverView.go(1); - else if (view == mPreviousButton) - mCoverView.go(-1); - else if (view == mPlayPauseButton) - mCoverView.go(0); - } catch (RemoteException e) { - Log.e("VanillaMusic", "service dead", e); - setService(null); - } + super.onClick(view); } } diff --git a/src/org/kreed/vanilla/MiniPlaybackActivity.java b/src/org/kreed/vanilla/MiniPlaybackActivity.java index 1b9179cd..58677d5b 100644 --- a/src/org/kreed/vanilla/MiniPlaybackActivity.java +++ b/src/org/kreed/vanilla/MiniPlaybackActivity.java @@ -23,9 +23,7 @@ import org.kreed.vanilla.R; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.os.RemoteException; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.Window; @@ -34,9 +32,7 @@ import android.widget.ImageView; public class MiniPlaybackActivity extends PlaybackActivity implements View.OnClickListener { private View mOpenButton; private View mKillButton; - private View mPreviousButton; private ImageView mPlayPauseButton; - private View mNextButton; @Override public void onCreate(Bundle state) @@ -52,12 +48,12 @@ public class MiniPlaybackActivity extends PlaybackActivity implements View.OnCli mOpenButton.setOnClickListener(this); mKillButton = findViewById(R.id.kill_button); mKillButton.setOnClickListener(this); - mPreviousButton = findViewById(R.id.previous); - mPreviousButton.setOnClickListener(this); + View previousButton = findViewById(R.id.previous); + previousButton.setOnClickListener(this); mPlayPauseButton = (ImageView)findViewById(R.id.play_pause); mPlayPauseButton.setOnClickListener(this); - mNextButton = findViewById(R.id.next); - mNextButton.setOnClickListener(this); + View nextButton = findViewById(R.id.next); + nextButton.setOnClickListener(this); } @Override @@ -77,17 +73,7 @@ public class MiniPlaybackActivity extends PlaybackActivity implements View.OnCli startActivity(new Intent(this, FullPlaybackActivity.class)); finish(); } else { - try { - if (view == mNextButton) - mCoverView.go(1); - else if (view == mPreviousButton) - mCoverView.go(-1); - else if (view == mPlayPauseButton) - mCoverView.go(0); - } catch (RemoteException e) { - Log.e("VanillaMusic", "service dead", e); - finish(); - } + super.onClick(view); } } } diff --git a/src/org/kreed/vanilla/PlaybackActivity.java b/src/org/kreed/vanilla/PlaybackActivity.java index 7d6b7c3b..fcecb765 100644 --- a/src/org/kreed/vanilla/PlaybackActivity.java +++ b/src/org/kreed/vanilla/PlaybackActivity.java @@ -28,7 +28,9 @@ import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; +import android.util.Log; import android.view.KeyEvent; +import android.view.View; public abstract class PlaybackActivity extends Activity implements ServiceConnection { protected CoverView mCoverView; @@ -96,6 +98,26 @@ public abstract class PlaybackActivity extends Activity implements ServiceConnec return handleKeyLongPress(this, keyCode); } + public void onClick(View view) + { + try { + switch (view.getId()) { + case R.id.next: + mCoverView.go(1); + break; + case R.id.play_pause: + mCoverView.go(0); + break; + case R.id.previous: + mCoverView.go(-1); + break; + } + } catch (RemoteException e) { + Log.e("VanillaMusic", "service dead", e); + setService(null); + } + } + protected abstract void setState(int state); protected void setService(IPlaybackService service)