From a68545e6192ebf856917a2bd8ac82518fa4be3a4 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Fri, 14 Sep 2012 21:57:47 -0700
Subject: Updated a bunch of icons to match other forks

---
 .../action_select_artist_folder.png                | Bin 1920 -> 0 bytes
 .../drawable-hdpi-v4/btn_check_buttonless_off.png  | Bin 0 -> 762 bytes
 .../drawable-hdpi-v4/btn_check_buttonless_on.png   | Bin 0 -> 2996 bytes
 .../res/drawable-hdpi-v4/ic_menu_settings.png      | Bin 3812 -> 0 bytes
 .../res/drawable-hdpi-v4/list_item_artist.9.png    | Bin 2505 -> 0 bytes
 .../res/drawable-hdpi-v4/list_item_more.9.png      | Bin 0 -> 5838 bytes
 .../res/drawable-hdpi-v4/list_item_playlist.9.png  | Bin 2505 -> 0 bytes
 .../res/drawable-hdpi-v4/main_exit.png             | Bin 4532 -> 0 bytes
 .../res/drawable-hdpi-v4/main_help.png             | Bin 4123 -> 0 bytes
 .../res/drawable-hdpi-v4/main_select_server.png    | Bin 4458 -> 1920 bytes
 .../res/drawable-hdpi-v4/main_settings.png         | Bin 3401 -> 0 bytes
 .../res/drawable-hdpi-v4/main_shuffle.png          | Bin 4445 -> 0 bytes
 .../res/drawable-hdpi-v4/menu_search.png           | Bin 3808 -> 0 bytes
 .../res/drawable-hdpi-v4/select_artist_folder.png  | Bin 4458 -> 0 bytes
 subsonic-android/res/drawable/btn_check.xml        |  28 +++++++++++++++++++++
 subsonic-android/res/layout/album_list_item.xml    |   2 +-
 subsonic-android/res/layout/artist_list_item.xml   |   2 +-
 subsonic-android/res/layout/main_buttons.xml       |  10 ++++----
 subsonic-android/res/layout/playlist_list_item.xml |   2 +-
 .../res/layout/select_artist_header.xml            |   2 +-
 subsonic-android/res/layout/song_list_item.xml     |   2 +-
 21 files changed, 38 insertions(+), 10 deletions(-)
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png
 create mode 100644 subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_exit.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_help.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_settings.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/main_shuffle.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/menu_search.png
 delete mode 100644 subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png
 create mode 100644 subsonic-android/res/drawable/btn_check.xml

diff --git a/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png b/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png
deleted file mode 100644
index c2cefead..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png
new file mode 100644
index 00000000..d705b420
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png
new file mode 100644
index 00000000..a2612d7d
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png
deleted file mode 100644
index 2ffcec52..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png
deleted file mode 100644
index 7bddbcef..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png
new file mode 100644
index 00000000..79ca860d
Binary files /dev/null and b/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png b/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png
deleted file mode 100644
index 7bddbcef..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_exit.png b/subsonic-android/res/drawable-hdpi-v4/main_exit.png
deleted file mode 100644
index 9a8b2a5e..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_exit.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_help.png b/subsonic-android/res/drawable-hdpi-v4/main_help.png
deleted file mode 100644
index cb063b00..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_help.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_select_server.png b/subsonic-android/res/drawable-hdpi-v4/main_select_server.png
index ccecc1d9..c2cefead 100644
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_select_server.png and b/subsonic-android/res/drawable-hdpi-v4/main_select_server.png differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_settings.png b/subsonic-android/res/drawable-hdpi-v4/main_settings.png
deleted file mode 100644
index 81bca4ae..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_settings.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png b/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png
deleted file mode 100644
index 22ee1d50..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/menu_search.png b/subsonic-android/res/drawable-hdpi-v4/menu_search.png
deleted file mode 100644
index f78234e4..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/menu_search.png and /dev/null differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png b/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png
deleted file mode 100644
index ccecc1d9..00000000
Binary files a/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png and /dev/null differ
diff --git a/subsonic-android/res/drawable/btn_check.xml b/subsonic-android/res/drawable/btn_check.xml
new file mode 100644
index 00000000..f363a2d2
--- /dev/null
+++ b/subsonic-android/res/drawable/btn_check.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_checked="true"
+        android:drawable="@drawable/btn_check_buttonless_on" />
+
+    <item android:state_checked="false"
+        android:drawable="@drawable/btn_check_buttonless_off" />
+        
+    <item
+        android:drawable="@drawable/btn_check_buttonless_off" />
+
+</selector>
diff --git a/subsonic-android/res/layout/album_list_item.xml b/subsonic-android/res/layout/album_list_item.xml
index 15d999c3..2e74390f 100644
--- a/subsonic-android/res/layout/album_list_item.xml
+++ b/subsonic-android/res/layout/album_list_item.xml
@@ -38,7 +38,7 @@
     </LinearLayout>
 
     <ImageView
