[Mp-plugins-svn] SF.net SVN: mp-plugins:[4083] trunk/plugins/AndroidRemote

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4083
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4083&view=rev
Author:   kroko_koenig
Date:     2011-01-28 09:25:28 +0000 (Fri, 28 Jan 2011)

Log Message:
-----------
fix for Android bug, fix for pictures caching

Modified Paths:
--------------
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java
    trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java
    trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip
    trunk/plugins/AndroidRemote/Release/album.jpg
    trunk/plugins/AndroidRemote/Release/artist.jpg
    trunk/plugins/AndroidRemote/Release/folder.jpg
    trunk/plugins/AndroidRemote/Release/main.jpg
    trunk/plugins/AndroidRemote/Release/nowplaying.jpg
    trunk/plugins/AndroidRemote/Release/remote.jpg
    trunk/plugins/AndroidRemote/Release/song.jpg
    trunk/plugins/AndroidRemote/Server/AndroidRemote.suo

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml
===================================================================

--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_album.xml	2011-01-28 09:25:28 UTC (rev 4083)
@@ -3,14 +3,20 @@
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-	<ListView android:id="@+id/list_album" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:fastScrollEnabled="true"
-		android:layout_weight="1">
-	</ListView>
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:layout_weight="1">
 
+		<ListView android:id="@+id/list_album" android:layout_height="wrap_content"
+			android:layout_width="fill_parent" android:fastScrollEnabled="true">
+		</ListView>
+
+	</LinearLayout>
+
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_height="wrap_content" android:orientation="horizontal"
-		android:layout_gravity="center_horizontal" android:layout_width="wrap_content">
+		android:layout_height="80dip" android:layout_weight="1"
+		android:orientation="horizontal" android:layout_gravity="center_horizontal"
+		android:layout_width="wrap_content">
 
 		<Button android:background="@drawable/ic_menu_skin1_minus"
 			android:id="@+id/btnAlbumSelDown" android:layout_height="40dip"

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_artist.xml	2011-01-28 09:25:28 UTC (rev 4083)
@@ -3,30 +3,36 @@
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-	<ListView android:id="@+id/list_artist" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:fastScrollEnabled="true"
-		android:layout_weight="1">
-	</ListView>
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="horizontal" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:layout_weight="1">
 
+		<ListView android:id="@+id/list_artist"
+			android:layout_height="wrap_content" android:layout_width="fill_parent"
+			android:fastScrollEnabled="true">
+		</ListView>
+
+	</LinearLayout>
+
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_height="wrap_content" android:orientation="horizontal"
-		android:layout_gravity="center_horizontal" android:layout_width="wrap_content">
+		android:orientation="horizontal" android:layout_width="wrap_content"
+		android:layout_height="80dip" android:layout_weight="1"
+		android:layout_gravity="center_horizontal">
 
 		<Button android:background="@drawable/ic_menu_skin1_minus"
 			android:id="@+id/btnArtistSelDown" android:layout_height="40dip"
 			android:layout_width="60dip">
 		</Button>
-
 		<TextView android:layout_width="wrap_content"
 			android:layout_height="wrap_content" android:text="--- / --- items"
 			android:textColor="#FFFFFFFF" android:id="@+id/txtDbArtist"
 			android:textSize="18dip" android:layout_marginLeft="10dip"
 			android:layout_marginRight="10dip">
 		</TextView>
-
 		<Button android:background="@drawable/ic_menu_skin1_plus"
 			android:id="@+id/btnArtistSelUp" android:layout_height="40dip"
 			android:layout_width="60dip">
 		</Button>
 	</LinearLayout>
+
 </LinearLayout>
\ No newline at end of file

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_results.xml	2011-01-28 09:25:28 UTC (rev 4083)
@@ -3,14 +3,22 @@
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-	<ListView android:id="@+id/list_result" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:fastScrollEnabled="true" android:layout_weight="1">
-	</ListView>
-	
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_height="wrap_content" android:orientation="horizontal"
-		android:layout_gravity="center_horizontal" android:layout_width="wrap_content">
+		android:orientation="horizontal" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:layout_weight="1">
 
+		<ListView android:id="@+id/list_result"
+			android:layout_height="wrap_content" android:layout_width="fill_parent"
+			android:fastScrollEnabled="true">
+		</ListView>
+
+	</LinearLayout>
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_height="80dip" android:orientation="horizontal"
+		android:layout_gravity="center_horizontal" android:layout_width="wrap_content"
+		android:layout_weight="1">
+
 		<Button android:background="@drawable/ic_menu_skin1_minus"
 			android:id="@+id/btnResultSelDown" android:layout_height="40dip"
 			android:layout_width="60dip">

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/res/layout/music_song.xml	2011-01-28 09:25:28 UTC (rev 4083)
@@ -3,23 +3,36 @@
 	android:orientation="vertical" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
 
