Skip to content

Changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
East2West wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8977192
Major stability changes:
East2West Oct 15, 2011
7c4c6f5
Added high-res artwork using LastFM api, implemented image caching for
East2West Oct 16, 2011
db5e397
Changed AlbumArtDownloader to make it more likely to find difficult
East2West Oct 16, 2011
29cc548
Cleaned up AlbumArtDownloaded. Added album art resolution to
East2West Oct 16, 2011
ccf2292
Fixed login/logout fc bug. The static vector "EMPTY_ARGS" in
East2West Oct 16, 2011
d2f2afc
Added search functionality and ability to delete stations
East2West Oct 20, 2011
44917a8
New feature! Added the ability to replay songs from the recently played
East2West Oct 22, 2011
9608d3d
Removed saving recentlyPlayed to the database. The links don't hold
East2West Oct 22, 2011
92823b3
Some code cleanup, added a loading animation to the album art.
East2West Oct 30, 2011
bb2775a
Fixed a bug that was causing the search feature to crash.
East2West Nov 1, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<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"/>
</classpath>
8 changes: 6 additions & 2 deletions AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
<?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">
android:versionCode="3" android:versionName="1.0">
<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>

<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name="PandoidPlayer" android:label="@string/app_name" android:clearTaskOnLaunch="true">
<activity android:name="PandoidPlayer" android:label="@string/app_name" android:clearTaskOnLaunch="true"
android:theme="@android:style/Theme.NoTitleBar">
<intent-filter>
<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="PandoidSearchActivity"></activity>
<activity android:name="PandoidSearchResultList"></activity>
<activity android:name="PandoidRecentlyPlayedList"></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>
Expand Down
113 changes: 113 additions & 0 deletions res/layout-land/player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>
<LinearLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:layout_above="@+id/player_buttons"
android:orientation="horizontal"
>
<LinearLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:orientation="vertical"
android:layout_weight="1"
android:gravity="left"
>
<FrameLayout
android:id="@+id/frameLayout1"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>

<ImageView
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:src="@drawable/transparent"
android:id="@+id/player_image"
android:paddingTop="14dip"
/>
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"
/>
</FrameLayout>
</LinearLayout>
<RelativeLayout
android:layout_height="fill_parent"
android:layout_width="fill_parent"
android:gravity="center_vertical"
android:paddingLeft="5px"
android:layout_weight="1"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="8pt"
android:text="Pandoroid"
android:id="@+id/player_topText"
/>

<TextView
android:id="@+id/player_middleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/player_topText"
/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/player_middleText"
android:singleLine="true"
android:text=""
android:id="@+id/player_bottomText"
/>
</RelativeLayout>

</LinearLayout>
<RelativeLayout
android:layout_height="60dip"
android:layout_width="fill_parent"
android:layout_alignParentBottom="true"
android:id="@+id/player_buttons"
android:gravity="center"
>
<Button android:text="=" android:layout_width="60dip" android:id="@+id/station_list"
android:layout_height="fill_parent" android:layout_alignParentBottom="true"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="60dip" android:textSize="20sp"></Button>

<Button android:text="--" android:layout_width="60dip" android:id="@+id/player_ban"
android:layout_height="fill_parent" android:layout_alignParentBottom="true"
android:layout_alignTop="@+id/station_list" android:layout_alignBottom="@+id/station_list"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="60dip" android:textSize="20sp" android:layout_toRightOf="@+id/station_list"></Button>

<Button android:text="++" android:layout_width="60dip" android:id="@+id/player_love"
android:layout_height="fill_parent" android:layout_toRightOf="@+id/player_ban"
android:layout_alignTop="@+id/player_ban" android:layout_alignBottom="@+id/player_ban"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="60dip" android:textSize="20sp"></Button>

<Button android:text=">" android:layout_width="60dip" android:id="@+id/player_pause"
android:layout_height="fill_parent" android:layout_toRightOf="@+id/player_love"
android:layout_alignTop="@+id/player_love" android:layout_alignBottom="@+id/player_love"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="60dip" android:textSize="20sp"></Button>

