setRating just takes a Entry, add ratings + select bookmark icons, basic thumb down/up entry to now playing

29 files changed, 31 insertions, 0 deletions

diff --git a/res/drawable-hdpi/ic_action_rating_bad_dark.png b/res/drawable-hdpi/ic_action_rating_bad_dark.png
new file mode 100644
index 00000000..855709e9
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_rating_bad_dark.png
diff --git a/res/drawable-hdpi/ic_action_rating_bad_light.png b/res/drawable-hdpi/ic_action_rating_bad_light.png
new file mode 100644
index 00000000..34199d3a
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_rating_bad_light.png
diff --git a/res/drawable-hdpi/ic_action_rating_bad_selected.png b/res/drawable-hdpi/ic_action_rating_bad_selected.png
new file mode 100644
index 00000000..c57aba50
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_rating_bad_selected.png
diff --git a/res/drawable-hdpi/ic_action_rating_good_dark.png b/res/drawable-hdpi/ic_action_rating_good_dark.png
new file mode 100644
index 00000000..fa91e699
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_rating_good_dark.png
diff --git a/res/drawable-hdpi/ic_action_rating_good_light.png b/res/drawable-hdpi/ic_action_rating_good_light.png
new file mode 100644
index 00000000..3427d770
--- /dev/null
+++ b/res/drawable-hdpi/ic_action_rating_good_light.png
diff --git a/res/drawable-hdpi/ic_menu_bookmark_selected.png b/res/drawable-hdpi/ic_menu_bookmark_selected.png
new file mode 100644
index 00000000..5a33d60c
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_bookmark_selected.png
diff --git a/res/drawable-mdpi/ic_action_rating_bad_dark.png b/res/drawable-mdpi/ic_action_rating_bad_dark.png
new file mode 100644
index 00000000..64f3cd1f
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_rating_bad_dark.png
diff --git a/res/drawable-mdpi/ic_action_rating_bad_light.png b/res/drawable-mdpi/ic_action_rating_bad_light.png
new file mode 100644
index 00000000..d6c8d42a
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_rating_bad_light.png
diff --git a/res/drawable-mdpi/ic_action_rating_bad_selected.png b/res/drawable-mdpi/ic_action_rating_bad_selected.png
new file mode 100644
index 00000000..34f5a9de
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_rating_bad_selected.png
diff --git a/res/drawable-mdpi/ic_action_rating_good_dark.png b/res/drawable-mdpi/ic_action_rating_good_dark.png
new file mode 100644
index 00000000..cadfbe1e
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_rating_good_dark.png
diff --git a/res/drawable-mdpi/ic_action_rating_good_light.png b/res/drawable-mdpi/ic_action_rating_good_light.png
new file mode 100644
index 00000000..75711920
--- /dev/null
+++ b/res/drawable-mdpi/ic_action_rating_good_light.png
diff --git a/res/drawable-mdpi/ic_menu_bookmark_selected.png b/res/drawable-mdpi/ic_menu_bookmark_selected.png
new file mode 100644
index 00000000..efcc1afa
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_bookmark_selected.png
diff --git a/res/drawable-xhdpi/ic_action_rating_bad_dark.png b/res/drawable-xhdpi/ic_action_rating_bad_dark.png
new file mode 100644
index 00000000..1393be0c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_rating_bad_dark.png
diff --git a/res/drawable-xhdpi/ic_action_rating_bad_light.png b/res/drawable-xhdpi/ic_action_rating_bad_light.png
new file mode 100644
index 00000000..fc1959b6
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_rating_bad_light.png
diff --git a/res/drawable-xhdpi/ic_action_rating_bad_selected.png b/res/drawable-xhdpi/ic_action_rating_bad_selected.png
new file mode 100644
index 00000000..cf7802d5
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_rating_bad_selected.png
diff --git a/res/drawable-xhdpi/ic_action_rating_good_dark.png b/res/drawable-xhdpi/ic_action_rating_good_dark.png
new file mode 100644
index 00000000..249ea9ec
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_rating_good_dark.png
diff --git a/res/drawable-xhdpi/ic_action_rating_good_light.png b/res/drawable-xhdpi/ic_action_rating_good_light.png
new file mode 100644
index 00000000..c8a776b0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_action_rating_good_light.png
diff --git a/res/drawable-xhdpi/ic_menu_bookmark_selected.png b/res/drawable-xhdpi/ic_menu_bookmark_selected.png
new file mode 100644
index 00000000..353b7b79
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_bookmark_selected.png
diff --git a/res/drawable-xxhdpi/ic_action_rating_bad_dark.png b/res/drawable-xxhdpi/ic_action_rating_bad_dark.png
new file mode 100644
index 00000000..d784b239
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_rating_bad_dark.png
diff --git a/res/drawable-xxhdpi/ic_action_rating_bad_light.png b/res/drawable-xxhdpi/ic_action_rating_bad_light.png
new file mode 100644
index 00000000..a1484d25
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_rating_bad_light.png
diff --git a/res/drawable-xxhdpi/ic_action_rating_bad_selected.png b/res/drawable-xxhdpi/ic_action_rating_bad_selected.png
new file mode 100644
index 00000000..13218a08
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_rating_bad_selected.png
diff --git a/res/drawable-xxhdpi/ic_action_rating_good_dark.png b/res/drawable-xxhdpi/ic_action_rating_good_dark.png
new file mode 100644
index 00000000..a332a632
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_rating_good_dark.png
diff --git a/res/drawable-xxhdpi/ic_action_rating_good_light.png b/res/drawable-xxhdpi/ic_action_rating_good_light.png
new file mode 100644
index 00000000..2ef75765
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_action_rating_good_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_bookmark_selected.png b/res/drawable-xxhdpi/ic_menu_bookmark_selected.png
new file mode 100644
index 00000000..a1890fbb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_bookmark_selected.png
diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index eb876be0..c17abbc4 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -64,6 +64,11 @@
 						android:layout_height="wrap_content"

 						android:layout_gravity="center_horizontal">

 