-	<ListView android:id="@+id/list_song" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:fastScrollEnabled="true" android:layout_weight="1">
-	</ListView>
-	
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_height="wrap_content"
-	android:orientation="horizontal" android:layout_gravity="center_horizontal" android:layout_width="wrap_content">
-	
-	<Button android:background="@drawable/ic_menu_skin1_minus" android:id="@+id/btnSongSelDown" android:layout_height="40dip" android:layout_width="60dip">
-    </Button>
-    
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
-     android:text="--- / --- items" android:textColor="#FFFFFFFF"
-     android:id="@+id/txtDbSong" android:textSize="18dip" android:layout_marginLeft="10dip" android:layout_marginRight="10dip">
-    </TextView>
+		android:orientation="horizontal" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:layout_weight="1">
 
-    <Button android:background="@drawable/ic_menu_skin1_plus" android:id="@+id/btnSongSelUp" android:layout_height="40dip" android:layout_width="60dip">
-    </Button>
-    </LinearLayout>
+		<ListView android:id="@+id/list_song" android:layout_height="wrap_content"
+			android:layout_width="fill_parent" android:fastScrollEnabled="true">
+		</ListView>
+
+	</LinearLayout>
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_height="80dip" android:orientation="horizontal"
+		android:layout_gravity="center_horizontal" android:layout_width="wrap_content"
+		android:layout_weight="1">
+
+		<Button android:background="@drawable/ic_menu_skin1_minus"
+			android:id="@+id/btnSongSelDown" android:layout_height="40dip"
+			android:layout_width="60dip">
+		</Button>
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" android:text="--- / --- items"
+			android:textColor="#FFFFFFFF" android:id="@+id/txtDbSong"
+			android:textSize="18dip" android:layout_marginLeft="10dip"
+			android:layout_marginRight="10dip">
+		</TextView>
+
+		<Button android:background="@drawable/ic_menu_skin1_plus"
+			android:id="@+id/btnSongSelUp" android:layout_height="40dip"
+			android:layout_width="60dip">
+		</Button>
+	</LinearLayout>
 </LinearLayout>
\ No newline at end of file

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicAlbum.java	2011-01-28 09:25:28 UTC (rev 4083)
@@ -45,6 +45,8 @@
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
@@ -64,6 +66,8 @@
     
 	private static HashMap<String, Integer> alphaIndexer;
 	private static String[] sections;
+	
+	private boolean FLAG_THUMB_PLUS;
 
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -209,6 +213,18 @@
 				
 				listview.setAdapter(new EfficientAdapter(MusicAlbum.this));
 				listview.setFastScrollEnabled(true);
+				
+				// tweak as described in many post, not very nice but work
+				int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT
+						: listview.getWidth() - 1;
+
+				LinearLayout.LayoutParams l = new LinearLayout.LayoutParams(
+						newWidth, FrameLayout.LayoutParams.FILL_PARENT);
+
+				listview.setLayoutParams(l);
+				
+				FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true;
+				// tweak finished				
 			}
 		}
 

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicArtist.java	2011-01-28 09:25:28 UTC (rev 4083)
@@ -45,6 +45,8 @@
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
@@ -55,20 +57,22 @@
 	private Handler mHandler = new Handler();
 
 	private static ArrayList<ReceiveDbXmlHandler.DbItems> artistList;
-	
+
 	private static int startList;
 	private static int countList;
 	private static int countItems;
-	
+
 	private TextView dbCount;
 
 	private static HashMap<String, Integer> alphaIndexer;
 	private static String[] sections;
 
+	private boolean FLAG_THUMB_PLUS;
+
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.music_artist);
-		
+
 		dbCount = (TextView) findViewById(R.id.txtDbArtist);
 		startList = 0;
 
@@ -132,7 +136,7 @@
 
 		Vibration.vibrateShort();
 	}
-	
+
 	private Runnable mUpdateTimeTask = new Runnable() {
 		public void run() {
 			new update().execute();
@@ -159,7 +163,7 @@
 			artistList = result.data;
 			countList = result.results;
 			countItems = result.count;
-			
+
 			return null;
 		}
 
@@ -203,14 +207,28 @@
 				Collections.sort(sectionList);
 				sections = new String[sectionList.size()];
 				sectionList.toArray(sections);
-	
+
 				ListView listview = (ListView) findViewById(R.id.list_artist);
-				listview.setFastScrollEnabled(false);
+				listview.setFastScrollEnabled(false); // we need it, otherwise exception out of bound...
+
+				listview.setAdapter(new EfficientAdapter(MusicArtist.this));
+				listview.setFastScrollEnabled(true);
+
+				// tweak as described in many post, not very nice but work
+				int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT
+						: listview.getWidth() - 1;
+
+				LinearLayout.LayoutParams l = new LinearLayout.LayoutParams(
+						newWidth, FrameLayout.LayoutParams.FILL_PARENT);
+
+				listview.setLayoutParams(l);
 				
-				listview.setAdapter(new EfficientAdapter(MusicArtist.this));		
-				listview.setFastScrollEnabled(true);		
+				FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true;
+				// tweak finished
+
 			}
 		}