<Button android:text="&gt;&gt;" android:layout_width="60dip" android:id="@+id/player_next"
android:layout_height="fill_parent" android:layout_toRightOf="@+id/player_pause"
android:layout_alignTop="@+id/player_pause" android:layout_alignBottom="@+id/player_pause"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="60dip" android:textSize="20sp"></Button>

</RelativeLayout>
</RelativeLayout>
92 changes: 69 additions & 23 deletions res/layout/player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="fill_parent">
<LinearLayout
android:id="@+id/player_text"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingTop="30px"
>
<TextView
android:id="@+id/player_topText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Pandoroid"
android:textSize="8pt"
android:gravity="center_horizontal"
/>

<TextView
android:id="@+id/player_middleText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text=" "
/>

<TextView
android:id="@+id/player_bottomText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text=" "
/>
</LinearLayout>
<FrameLayout
android:id="@+id/frameLayout1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/player_text"
android:layout_above="@+id/player_buttons"
android:gravity="center"
>

<ImageView android:layout_height="fill_parent" android:layout_width="fill_parent"
android:src="@drawable/transparent" android:id="@+id/player_image" android:paddingTop="14dip"
/>
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:visibility="invisible"
/>
</FrameLayout>

<TextView android:layout_width="fill_parent" android:layout_height="wrap_content"
android:paddingTop="20dip" android:gravity="center" android:text="Loading..." android:id="@+id/player_topText"
android:layout_alignParentLeft="true"></TextView>

<ImageView android:layout_height="wrap_content" android:layout_width="fill_parent"
android:src="@drawable/transparent" android:id="@+id/player_image" android:paddingTop="14dip"
android:layout_below="@+id/player_topText" android:layout_alignLeft="@+id/player_topText"
android:layout_alignRight="@+id/player_topText"></ImageView>

<TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:paddingTop="14dip"
android:layout_below="@+id/player_image" android:layout_alignLeft="@+id/player_image"
android:layout_alignRight="@+id/player_image" android:gravity="center" android:text=""
android:id="@+id/player_bottomText"></TextView>

<RelativeLayout android:layout_height="80dip" android:layout_width="fill_parent"
<RelativeLayout android:layout_height="60dip" android:layout_width="fill_parent" android:paddingTop="5px"
android:layout_alignParentBottom="true" android:id="@+id/player_buttons" android:gravity="center">

<Button android:text="--" android:layout_width="75dip" android:id="@+id/player_ban"
<Button android:text="=" android:layout_width="60dip" android:id="@+id/station_list"
android:layout_height="fill_parent" android:layout_alignParentBottom="true"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="60dip" android:textSize="20sp"></Button>

<Button android:text="--" android:layout_width="60dip" android:id="@+id/player_ban"
android:layout_height="fill_parent" android:layout_alignParentBottom="true"
android:layout_alignTop="@+id/station_list" android:layout_alignBottom="@+id/station_list"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="75dip" android:textSize="30sp"></Button>
android:width="60dip" android:textSize="20sp" android:layout_toRightOf="@+id/station_list"></Button>

<Button android:text="++" android:layout_width="75dip" android:id="@+id/player_love"
<Button android:text="++" android:layout_width="60dip" android:id="@+id/player_love"
android:layout_height="fill_parent" android:layout_toRightOf="@+id/player_ban"
android:layout_alignTop="@+id/player_ban" android:layout_alignBottom="@+id/player_ban"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="75dip" android:textSize="30sp"></Button>
android:width="60dip" android:textSize="20sp"></Button>

<Button android:text="||" android:layout_width="75dip" android:id="@+id/player_pause"
<Button android:text=">" android:layout_width="60dip" android:id="@+id/player_pause"
android:layout_height="fill_parent" android:layout_toRightOf="@+id/player_love"
android:layout_alignTop="@+id/player_love" android:layout_alignBottom="@+id/player_love"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="75dip" android:textSize="30sp"></Button>
android:width="60dip" android:textSize="20sp"></Button>

