diff --git a/.project b/.project index 45c24627..434b1127 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - Tumult + VanillaMusic diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 24f3d984..9fc37532 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,11 +1,11 @@ + package="org.kreed.vanilla" + android:versionCode="1" android:versionName="0.1"> + android:name="ContextApplication"> - \ No newline at end of file + \ No newline at end of file diff --git a/res/drawable/icon.png b/res/drawable/icon.png index dafd6466..2750cdaa 100644 Binary files a/res/drawable/icon.png and b/res/drawable/icon.png differ diff --git a/res/drawable/status_icon.png b/res/drawable/status_icon.png index 525283e0..d752074d 100644 Binary files a/res/drawable/status_icon.png and b/res/drawable/status_icon.png differ diff --git a/res/layout/now_playing.xml b/res/layout/now_playing.xml index 8d05bcb7..7d68b0c4 100644 --- a/res/layout/now_playing.xml +++ b/res/layout/now_playing.xml @@ -1,6 +1,6 @@ - diff --git a/res/layout/remote_dialog.xml b/res/layout/remote_dialog.xml index 84356eb5..a4ef264f 100644 --- a/res/layout/remote_dialog.xml +++ b/res/layout/remote_dialog.xml @@ -1,9 +1,9 @@ - - @@ -28,4 +28,4 @@ android:layout_width="wrap_content" android:text="@string/stop_service" /> - \ No newline at end of file + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index a8fc766b..21313f51 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,6 +1,6 @@ - Tumult + Vanilla Music Enqueued %s Filter: diff --git a/src/org/kreed/tumult/Song.aidl b/src/org/kreed/tumult/Song.aidl deleted file mode 100644 index c1465efa..00000000 --- a/src/org/kreed/tumult/Song.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package org.kreed.tumult; - -parcelable Song; \ No newline at end of file diff --git a/src/org/kreed/tumult/Tumult.java b/src/org/kreed/tumult/Tumult.java deleted file mode 100644 index 5702f604..00000000 --- a/src/org/kreed/tumult/Tumult.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.kreed.tumult; - -import android.app.Application; -import android.content.Context; - -public class Tumult extends Application { - private static Tumult instance; - - public Tumult() - { - instance = this; - } - - public static Context getContext() - { - return instance; - } -} diff --git a/src/org/kreed/vanilla/ContextApplication.java b/src/org/kreed/vanilla/ContextApplication.java new file mode 100644 index 00000000..73f731c1 --- /dev/null +++ b/src/org/kreed/vanilla/ContextApplication.java @@ -0,0 +1,18 @@ +package org.kreed.vanilla; + +import android.app.Application; +import android.content.Context; + +public class ContextApplication extends Application { + private static ContextApplication instance; + + public ContextApplication() + { + instance = this; + } + + public static Context getContext() + { + return instance; + } +} \ No newline at end of file diff --git a/src/org/kreed/tumult/CoverView.java b/src/org/kreed/vanilla/CoverView.java old mode 100755 new mode 100644 similarity index 98% rename from src/org/kreed/tumult/CoverView.java rename to src/org/kreed/vanilla/CoverView.java index 0068f68b..eb10a683 --- a/src/org/kreed/tumult/CoverView.java +++ b/src/org/kreed/vanilla/CoverView.java @@ -1,4 +1,7 @@ -package org.kreed.tumult; +package org.kreed.vanilla; + +import org.kreed.vanilla.IMusicPlayerWatcher; +import org.kreed.vanilla.IPlaybackService; import android.content.Context; import android.graphics.Bitmap; @@ -164,7 +167,7 @@ public class CoverView extends View { mSongs = mService.getCurrentSongs(); regenerateBitmaps(); } catch (RemoteException e) { - Log.e("Tumult", "RemoteException", e); + Log.e("VanillaMusic", "RemoteException", e); } } diff --git a/src/org/kreed/tumult/IMusicPlayerWatcher.aidl b/src/org/kreed/vanilla/IMusicPlayerWatcher.aidl similarity index 70% rename from src/org/kreed/tumult/IMusicPlayerWatcher.aidl rename to src/org/kreed/vanilla/IMusicPlayerWatcher.aidl index a4d0924e..7a37219b 100644 --- a/src/org/kreed/tumult/IMusicPlayerWatcher.aidl +++ b/src/org/kreed/vanilla/IMusicPlayerWatcher.aidl @@ -1,6 +1,6 @@ -package org.kreed.tumult; +package org.kreed.vanilla; -import org.kreed.tumult.Song; +import org.kreed.vanilla.Song; oneway interface IMusicPlayerWatcher { void songChanged(in Song playingSong); diff --git a/src/org/kreed/tumult/IPlaybackService.aidl b/src/org/kreed/vanilla/IPlaybackService.aidl similarity index 77% rename from src/org/kreed/tumult/IPlaybackService.aidl rename to src/org/kreed/vanilla/IPlaybackService.aidl index a198b28f..cdf0277b 100644 --- a/src/org/kreed/tumult/IPlaybackService.aidl +++ b/src/org/kreed/vanilla/IPlaybackService.aidl @@ -1,7 +1,7 @@ -package org.kreed.tumult; +package org.kreed.vanilla; -import org.kreed.tumult.Song; -import org.kreed.tumult.IMusicPlayerWatcher; +import org.kreed.vanilla.Song; +import org.kreed.vanilla.IMusicPlayerWatcher; interface IPlaybackService { void registerWatcher(IMusicPlayerWatcher watcher); diff --git a/src/org/kreed/tumult/NowPlayingActivity.java b/src/org/kreed/vanilla/NowPlayingActivity.java similarity index 97% rename from src/org/kreed/tumult/NowPlayingActivity.java rename to src/org/kreed/vanilla/NowPlayingActivity.java index 1c8aaa7f..92465c87 100644 --- a/src/org/kreed/tumult/NowPlayingActivity.java +++ b/src/org/kreed/vanilla/NowPlayingActivity.java @@ -1,4 +1,8 @@ -package org.kreed.tumult; +package org.kreed.vanilla; + +import org.kreed.vanilla.IMusicPlayerWatcher; +import org.kreed.vanilla.IPlaybackService; +import org.kreed.vanilla.R; import android.app.Activity; import android.content.ComponentName; @@ -53,7 +57,7 @@ public class NowPlayingActivity extends Activity implements ServiceConnection, V { super.onCreate(icicle); - setContentView(R.layout.nowplaying); + setContentView(R.layout.now_playing); mCoverView = (CoverView)findViewById(R.id.cover_view); mCoverView.setOnClickListener(this); @@ -204,7 +208,7 @@ public class NowPlayingActivity extends Activity implements ServiceConnection, V state = service.getState(); mDuration = service.getDuration(); } catch (RemoteException e) { - Log.i("Tumult", "Failed to initialize connection to playback service", e); + Log.i("VanillaMusic", "Failed to initialize connection to playback service", e); return; } } diff --git a/src/org/kreed/tumult/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java similarity index 95% rename from src/org/kreed/tumult/PlaybackService.java rename to src/org/kreed/vanilla/PlaybackService.java index 74b3af79..1402d23d 100644 --- a/src/org/kreed/tumult/PlaybackService.java +++ b/src/org/kreed/vanilla/PlaybackService.java @@ -1,4 +1,4 @@ -package org.kreed.tumult; +package org.kreed.vanilla; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -6,6 +6,10 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Random; +import org.kreed.vanilla.IMusicPlayerWatcher; +import org.kreed.vanilla.IPlaybackService; +import org.kreed.vanilla.R; + import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -177,9 +181,9 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On try { mStartForeground.invoke(this, startForegroundArgs); } catch (InvocationTargetException e) { - Log.w("Tumult", "Unable to invoke startForeground", e); + Log.w("VanillaMusic", "Unable to invoke startForeground", e); } catch (IllegalAccessException e) { - Log.w("Tumult", "Unable to invoke startForeground", e); + Log.w("VanillaMusic", "Unable to invoke startForeground", e); } } } @@ -194,9 +198,9 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On try { mStopForeground.invoke(this, topForegroundArgs); } catch (InvocationTargetException e) { - Log.w("Tumult", "Unable to invoke stopForeground", e); + Log.w("VanillaMusic", "Unable to invoke stopForeground", e); } catch (IllegalAccessException e) { - Log.w("Tumult", "Unable to invoke stopForeground", e); + Log.w("VanillaMusic", "Unable to invoke stopForeground", e); } } } @@ -296,7 +300,7 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On } else { Song song = new Song(message.arg1); String text = getResources().getString(R.string.enqueued, song.title); - Toast.makeText(Tumult.getContext(), text, Toast.LENGTH_SHORT).show(); + Toast.makeText(ContextApplication.getContext(), text, Toast.LENGTH_SHORT).show(); int i = mCurrentSong + 1 + mQueuePos++; if (i < mSongTimeline.size()) @@ -339,7 +343,7 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On registerReceiver(mReceiver, filter); PowerManager powerManager = (PowerManager)getSystemService(POWER_SERVICE); - mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "TumultSongChangeLock"); + mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "VanillaMusicSongChangeLock"); mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); mMediaPlayer.setWakeMode(this, PowerManager.PARTIAL_WAKE_LOCK); @@ -446,7 +450,7 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On if (mState == STATE_PLAYING) play(); } catch (IOException e) { - Log.e("Tumult", "IOException", e); + Log.e("VanillaMusic", "IOException", e); } int i = mWatchers.beginBroadcast(); diff --git a/src/org/kreed/tumult/PreferencesActivity.java b/src/org/kreed/vanilla/PreferencesActivity.java similarity index 83% rename from src/org/kreed/tumult/PreferencesActivity.java rename to src/org/kreed/vanilla/PreferencesActivity.java index b4347338..e18d6620 100644 --- a/src/org/kreed/tumult/PreferencesActivity.java +++ b/src/org/kreed/vanilla/PreferencesActivity.java @@ -1,4 +1,6 @@ -package org.kreed.tumult; +package org.kreed.vanilla; + +import org.kreed.vanilla.R; import android.os.Bundle; import android.preference.PreferenceActivity; diff --git a/src/org/kreed/tumult/RemoteActivity.java b/src/org/kreed/vanilla/RemoteActivity.java similarity index 95% rename from src/org/kreed/tumult/RemoteActivity.java rename to src/org/kreed/vanilla/RemoteActivity.java index ac8aeb60..59ee13b4 100644 --- a/src/org/kreed/tumult/RemoteActivity.java +++ b/src/org/kreed/vanilla/RemoteActivity.java @@ -1,4 +1,8 @@ -package org.kreed.tumult; +package org.kreed.vanilla; + +import org.kreed.vanilla.IMusicPlayerWatcher; +import org.kreed.vanilla.IPlaybackService; +import org.kreed.vanilla.R; import android.app.Activity; import android.content.ComponentName; diff --git a/src/org/kreed/tumult/RemoteLayout.java b/src/org/kreed/vanilla/RemoteLayout.java similarity index 98% rename from src/org/kreed/tumult/RemoteLayout.java rename to src/org/kreed/vanilla/RemoteLayout.java index 39804dbb..643ebb48 100644 --- a/src/org/kreed/tumult/RemoteLayout.java +++ b/src/org/kreed/vanilla/RemoteLayout.java @@ -1,4 +1,4 @@ -package org.kreed.tumult; +package org.kreed.vanilla; import android.content.Context; import android.util.AttributeSet; diff --git a/src/org/kreed/vanilla/Song.aidl b/src/org/kreed/vanilla/Song.aidl new file mode 100644 index 00000000..d4e625ea --- /dev/null +++ b/src/org/kreed/vanilla/Song.aidl @@ -0,0 +1,3 @@ +package org.kreed.vanilla; + +parcelable Song; \ No newline at end of file diff --git a/src/org/kreed/tumult/Song.java b/src/org/kreed/vanilla/Song.java similarity index 93% rename from src/org/kreed/tumult/Song.java rename to src/org/kreed/vanilla/Song.java index 7f661810..45291199 100644 --- a/src/org/kreed/tumult/Song.java +++ b/src/org/kreed/vanilla/Song.java @@ -1,4 +1,4 @@ -package org.kreed.tumult; +package org.kreed.vanilla; import android.content.ContentResolver; import android.database.Cursor; @@ -27,7 +27,7 @@ public class Song implements Parcelable { }; String selection = MediaStore.Audio.Media._ID + "==" + id;; - ContentResolver resolver = Tumult.getContext().getContentResolver(); + ContentResolver resolver = ContextApplication.getContext().getContentResolver(); Cursor cursor = resolver.query(media, projection, selection, null, null); if (cursor != null && cursor.moveToNext()) { @@ -56,7 +56,7 @@ public class Song implements Parcelable { String[] projection = { MediaStore.Audio.Media._ID }; String selection = MediaStore.Audio.Media.IS_MUSIC + "!=0"; - ContentResolver resolver = Tumult.getContext().getContentResolver(); + ContentResolver resolver = ContextApplication.getContext().getContentResolver(); Cursor cursor = resolver.query(media, projection, selection, null, null); if (cursor == null) @@ -117,4 +117,4 @@ public class Song implements Parcelable { { return 0; } -} +} \ No newline at end of file diff --git a/src/org/kreed/tumult/SongAdapter.java b/src/org/kreed/vanilla/SongAdapter.java similarity index 99% rename from src/org/kreed/tumult/SongAdapter.java rename to src/org/kreed/vanilla/SongAdapter.java index f1333979..bc3bfabf 100644 --- a/src/org/kreed/tumult/SongAdapter.java +++ b/src/org/kreed/vanilla/SongAdapter.java @@ -1,4 +1,4 @@ -package org.kreed.tumult; +package org.kreed.vanilla; import java.util.ArrayList; import java.util.Collections; diff --git a/src/org/kreed/tumult/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java similarity index 97% rename from src/org/kreed/tumult/SongSelector.java rename to src/org/kreed/vanilla/SongSelector.java index 77e88934..16895b85 100644 --- a/src/org/kreed/tumult/SongSelector.java +++ b/src/org/kreed/vanilla/SongSelector.java @@ -1,4 +1,6 @@ -package org.kreed.tumult; +package org.kreed.vanilla; + +import org.kreed.vanilla.R; import android.app.Activity; import android.content.Intent; @@ -28,7 +30,7 @@ public class SongSelector extends Activity implements View.OnClickListener, OnIt { super.onCreate(icicle); - setContentView(R.layout.songselector); + setContentView(R.layout.song_selector); mListView = (ListView)findViewById(R.id.song_list); mAdapter = new SongAdapter(this); mListView.setAdapter(mAdapter);