+
 	}
 
 	private static class EfficientAdapter extends BaseAdapter implements
@@ -284,8 +302,6 @@
 		public Object[] getSections() {
 			return sections;
 		}
-		
-		
 
 	}
 

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicResults.java	2011-01-28 09:25:28 UTC (rev 4083)
@@ -55,6 +55,8 @@
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
@@ -90,6 +92,8 @@
 	final CharSequence[] items = { "Add to playlist", "Clear playlist",
 			"Save to SD card", "Play locally" };
 
+	private boolean FLAG_THUMB_PLUS;
+	
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.music_results);
@@ -290,6 +294,18 @@
 				
 				listview.setAdapter(new EfficientAdapter(MusicResults.this));
 				listview.setFastScrollEnabled(true);
+				
+				// tweak as described in many post, not very nice but work
+				int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT
+						: listview.getWidth() - 1;
+
+				LinearLayout.LayoutParams l = new LinearLayout.LayoutParams(
+						newWidth, FrameLayout.LayoutParams.FILL_PARENT);
+
+				listview.setLayoutParams(l);
+				
+				FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true;
+				// tweak finished	
 			}
 		}
 	}

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/music/MusicSong.java	2011-01-28 09:25:28 UTC (rev 4083)
@@ -55,6 +55,8 @@
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
@@ -85,6 +87,8 @@
 	final CharSequence[] items = { "Add to playlist", "Clear playlist",
 			"Save to SD card", "Play locally" };
 
+	private boolean FLAG_THUMB_PLUS;
+	
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.music_song);
@@ -276,6 +280,18 @@
 				
 				listview.setAdapter(new EfficientAdapter(MusicSong.this));
 				listview.setFastScrollEnabled(true);
+				
+				// tweak as described in many post, not very nice but work
+				int newWidth = (FLAG_THUMB_PLUS) ? LinearLayout.LayoutParams.FILL_PARENT
+						: listview.getWidth() - 1;
+
+				LinearLayout.LayoutParams l = new LinearLayout.LayoutParams(
+						newWidth, FrameLayout.LayoutParams.FILL_PARENT);
+
+				listview.setLayoutParams(l);
+				
+				FLAG_THUMB_PLUS = FLAG_THUMB_PLUS ? false : true;
+				// tweak finished
 			}
 		}
 	}

Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java	2011-01-27 15:34:00 UTC (rev 4082)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures/Pictures.java	2011-01-28 09:25:28 UTC (rev 4083)
@@ -95,6 +95,7 @@
 				if (pic.typ == "folder") {
 					actualDir += pic.title + "/";
 
+					picNo = 0;
 					taskFetchData = new update();
 					taskFetchData.execute();
 				}
@@ -110,6 +111,7 @@
 					} else
 						actualDir = "";
 
+					picNo = 0;
 					taskFetchData = new update();
 					taskFetchData.execute();
 				}
@@ -195,14 +197,14 @@
 
 		// can use UI thread here
 		protected void onPreExecute() {
-			picNo = 0;
+			
 		}
 
 		// automatically done on worker thread (separate from UI thread)
 		protected Void doInBackground(final String... args) {
 
 			while (picNo < pictureList.size()) {
-
+			
 				DirItems item = pictureList.get(picNo);
 				if (!item.isFolder) {
 					if (item.Picture == null) {
@@ -211,9 +213,10 @@
 						item.Picture = http.DownloadImage(file);
 						if (picNo < pictureList.size()) // very strange exeption happens here 10/10
 							pictureList.set(picNo, item);
+						picNo++;
 						break;
 					}
-				}
+				}	
 				picNo++;
 			}
 

Modified: trunk/plugins/AndroidRemote/Release/MediaPortalRemote.zip
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Release/album.jpg
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Release/artist.jpg
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Release/folder.jpg
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Release/main.jpg
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Release/nowplaying.jpg
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Release/remote.jpg
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Release/song.jpg
===================================================================
(Binary files differ)

Modified: trunk/plugins/AndroidRemote/Server/AndroidRemote.suo
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