-            android:src="@drawable/list_item_artist"
+            android:src="@drawable/list_item_more"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right|center_vertical"
diff --git a/subsonic-android/res/layout/artist_list_item.xml b/subsonic-android/res/layout/artist_list_item.xml
index 8aaa42d0..3c99ccbd 100644
--- a/subsonic-android/res/layout/artist_list_item.xml
+++ b/subsonic-android/res/layout/artist_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@android:id/text1"
-          android:drawableRight="@drawable/list_item_artist"
+          android:drawableRight="@drawable/list_item_more"
           android:drawablePadding="6dip"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
index 0c471585..655854be 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -58,7 +58,7 @@
     <TextView
             android:id="@+id/main_albums_newest"
             android:text="@string/main.albums_newest"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -70,7 +70,7 @@
     <TextView
             android:id="@+id/main_albums_recent"
             android:text="@string/main.albums_recent"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
     <TextView
             android:id="@+id/main_albums_frequent"
             android:text="@string/main.albums_frequent"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -94,7 +94,7 @@
     <TextView
             android:id="@+id/main_albums_highest"
             android:text="@string/main.albums_highest"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
     <TextView
             android:id="@+id/main_albums_random"
             android:text="@string/main.albums_random"
-            android:drawableRight="@drawable/list_item_artist"
+            android:drawableRight="@drawable/list_item_more"
             android:drawablePadding="6dip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/playlist_list_item.xml b/subsonic-android/res/layout/playlist_list_item.xml
index 20706dc9..3c99ccbd 100644
--- a/subsonic-android/res/layout/playlist_list_item.xml
+++ b/subsonic-android/res/layout/playlist_list_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:id="@android:id/text1"
-          android:drawableRight="@drawable/list_item_playlist"
+          android:drawableRight="@drawable/list_item_more"
           android:drawablePadding="6dip"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
diff --git a/subsonic-android/res/layout/select_artist_header.xml b/subsonic-android/res/layout/select_artist_header.xml
index 247eb806..50e10742 100644
--- a/subsonic-android/res/layout/select_artist_header.xml
+++ b/subsonic-android/res/layout/select_artist_header.xml
@@ -10,7 +10,7 @@
         android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
-            android:src="@drawable/select_artist_folder"
+            android:src="@drawable/main_select_server"
             android:layout_gravity="center_vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
diff --git a/subsonic-android/res/layout/song_list_item.xml b/subsonic-android/res/layout/song_list_item.xml
index 2163ef72..f8d518ad 100644
--- a/subsonic-android/res/layout/song_list_item.xml
+++ b/subsonic-android/res/layout/song_list_item.xml
@@ -9,7 +9,7 @@
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
-            android:checkMark="?android:attr/textCheckMark"
+            android:checkMark="@drawable/btn_check"
             android:paddingLeft="3dip"/>
 
     <LinearLayout android:orientation="vertical"
-- 
cgit v1.2.3