From e9f1ef9d7b21d10fb3d4605a093557e52fe4e25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C3=96nnerby?= Date: Wed, 9 Dec 2009 08:39:51 +0000 Subject: [PATCH] Small fix for android client 1.0.7 --- src/android/AndroidManifest.xml | 4 ++-- src/android/default.properties | 2 ++ src/android/res/menu/default_menu.xml | 2 +- .../src/org/musikcube/{ => app1}/App.java | 2 +- .../musikcube/{ => app1}/CategoryList.java | 4 ++-- .../musikcube/{ => app1}/CategorySelect.java | 9 ++++----- .../src/org/musikcube/{ => app1}/Helper.java | 12 ++++++------ .../musikcube/{ => app1}/NowPlayingList.java | 4 ++-- .../{ => app1}/PlayerBPMControl.java | 6 +++--- .../musikcube/{ => app1}/PlayerControl.java | 8 ++++---- .../org/musikcube/{ => app1}/Preferences.java | 4 ++-- .../src/org/musikcube/{ => app1}/Search.java | 2 +- .../src/org/musikcube/{ => app1}/Service.java | 4 ++-- .../org/musikcube/{ => app1}/TrackList.java | 4 ++-- .../musikcube/{ => app1}/TrackListBase.java | 6 +++--- .../src/org/musikcube/{ => app1}/main.java | 5 ++--- .../src/org/musikcube/core/Library.java | 19 +++++++++---------- .../src/org/musikcube/core/Player.java | 8 ++++---- .../src/org/musikcube/core/Workout.java | 2 +- 19 files changed, 53 insertions(+), 54 deletions(-) rename src/android/src/org/musikcube/{ => app1}/App.java (77%) rename src/android/src/org/musikcube/{ => app1}/CategoryList.java (95%) rename src/android/src/org/musikcube/{ => app1}/CategorySelect.java (94%) rename src/android/src/org/musikcube/{ => app1}/Helper.java (63%) rename src/android/src/org/musikcube/{ => app1}/NowPlayingList.java (97%) rename src/android/src/org/musikcube/{ => app1}/PlayerBPMControl.java (96%) rename src/android/src/org/musikcube/{ => app1}/PlayerControl.java (96%) rename src/android/src/org/musikcube/{ => app1}/Preferences.java (86%) rename src/android/src/org/musikcube/{ => app1}/Search.java (93%) rename src/android/src/org/musikcube/{ => app1}/Service.java (95%) rename src/android/src/org/musikcube/{ => app1}/TrackList.java (93%) rename src/android/src/org/musikcube/{ => app1}/TrackListBase.java (97%) rename src/android/src/org/musikcube/{ => app1}/main.java (98%) diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index a06f44831..65d068b9e 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="org.musikcube.app1" + android:versionCode="7" android:versionName="1.0.7"> diff --git a/src/android/default.properties b/src/android/default.properties index 4513a1e4f..a1ef8e9ff 100644 --- a/src/android/default.properties +++ b/src/android/default.properties @@ -7,5 +7,7 @@ # "build.properties", and override values to adapt the script to your # project structure. +# Indicates whether an apk should be generated for each density. +split.density=false # Project target. target=android-3 diff --git a/src/android/res/menu/default_menu.xml b/src/android/res/menu/default_menu.xml index ca7bdd2af..dae57d410 100644 --- a/src/android/res/menu/default_menu.xml +++ b/src/android/res/menu/default_menu.xml @@ -4,5 +4,5 @@ - + diff --git a/src/android/src/org/musikcube/App.java b/src/android/src/org/musikcube/app1/App.java similarity index 77% rename from src/android/src/org/musikcube/App.java rename to src/android/src/org/musikcube/app1/App.java index fed92df46..24fa90f02 100644 --- a/src/android/src/org/musikcube/App.java +++ b/src/android/src/org/musikcube/app1/App.java @@ -1,4 +1,4 @@ -package org.musikcube; +package org.musikcube.app1; import android.app.Application; diff --git a/src/android/src/org/musikcube/CategoryList.java b/src/android/src/org/musikcube/app1/CategoryList.java similarity index 95% rename from src/android/src/org/musikcube/CategoryList.java rename to src/android/src/org/musikcube/app1/CategoryList.java index 161b871b0..693b4a27e 100644 --- a/src/android/src/org/musikcube/CategoryList.java +++ b/src/android/src/org/musikcube/app1/CategoryList.java @@ -1,7 +1,7 @@ /** * */ -package org.musikcube; +package org.musikcube.app1; import java.util.ArrayList; @@ -229,7 +229,7 @@ public class CategoryList extends ListActivity implements OnQueryResultListener @Override protected void onResume() { super.onResume(); - startService(new Intent(this, org.musikcube.Service.class)); + startService(new Intent(this, org.musikcube.app1.Service.class)); org.musikcube.core.Library.GetInstance().AddPointer(); } diff --git a/src/android/src/org/musikcube/CategorySelect.java b/src/android/src/org/musikcube/app1/CategorySelect.java similarity index 94% rename from src/android/src/org/musikcube/CategorySelect.java rename to src/android/src/org/musikcube/app1/CategorySelect.java index de4cb08e2..a5302d3a2 100644 --- a/src/android/src/org/musikcube/CategorySelect.java +++ b/src/android/src/org/musikcube/app1/CategorySelect.java @@ -1,7 +1,7 @@ /** * */ -package org.musikcube; +package org.musikcube.app1; import java.util.ArrayList; @@ -14,7 +14,6 @@ import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.util.Log; import android.util.SparseBooleanArray; import android.view.LayoutInflater; import android.view.Menu; @@ -112,8 +111,8 @@ public class CategorySelect extends ListActivity implements OnQueryResultListene } } Workout.GetInstance().SetCategory(selections, CategorySelect.this.category); - Log.v("mC2::SAVE",CategorySelect.this.category); - Log.v("mC2::SAVE",selections.toString()); + //Log.v("mC2::SAVE",CategorySelect.this.category); + //Log.v("mC2::SAVE",selections.toString()); intent.putExtra("org.musikcube.PlayerBPMControl.category", CategorySelect.this.category); intent.putExtra("org.musikcube.PlayerBPMControl.selection", selections); startActivity(intent); @@ -249,7 +248,7 @@ public class CategorySelect extends ListActivity implements OnQueryResultListene @Override protected void onResume() { super.onResume(); - startService(new Intent(this, org.musikcube.Service.class)); + startService(new Intent(this, org.musikcube.app1.Service.class)); org.musikcube.core.Library.GetInstance().AddPointer(); } diff --git a/src/android/src/org/musikcube/Helper.java b/src/android/src/org/musikcube/app1/Helper.java similarity index 63% rename from src/android/src/org/musikcube/Helper.java rename to src/android/src/org/musikcube/app1/Helper.java index 4a947d84d..62daa2caa 100644 --- a/src/android/src/org/musikcube/Helper.java +++ b/src/android/src/org/musikcube/app1/Helper.java @@ -1,4 +1,4 @@ -package org.musikcube; +package org.musikcube.app1; import org.musikcube.core.Workout; @@ -14,20 +14,20 @@ public class Helper { //Log.i("MC2.onContextItemSelected","item "+item.getItemId()+" "+R.id.context_settings); switch (item.getItemId()) { case R.id.context_settings: - context.startActivity(new Intent(context, org.musikcube.Preferences.class)); + context.startActivity(new Intent(context, org.musikcube.app1.Preferences.class)); return true; case R.id.context_browse: - context.startActivity(new Intent(context, org.musikcube.main.class)); + context.startActivity(new Intent(context, org.musikcube.app1.main.class)); return true; case R.id.context_controls: if(Workout.GetInstance().Active()){ - context.startActivity(new Intent(context, org.musikcube.PlayerBPMControl.class)); + context.startActivity(new Intent(context, org.musikcube.app1.PlayerBPMControl.class)); }else{ - context.startActivity(new Intent(context, org.musikcube.PlayerControl.class)); + context.startActivity(new Intent(context, org.musikcube.app1.PlayerControl.class)); } return true; case R.id.context_nowplaying: - context.startActivity(new Intent(context, org.musikcube.NowPlayingList.class)); + context.startActivity(new Intent(context, org.musikcube.app1.NowPlayingList.class)); return true; case R.id.context_help: Dialog dialog = new Dialog(context); diff --git a/src/android/src/org/musikcube/NowPlayingList.java b/src/android/src/org/musikcube/app1/NowPlayingList.java similarity index 97% rename from src/android/src/org/musikcube/NowPlayingList.java rename to src/android/src/org/musikcube/app1/NowPlayingList.java index bcbefb192..7094fc08c 100644 --- a/src/android/src/org/musikcube/NowPlayingList.java +++ b/src/android/src/org/musikcube/app1/NowPlayingList.java @@ -1,7 +1,7 @@ /** * */ -package org.musikcube; +package org.musikcube.app1; import org.musikcube.core.Player; import org.musikcube.core.Player.OnTrackListUpdateListener; @@ -48,7 +48,7 @@ public class NowPlayingList extends TrackListBase implements OnTrackListUpdateLi public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo(); java.util.ArrayList trackList = new java.util.ArrayList(); - Intent intent = new Intent(this, org.musikcube.Service.class); + Intent intent = new Intent(this, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.position", 0); switch (item.getItemId()) { case PLAY_THIS_ID: diff --git a/src/android/src/org/musikcube/PlayerBPMControl.java b/src/android/src/org/musikcube/app1/PlayerBPMControl.java similarity index 96% rename from src/android/src/org/musikcube/PlayerBPMControl.java rename to src/android/src/org/musikcube/app1/PlayerBPMControl.java index bee1e5a34..2e2c49c14 100644 --- a/src/android/src/org/musikcube/PlayerBPMControl.java +++ b/src/android/src/org/musikcube/app1/PlayerBPMControl.java @@ -1,4 +1,4 @@ -package org.musikcube; +package org.musikcube.app1; import java.io.InputStream; import java.net.HttpURLConnection; @@ -58,14 +58,14 @@ public class PlayerBPMControl extends Activity implements OnTrackUpdateListener, private OnClickListener onNextClick = new OnClickListener() { public void onClick(View v){ - Intent intent = new Intent(PlayerBPMControl.this, org.musikcube.Service.class); + Intent intent = new Intent(PlayerBPMControl.this, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "next"); startService(intent); } }; private OnClickListener onPauseClick = new OnClickListener() { public void onClick(View v){ - Intent intent = new Intent(PlayerBPMControl.this, org.musikcube.Service.class); + Intent intent = new Intent(PlayerBPMControl.this, org.musikcube.app1.Service.class); if(Workout.GetInstance().Active()){ intent.putExtra("org.musikcube.Service.action", "workoutstop"); }else{ diff --git a/src/android/src/org/musikcube/PlayerControl.java b/src/android/src/org/musikcube/app1/PlayerControl.java similarity index 96% rename from src/android/src/org/musikcube/PlayerControl.java rename to src/android/src/org/musikcube/app1/PlayerControl.java index 5a73646c2..9451b2b14 100644 --- a/src/android/src/org/musikcube/PlayerControl.java +++ b/src/android/src/org/musikcube/app1/PlayerControl.java @@ -1,4 +1,4 @@ -package org.musikcube; +package org.musikcube.app1; import java.io.InputStream; import java.net.HttpURLConnection; @@ -58,21 +58,21 @@ public class PlayerControl extends Activity implements OnTrackUpdateListener { private OnClickListener onNextClick = new OnClickListener() { public void onClick(View v){ - Intent intent = new Intent(PlayerControl.this, org.musikcube.Service.class); + Intent intent = new Intent(PlayerControl.this, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "next"); startService(intent); } }; private OnClickListener onPrevClick = new OnClickListener() { public void onClick(View v){ - Intent intent = new Intent(PlayerControl.this, org.musikcube.Service.class); + Intent intent = new Intent(PlayerControl.this, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "prev"); startService(intent); } }; private OnClickListener onPauseClick = new OnClickListener() { public void onClick(View v){ - Intent intent = new Intent(PlayerControl.this, org.musikcube.Service.class); + Intent intent = new Intent(PlayerControl.this, org.musikcube.app1.Service.class); if(Player.GetInstance().Playing()){ intent.putExtra("org.musikcube.Service.action", "stop"); }else{ diff --git a/src/android/src/org/musikcube/Preferences.java b/src/android/src/org/musikcube/app1/Preferences.java similarity index 86% rename from src/android/src/org/musikcube/Preferences.java rename to src/android/src/org/musikcube/app1/Preferences.java index edf44f13f..a1e98f729 100644 --- a/src/android/src/org/musikcube/Preferences.java +++ b/src/android/src/org/musikcube/app1/Preferences.java @@ -1,4 +1,4 @@ -package org.musikcube; +package org.musikcube.app1; import android.content.Intent; import android.os.Bundle; @@ -34,7 +34,7 @@ public class Preferences extends PreferenceActivity { // Log.v("mC2::PREFS","onResume"); super.onResume(); org.musikcube.core.Library.GetInstance().AddPointer(); - startService(new Intent(this, org.musikcube.Service.class)); + startService(new Intent(this, org.musikcube.app1.Service.class)); } } diff --git a/src/android/src/org/musikcube/Search.java b/src/android/src/org/musikcube/app1/Search.java similarity index 93% rename from src/android/src/org/musikcube/Search.java rename to src/android/src/org/musikcube/app1/Search.java index 7f1898ee8..29a1109d6 100644 --- a/src/android/src/org/musikcube/Search.java +++ b/src/android/src/org/musikcube/app1/Search.java @@ -1,4 +1,4 @@ -package org.musikcube; +package org.musikcube.app1; import android.app.TabActivity; import android.os.Bundle; diff --git a/src/android/src/org/musikcube/Service.java b/src/android/src/org/musikcube/app1/Service.java similarity index 95% rename from src/android/src/org/musikcube/Service.java rename to src/android/src/org/musikcube/app1/Service.java index 56ad1beed..ab135a426 100644 --- a/src/android/src/org/musikcube/Service.java +++ b/src/android/src/org/musikcube/app1/Service.java @@ -1,7 +1,7 @@ /** * */ -package org.musikcube; +package org.musikcube.app1; import org.musikcube.core.Library; import org.musikcube.core.Player; @@ -61,7 +61,7 @@ public class Service extends android.app.Service { switch(state) { case TelephonyManager.CALL_STATE_RINGING: - Intent intent = new Intent(Service.this, org.musikcube.Service.class); + Intent intent = new Intent(Service.this, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "stop"); startService(intent); break; diff --git a/src/android/src/org/musikcube/TrackList.java b/src/android/src/org/musikcube/app1/TrackList.java similarity index 93% rename from src/android/src/org/musikcube/TrackList.java rename to src/android/src/org/musikcube/app1/TrackList.java index 5589097fe..c195ec982 100644 --- a/src/android/src/org/musikcube/TrackList.java +++ b/src/android/src/org/musikcube/app1/TrackList.java @@ -1,7 +1,7 @@ /** * */ -package org.musikcube; +package org.musikcube.app1; import java.util.ArrayList; @@ -71,7 +71,7 @@ public class TrackList extends TrackListBase { public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo(); java.util.ArrayList trackList = new java.util.ArrayList(); - Intent intent = new Intent(this, org.musikcube.Service.class); + Intent intent = new Intent(this, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.position", 0); switch (item.getItemId()) { case PLAY_THIS_ID: diff --git a/src/android/src/org/musikcube/TrackListBase.java b/src/android/src/org/musikcube/app1/TrackListBase.java similarity index 97% rename from src/android/src/org/musikcube/TrackListBase.java rename to src/android/src/org/musikcube/app1/TrackListBase.java index a0970b8d0..0897ade75 100644 --- a/src/android/src/org/musikcube/TrackListBase.java +++ b/src/android/src/org/musikcube/app1/TrackListBase.java @@ -1,7 +1,7 @@ /** * */ -package org.musikcube; +package org.musikcube.app1; import org.musikcube.core.IQuery; import org.musikcube.core.Library; @@ -183,7 +183,7 @@ public class TrackListBase extends ListActivity implements OnQueryResultListener @Override protected void onListItemClick(ListView l, View v, int position, long id){ - Intent intent = new Intent(this, org.musikcube.Service.class); + Intent intent = new Intent(this, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.tracklist", this.trackList); intent.putExtra("org.musikcube.Service.position", position); intent.putExtra("org.musikcube.Service.action", "playlist"); @@ -206,7 +206,7 @@ public class TrackListBase extends ListActivity implements OnQueryResultListener @Override protected void onResume() { super.onResume(); - startService(new Intent(this, org.musikcube.Service.class)); + startService(new Intent(this, org.musikcube.app1.Service.class)); org.musikcube.core.Library.GetInstance().AddPointer(); } diff --git a/src/android/src/org/musikcube/main.java b/src/android/src/org/musikcube/app1/main.java similarity index 98% rename from src/android/src/org/musikcube/main.java rename to src/android/src/org/musikcube/app1/main.java index 8d19fabd5..5571240d2 100644 --- a/src/android/src/org/musikcube/main.java +++ b/src/android/src/org/musikcube/app1/main.java @@ -1,4 +1,4 @@ -package org.musikcube; +package org.musikcube.app1; import android.app.Activity; import android.content.Intent; @@ -12,7 +12,6 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; -import org.musikcube.CategoryList; import org.musikcube.core.Library; import org.musikcube.core.Library.OnLibraryStatusListener; @@ -111,7 +110,7 @@ public class main extends Activity implements OnLibraryStatusListener { @Override protected void onResume() { super.onResume(); - startService(new Intent(this, org.musikcube.Service.class)); + startService(new Intent(this, org.musikcube.app1.Service.class)); org.musikcube.core.Library.GetInstance().AddPointer(); org.musikcube.core.Library.GetInstance().SetStatusListener(this); } diff --git a/src/android/src/org/musikcube/core/Library.java b/src/android/src/org/musikcube/core/Library.java index 9c5950037..540f598bc 100644 --- a/src/android/src/org/musikcube/core/Library.java +++ b/src/android/src/org/musikcube/core/Library.java @@ -10,7 +10,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.util.Log; import doep.xml.*; import org.musikcube.core.IQuery; @@ -79,7 +78,7 @@ public final class Library implements Runnable{ private final void SetStatus(int status){ synchronized(this.status){ - Log.v("mC2::Lib","STATUS "+this.status); + //Log.v("mC2::Lib","STATUS "+this.status); this.status = status; if(this.statusListener!=null){ this.statusListener.OnLibraryStatusChange(status); @@ -206,7 +205,7 @@ public final class Library implements Runnable{ this.SetStatus(STATUS_SHUTDOWN); while(true){ - Log.v("mC2::Lib","1"); + //Log.v("mC2::Lib","1"); this.running = true; // First try to connect @@ -316,7 +315,7 @@ public final class Library implements Runnable{ } - Log.v("mC2::Lib","4"); + //Log.v("mC2::Lib","4"); synchronized (notifier) { if(!this.restart){ @@ -329,18 +328,18 @@ public final class Library implements Runnable{ } this.restart = false; - Log.v("mC2::Lib","5"); + //Log.v("mC2::Lib","5"); if(this.exit){ - Log.v("mC2::Lib","EXIT"); - Intent intent = new Intent(this.context, org.musikcube.Service.class); + //Log.v("mC2::Lib","EXIT"); + Intent intent = new Intent(this.context, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "shutdown"); this.context.startService(intent); return; } this.restart = false; // this.running = true; - Log.v("mC2::Lib","6"); + //Log.v("mC2::Lib","6"); } } @@ -384,7 +383,7 @@ public final class Library implements Runnable{ } } - Log.v("Library::WriteThread","wait over"); + //Log.v("Library::WriteThread","wait over"); }else{ // Get the first query query = this.sendQueryQueue.removeFirst(); @@ -429,7 +428,7 @@ public final class Library implements Runnable{ //Log.e("Library::WriteThread","E "+x.getMessage()); } - Log.v("Library::WriteThread","Ended"); + //Log.v("Library::WriteThread","Ended"); } public final void Exit(){ diff --git a/src/android/src/org/musikcube/core/Player.java b/src/android/src/org/musikcube/core/Player.java index f78b2ade8..8a2981181 100644 --- a/src/android/src/org/musikcube/core/Player.java +++ b/src/android/src/org/musikcube/core/Player.java @@ -285,7 +285,7 @@ public final class Player implements TrackPlayer.OnTrackStatusListener, OnQueryR this.library = Library.GetInstance(); this.library.AddPointer(); - Intent intent = new Intent(this.service, org.musikcube.Service.class); + Intent intent = new Intent(this.service, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "player_start"); this.service.startService(intent); } @@ -304,7 +304,7 @@ public final class Player implements TrackPlayer.OnTrackStatusListener, OnQueryR this.library.RemovePointer(); this.library = null; - Intent intent = new Intent(this.service, org.musikcube.Service.class); + Intent intent = new Intent(this.service, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "player_end"); this.service.startService(intent); @@ -316,7 +316,7 @@ public final class Player implements TrackPlayer.OnTrackStatusListener, OnQueryR /* if(status==TrackPlayer.STATUS_EXIT){ this.Next(); }*/ - Intent intent = new Intent(this.service, org.musikcube.Service.class); + Intent intent = new Intent(this.service, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "next"); this.service.startService(intent); } @@ -378,7 +378,7 @@ public final class Player implements TrackPlayer.OnTrackStatusListener, OnQueryR } } - Intent intent = new Intent(this.service, org.musikcube.Service.class); + Intent intent = new Intent(this.service, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.action", "player_start"); this.service.startService(intent); } diff --git a/src/android/src/org/musikcube/core/Workout.java b/src/android/src/org/musikcube/core/Workout.java index 83d4c3284..71e2c7205 100644 --- a/src/android/src/org/musikcube/core/Workout.java +++ b/src/android/src/org/musikcube/core/Workout.java @@ -185,7 +185,7 @@ public class Workout implements OnBPMListener, Runnable, OnQueryResultListener { this.lastQueryTime = android.os.SystemClock.elapsedRealtime(); BPMQuery bpmQuery = (BPMQuery)query; if(!bpmQuery.trackList.isEmpty() && this.context!=null){ - Intent intent = new Intent(this.context, org.musikcube.Service.class); + Intent intent = new Intent(this.context, org.musikcube.app1.Service.class); intent.putExtra("org.musikcube.Service.tracklist", bpmQuery.trackList); intent.putExtra("org.musikcube.Service.position", 0); intent.putExtra("org.musikcube.Service.action", "playlist_prepare");