+						<ImageButton

+							android:id="@+id/download_rating_bad"

+							style="@style/DownloadActionImageButton"

+							android:src="?attr/rating_bad"/>

+

 						<Button

 							android:id="@+id/download_equalizer"

 							android:text="EQ"

@@ -83,6 +88,11 @@
 							android:id="@+id/download_bookmark"

 							style="@style/DownloadActionImageButton"

 							android:src="?attr/bookmark"/>

+

+						<ImageButton

+							android:id="@+id/download_rating_good"

+							style="@style/DownloadActionImageButton"

+							android:src="?attr/rating_good"/>

 					</LinearLayout>

 				</LinearLayout>

 

diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index f2a1df1c..7cce6747 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -55,6 +55,11 @@
 								android:layout_height="wrap_content"

 								android:layout_gravity="center_horizontal">

 

+								<ImageButton

+									android:id="@+id/download_rating_bad"

+									style="@style/DownloadActionImageButton"

+									android:src="@drawable/ic_action_rating_bad_dark"/>

+

 								<Button

 									android:id="@+id/download_equalizer"

 									android:text="EQ"

@@ -74,6 +79,11 @@
 									android:id="@+id/download_bookmark"

 									style="@style/DownloadActionImageButton"

 									android:src="@drawable/ic_menu_bookmark_dark"/>

+

+								<ImageButton

+									android:id="@+id/download_rating_good"

+									style="@style/DownloadActionImageButton"

+									android:src="@drawable/ic_action_rating_good_dark"/>

 							</LinearLayout>

 						</LinearLayout>

 					</RelativeLayout>

diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ac535487..13456e18 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,5 +23,7 @@
 	<attr name="share" format="reference"/>
 	<attr name="add_person" format="reference"/>
 	<attr name="password" format="reference"/>
+	<attr name="rating_bad" format="reference"/>
+	<attr name="rating_good" format="reference"/>
 	<attr name="drawerItemsIcons" format="reference"/>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b02cdc9d..91d0435d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -242,6 +242,9 @@
 	<string name="bookmark.action_resume">Resume</string>

 	<string name="bookmark.action_start_over">Start Over</string>

 

+	<string name="rating.set_rating_failed">Failed to set rating for \"%s\"</string>

+	<string name="rating.remove_rating_failed">Failed to remove rating for \"%s\"</string>

+

 	<string name="song_details.error">Error</string>

 	<string name="song_details.skipped">Skipped</string>

 	<string name="song_details.downloading">Downloading</string>

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 1700aa88..129c0612 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -26,6 +26,8 @@
 		<item name="share">@drawable/ic_menu_share_light</item>
 		<item name="add_person">@drawable/ic_menu_add_person_light</item>
 		<item name="password">@drawable/ic_menu_password_light</item>
+		<item name="rating_bad">@drawable/ic_action_rating_bad_light</item>
+		<item name="rating_good">@drawable/ic_action_rating_good_light</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
@@ -57,6 +59,8 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="add_person">@drawable/ic_menu_add_person_dark</item>
 		<item name="password">@drawable/ic_menu_password_dark</item>
+		<item name="rating_bad">@drawable/ic_action_rating_bad_dark</item>
+		<item name="rating_good">@drawable/ic_action_rating_good_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
@@ -91,6 +95,8 @@
 		<item name="share">@drawable/ic_menu_share_dark</item>
 		<item name="add_person">@drawable/ic_menu_add_person_dark</item>
 		<item name="password">@drawable/ic_menu_password_dark</item>
+		<item name="rating_bad">@drawable/ic_action_rating_bad_dark</item>
+		<item name="rating_good">@drawable/ic_action_rating_good_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>