<Button android:text="&gt;&gt;" android:layout_width="75dip" android:id="@+id/player_next"
<Button android:text="&gt;&gt;" android:layout_width="60dip" android:id="@+id/player_next"
android:layout_height="fill_parent" android:layout_toRightOf="@+id/player_pause"
android:layout_alignTop="@+id/player_pause" android:layout_alignBottom="@+id/player_pause"
android:onClick="controlButtonPressed" android:typeface="monospace" android:textStyle="bold"
android:width="75dip" android:textSize="30sp"></Button>
android:width="60dip" android:textSize="20sp"></Button>

</RelativeLayout>

Expand Down
12 changes: 12 additions & 0 deletions res/layout/search_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?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="horizontal">
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp"
android:textSize="8pt" android:id="@+id/item_name">
</TextView>
</LinearLayout>
38 changes: 38 additions & 0 deletions res/layout/station_creator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="@string/search_text"
android:textSize="12pt"
/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:orientation="horizontal"
>
<EditText
android:layout_width="wrap_content"
android:id="@+id/searchQuery"
android:layout_height="wrap_content"
android:layout_weight="1"
/>
<Spinner
android:id="@+id/queryType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:entries="@array/query_types"
/>
</LinearLayout>
<Button
android:text="Search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="onSearchQuery"
/>
</LinearLayout>
2 changes: 1 addition & 1 deletion res/layout/stations_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="10dp"
android:textSize="16sp" android:id="@+id/stations_name">
android:textSize="8pt" android:id="@+id/stations_name">
</TextView>
</LinearLayout>
3 changes: 2 additions & 1 deletion res/menu/player_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_stations" android:title="Stations"></item>
<item android:id="@+id/menu_logout" android:title="Logout"></item>
<item android:id="@+id/menu_settings" android:title="Settings"></item>
<item android:id="@+id/menu_recently_played" android:title="Recently Played"></item>
<item android:id="@+id/menu_settings" android:title="Settings"></item>
</menu>
4 changes: 4 additions & 0 deletions res/menu/station_select_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/create_station" android:title="Create Station"></item>
</menu>
15 changes: 15 additions & 0 deletions res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,19 @@
<item>mp3</item>
<item>mp3-hifi</item>
</string-array>
<string-array name="pandora_albumRes_values">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<string-array name="pandora_albumRes_text">
<item>Low</item>
<item>Normal</item>
<item>High</item>
</string-array>
<string-array name="query_types">
<item>Song</item>
<item>Artist</item>
</string-array>

</resources>
4 changes: 4 additions & 0 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@
<string name="loading">Loading %s...</string>
<string name="baned_song">Buzz-kill...</string>
<string name="loved_song">Rock on!</string>
<string name="no_song">No song currently playing...</string>
<string name="next_song">Loading next song...</string>
<string name="search_text">Search</string>
<string name="searching">Searching...</string>
</resources>
1 change: 1 addition & 0 deletions res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<PreferenceCategory android:title="Audio">
<ListPreference android:key="pandora_audioFormat" android:title="Audio Format" android:summary="Audio encoding format to request from the Pandora service." android:entryValues="@array/pandora_audioFormat_values" android:entries="@array/pandora_audioFormat_text" android:defaultValue="aacplus"></ListPreference>
</PreferenceCategory><PreferenceCategory android:title="Behavior">
<ListPreference android:key="pandora_albumArtRes" android:title="Album Art Resolution" android:summary="Preferred resolution of album artwork." android:entryValues="@array/pandora_albumRes_values" android:entries="@array/pandora_albumRes_text" android:defaultValue="0"></ListPreference>
<CheckBoxPreference android:key="behave_nextOnBan" android:summary='Skip to the next song when you "thumb down" a song.' android:title="Next track on ban" android:defaultValue="true"></CheckBoxPreference>
<CheckBoxPreference android:key="behave_resumeOnHangup" android:summary="Resume playback automatically when a call is ended." android:title="Resume on Hangup" android:defaultValue="true"></CheckBoxPreference>

Expand Down
Loading