aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-09-14 21:57:47 -0700
committerScott Jackson <daneren2005@gmail.com>2012-09-14 21:57:47 -0700
commita68545e6192ebf856917a2bd8ac82518fa4be3a4 (patch)
tree5aff39ceded4d4f84ca97d2830fbf259b8d8579f
parentd494f0d99fe539238f53120e59fa8193bb31218a (diff)
downloaddsub-a68545e6192ebf856917a2bd8ac82518fa4be3a4.tar.gz
dsub-a68545e6192ebf856917a2bd8ac82518fa4be3a4.tar.bz2
dsub-a68545e6192ebf856917a2bd8ac82518fa4be3a4.zip
Updated a bunch of icons to match other forks
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.pngbin1920 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.pngbin0 -> 762 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.pngbin0 -> 2996 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.pngbin3812 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.pngbin2505 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/list_item_more.9.pngbin0 -> 5838 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.pngbin2505 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/main_exit.pngbin4532 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/main_help.pngbin4123 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/main_select_server.pngbin4458 -> 1920 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/main_settings.pngbin3401 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/main_shuffle.pngbin4445 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/menu_search.pngbin3808 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/select_artist_folder.pngbin4458 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable/btn_check.xml28
-rw-r--r--subsonic-android/res/layout/album_list_item.xml2
-rw-r--r--subsonic-android/res/layout/artist_list_item.xml2
-rw-r--r--subsonic-android/res/layout/main_buttons.xml10
-rw-r--r--subsonic-android/res/layout/playlist_list_item.xml2
-rw-r--r--subsonic-android/res/layout/select_artist_header.xml2
-rw-r--r--subsonic-android/res/layout/song_list_item.xml2
21 files changed, 38 insertions, 10 deletions
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
--- a/subsonic-android/res/drawable-hdpi-v4/action_select_artist_folder.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_off.png
Binary files 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
--- /dev/null
+++ b/subsonic-android/res/drawable-hdpi-v4/btn_check_buttonless_on.png
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_settings.png
+++ /dev/null
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/list_item_artist.9.png
+++ /dev/null
Binary files 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
--- /dev/null
+++ b/subsonic-android/res/drawable-hdpi-v4/list_item_more.9.png
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/list_item_playlist.9.png
+++ /dev/null
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/main_exit.png
+++ /dev/null
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/main_help.png
+++ /dev/null
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/main_select_server.png
+++ b/subsonic-android/res/drawable-hdpi-v4/main_select_server.png
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/main_settings.png
+++ /dev/null
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/main_shuffle.png
+++ /dev/null
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/menu_search.png
+++ /dev/null
Binary files 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
--- a/subsonic-android/res/drawable-hdpi-v4/select_artist_folder.png
+++ /dev/null
Binary files 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"