JSON API update -RPC Protocol Broken

.classpath

@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

.gitignore

@@ -3,3 +3,6 @@ bin/*
 hs_err_pid*.log
 R.java
 consoleTesting
+
+# The gen/ directory should be ignored as everything there is automatically generated.
+gen/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ActionBarSherlock"]
+	path = ActionBarSherlock
+	url = https://github.com/JakeWharton/ActionBarSherlock.git

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Pandoid</name>
+	<name>Pandoroid</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

AndroidManifest.xml

@@ -1,22 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.aregner.android.pandoid"
-      android:versionCode="2" android:versionName="0.2">
-    <uses-sdk android:minSdkVersion="8" />
-    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission>
+    package="com.pandoroid"
+    android:versionCode="14"
+    android:versionName="1.0.0-Pre-8" >
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name="PandoidPlayer" android:label="@string/app_name" android:clearTaskOnLaunch="true">
+    <uses-sdk
+        android:minSdkVersion="10"
+        android:targetSdkVersion="16" />
+
+    <uses-permission android:name="android.permission.INTERNET" ></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" ></uses-permission>
+
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <activity
+            android:name="com.pandoroid.PandoroidLogin"
+            android:label="@string/app_name"
+            android:noHistory="false" >
+        </activity>
+        <activity
+            android:name="com.pandoroid.PandoroidPlayer"
+            android:label="@string/app_name"
+            android:screenOrientation="fullSensor"
+            android:theme="@style/PandoroidStartUpTheme" 
+            android:launchMode="singleTop">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"></action>
-                <category android:name="android.intent.category.LAUNCHER"></category>
+                <action android:name="android.intent.action.MAIN" >
+                </action>
+                <category android:name="android.intent.category.LAUNCHER" >
+                </category>
             </intent-filter>
         </activity>
-        <activity android:name="PandoidStationSelect" android:noHistory="true"></activity>
-        <activity android:name="PandoidSettings" android:noHistory="true"></activity>
-        <service android:name="PandoraRadioService" android:enabled="true" android:exported="false"></service>
-        <activity android:name="PandoidLogin" android:noHistory="true"></activity>
-
+        <activity
+            android:name="com.pandoroid.PandoroidStationSelect"
+            android:noHistory="false" >
+        </activity>
+        <activity
+            android:name="com.pandoroid.PandoroidSettings"
+            android:noHistory="false" >
+        </activity>
+        <service
+            android:name="com.pandoroid.PandoraRadioService"
+            android:enabled="true"
+            android:exported="false" >
+        </service>
+        <activity
+            android:name="com.pandoroid.AboutDialog"
+            android:theme="@style/Theme.Sherlock.Dialog" >
+        </activity>
     </application>
+
 </manifest>

README.md

@@ -1,8 +1,20 @@
-Pandoroid Radio
+Pandoroid 
 ===============
+Project Page: https://github.com/dylanPowers/pandoroid/wiki
 
-This is eventually going to be a full-featured [Pandora Radio](http://www.pandora.com/) client for Android-based devices.  Due to failings in the proprietary application provided by Pandora Radio themselves, this application is being designed with three focuses in mind: _stability_, _intuitiveness_, and _configurability_ (in that order). At this stage, those are more "goals" then an actual reality.
+Pandoroid is an open-sourced Pandora client for Android started by 
+[Andrew Regner](https://github.com/adregner). It is licensed under the GPLv2+, and code contributions are highly appreciated!
+View the [project's homepage](https://github.com/dylanPowers/pandoroid/wiki) for the most up-to-date information.
+For historical purposes the original homepage by [Andrew Regner](https://github.com/adregner) can be found 
+at [http://aregner.com/android/pandoroid/](http://aregner.com/android/pandoroid/).
 
-I work on this project in my spare time with [Bazaar](http://bazaar.canonical.com/) but push it to here for the added visibility.  Check out the project's home page (http://aregner.com/android/pandoroid/) for full details and its current status.
+## Note about Using the Code
+This version uses the [ActionBarSherlock](http://actionbarsherlock.com/) compatibility library to give the Android 4.0 styling to the older Android versions.  
+To edit and compile the source, check out the [usage](http://actionbarsherlock.com/usage.html) page, under Including In Your Project.
+For help with project setup in eclipse, feel free to contact [dylanPowers](https://github.com/dylanPowers).
 
-At the moment, the application is just about completely functional, with a few manageable bugs.  It is however not complete enough based on where I want to go with it nor properly tested.  Feedback is welcome and encouraged.
+## Other Open-Sourced Pandora Projects
+A big thanks to the folks at:
+* [pianobar](https://github.com/PromyLOPh/pianobar/)
+* [Pithos](https://github.com/kevinmehall/pithos)
+* ...and others

lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>

project.properties

@@ -0,0 +1,16 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-14
+android.library=false
+android.library.reference.1=ActionBarSherlock/library

res/layout-land/player.xml

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/PandoroidBlackBgTheme"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="horizontal" >
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_alignParentTop="false"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/player_topText"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:gravity="center"
+            android:paddingTop="5dip"
+            android:text="@string/loading" >
+        </TextView>
+
+        <ImageView
+            android:id="@+id/player_image"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/player_topText"
+            android:layout_alignRight="@+id/player_topText"
+            android:layout_below="@+id/player_topText"
+            android:paddingTop="5dip"
+            android:src="@drawable/transparent" >
+        </ImageView>
+
+        <TextView
+            android:id="@+id/player_bottomText"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/player_image"
+            android:layout_alignRight="@+id/player_image"
+            android:layout_below="@+id/player_image"
+            android:gravity="center"
+            android:paddingTop="14dip"
+            android:text=""
+            android:visibility="gone" >
+        </TextView>
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/progressUpdate"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="158dp"
+        android:layout_marginRight="158dp"
+        android:layout_marginTop="100dp"
+        android:background="#C0000000"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
+        android:visibility="invisible" >
+
+        <ProgressBar
+            android:id="@+id/progressSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/progressText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="15dp"
+            android:text="@string/loading"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="16dp" />
+
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/player_buttons"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center|right" >
+
+        <ImageView
+            android:id="@+id/player_next"
+            android:src="@drawable/ic_menu_forward"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="controlButtonPressed"
+            android:padding="10dip"
+            android:width="75dip" >
+        </ImageView>
+
+        <ImageView
+            android:id="@+id/player_pause"
+            android:src="@drawable/ic_menu_play_clip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="controlButtonPressed"
+            android:layout_alignLeft="@+id/player_next"
+            android:layout_alignRight="@+id/player_next"
+            android:layout_below="@+id/player_next"
+            android:padding="10dip"
+            android:width="75dip" >
+        </ImageView>
+
+        <ImageView
+            android:id="@+id/player_love"
+            android:src="@drawable/ic_menu_star"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/player_pause"
+            android:layout_alignRight="@+id/player_pause"
+            android:layout_below="@+id/player_pause"
+            android:onClick="controlButtonPressed"
+            android:padding="10dip"
+            android:width="75dip" >
+        </ImageView>
+
+        <ImageView
+            android:id="@+id/player_ban"
+            android:src="@drawable/ic_menu_block"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:onClick="controlButtonPressed"
+            android:layout_alignLeft="@+id/player_love"
+            android:layout_alignRight="@+id/player_love"
+            android:layout_below="@+id/player_love"
+            android:padding="10dip"
+            android:width="75dip" >
+        </ImageView>
+
+    </RelativeLayout>
+
+</RelativeLayout>

res/layout/about.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="20dip">
+
+    <TextView
+        android:id="@+id/version_text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center" />
+
+    <TextView
+        android:id="@+id/about_text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="left" />
+
+</LinearLayout>