From a3d2ba2009f61869762c655b3ab6f46b414b0b35 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 13 Sep 2013 10:41:17 -0700 Subject: Closes #150 Add notification while background downloading --- res/drawable-mdpi/stat_notify_download.png | Bin 0 -> 272 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 res/drawable-mdpi/stat_notify_download.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-mdpi/stat_notify_download.png b/res/drawable-mdpi/stat_notify_download.png new file mode 100644 index 00000000..4c2a22de Binary files /dev/null and b/res/drawable-mdpi/stat_notify_download.png differ -- cgit v1.2.3 From b6da1f99f134ffe1a60910ae0ef3addf75dfb9ab Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Mon, 14 Oct 2013 22:00:55 -0700 Subject: Missed in commit --- res/drawable-hdpi/ic_drawer.png | Bin 0 -> 2829 bytes res/drawable-mdpi/ic_drawer.png | Bin 0 -> 2820 bytes res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 2836 bytes res/drawable-xxhdpi/ic_drawer.png | Bin 0 -> 202 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 res/drawable-hdpi/ic_drawer.png create mode 100644 res/drawable-mdpi/ic_drawer.png create mode 100644 res/drawable-xhdpi/ic_drawer.png create mode 100644 res/drawable-xxhdpi/ic_drawer.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png new file mode 100644 index 00000000..c59f601c Binary files /dev/null and b/res/drawable-hdpi/ic_drawer.png differ diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png new file mode 100644 index 00000000..1ed2c56e Binary files /dev/null and b/res/drawable-mdpi/ic_drawer.png differ diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png new file mode 100644 index 00000000..a5fa74de Binary files /dev/null and b/res/drawable-xhdpi/ic_drawer.png differ diff --git a/res/drawable-xxhdpi/ic_drawer.png b/res/drawable-xxhdpi/ic_drawer.png new file mode 100644 index 00000000..9c4685d6 Binary files /dev/null and b/res/drawable-xxhdpi/ic_drawer.png differ -- cgit v1.2.3 From f485e54048ea911039448987552269429e3de9a4 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Wed, 6 Nov 2013 17:24:32 -0800 Subject: Closes #178 Made persistent notification more like standard, updated icons --- res/drawable-hdpi-v11/notification_close.png | Bin 0 -> 384 bytes res/drawable-hdpi-v11/notification_next.png | Bin 0 -> 525 bytes res/drawable-hdpi-v11/notification_pause.png | Bin 0 -> 210 bytes res/drawable-hdpi-v11/notification_play.png | Bin 0 -> 385 bytes res/drawable-hdpi-v11/notification_previous.png | Bin 0 -> 541 bytes res/drawable-hdpi/notification_close.png | Bin 0 -> 501 bytes res/drawable-hdpi/notification_next.png | Bin 941 -> 651 bytes res/drawable-hdpi/notification_pause.png | Bin 233 -> 459 bytes res/drawable-hdpi/notification_play.png | Bin 807 -> 599 bytes res/drawable-hdpi/notification_prev.png | Bin 957 -> 0 bytes res/drawable-hdpi/notification_previous.png | Bin 0 -> 633 bytes res/drawable-hdpi/notification_stop.png | Bin 338 -> 0 bytes res/drawable-mdpi-v11/notification_close.png | Bin 0 -> 241 bytes res/drawable-mdpi-v11/notification_next.png | Bin 0 -> 341 bytes res/drawable-mdpi-v11/notification_pause.png | Bin 0 -> 156 bytes res/drawable-mdpi-v11/notification_play.png | Bin 0 -> 280 bytes res/drawable-mdpi-v11/notification_previous.png | Bin 0 -> 355 bytes res/drawable-mdpi/notification_close.png | Bin 0 -> 337 bytes res/drawable-mdpi/notification_next.png | Bin 0 -> 460 bytes res/drawable-mdpi/notification_pause.png | Bin 0 -> 361 bytes res/drawable-mdpi/notification_play.png | Bin 0 -> 417 bytes res/drawable-mdpi/notification_previous.png | Bin 0 -> 476 bytes res/drawable-xhdpi-v11/notification_close.png | Bin 0 -> 491 bytes res/drawable-xhdpi-v11/notification_next.png | Bin 0 -> 731 bytes res/drawable-xhdpi-v11/notification_pause.png | Bin 0 -> 257 bytes res/drawable-xhdpi-v11/notification_play.png | Bin 0 -> 493 bytes res/drawable-xhdpi-v11/notification_previous.png | Bin 0 -> 750 bytes res/drawable-xhdpi/notification_close.png | Bin 0 -> 538 bytes res/drawable-xhdpi/notification_next.png | Bin 0 -> 886 bytes res/drawable-xhdpi/notification_pause.png | Bin 0 -> 529 bytes res/drawable-xhdpi/notification_play.png | Bin 0 -> 753 bytes res/drawable-xhdpi/notification_previous.png | Bin 0 -> 891 bytes res/drawable-xxhdpi-v11/notification_close.png | Bin 0 -> 712 bytes res/drawable-xxhdpi-v11/notification_next.png | Bin 0 -> 1105 bytes res/drawable-xxhdpi-v11/notification_pause.png | Bin 0 -> 358 bytes res/drawable-xxhdpi-v11/notification_play.png | Bin 0 -> 781 bytes res/drawable-xxhdpi-v11/notification_previous.png | Bin 0 -> 1143 bytes res/drawable-xxhdpi/notification_close.png | Bin 0 -> 1081 bytes res/drawable-xxhdpi/notification_next.png | Bin 0 -> 1292 bytes res/drawable-xxhdpi/notification_pause.png | Bin 0 -> 724 bytes res/drawable-xxhdpi/notification_play.png | Bin 0 -> 1125 bytes res/drawable-xxhdpi/notification_previous.png | Bin 0 -> 1261 bytes res/layout/notification.xml | 120 +++++++++------------- res/layout/notification_expanded.xml | 2 +- src/github/daneren2005/dsub/util/Util.java | 63 ++++++++---- 45 files changed, 94 insertions(+), 91 deletions(-) create mode 100644 res/drawable-hdpi-v11/notification_close.png create mode 100644 res/drawable-hdpi-v11/notification_next.png create mode 100644 res/drawable-hdpi-v11/notification_pause.png create mode 100644 res/drawable-hdpi-v11/notification_play.png create mode 100644 res/drawable-hdpi-v11/notification_previous.png create mode 100644 res/drawable-hdpi/notification_close.png delete mode 100644 res/drawable-hdpi/notification_prev.png create mode 100644 res/drawable-hdpi/notification_previous.png delete mode 100644 res/drawable-hdpi/notification_stop.png create mode 100644 res/drawable-mdpi-v11/notification_close.png create mode 100644 res/drawable-mdpi-v11/notification_next.png create mode 100644 res/drawable-mdpi-v11/notification_pause.png create mode 100644 res/drawable-mdpi-v11/notification_play.png create mode 100644 res/drawable-mdpi-v11/notification_previous.png create mode 100644 res/drawable-mdpi/notification_close.png create mode 100644 res/drawable-mdpi/notification_next.png create mode 100644 res/drawable-mdpi/notification_pause.png create mode 100644 res/drawable-mdpi/notification_play.png create mode 100644 res/drawable-mdpi/notification_previous.png create mode 100644 res/drawable-xhdpi-v11/notification_close.png create mode 100644 res/drawable-xhdpi-v11/notification_next.png create mode 100644 res/drawable-xhdpi-v11/notification_pause.png create mode 100644 res/drawable-xhdpi-v11/notification_play.png create mode 100644 res/drawable-xhdpi-v11/notification_previous.png create mode 100644 res/drawable-xhdpi/notification_close.png create mode 100644 res/drawable-xhdpi/notification_next.png create mode 100644 res/drawable-xhdpi/notification_pause.png create mode 100644 res/drawable-xhdpi/notification_play.png create mode 100644 res/drawable-xhdpi/notification_previous.png create mode 100644 res/drawable-xxhdpi-v11/notification_close.png create mode 100644 res/drawable-xxhdpi-v11/notification_next.png create mode 100644 res/drawable-xxhdpi-v11/notification_pause.png create mode 100644 res/drawable-xxhdpi-v11/notification_play.png create mode 100644 res/drawable-xxhdpi-v11/notification_previous.png create mode 100644 res/drawable-xxhdpi/notification_close.png create mode 100644 res/drawable-xxhdpi/notification_next.png create mode 100644 res/drawable-xxhdpi/notification_pause.png create mode 100644 res/drawable-xxhdpi/notification_play.png create mode 100644 res/drawable-xxhdpi/notification_previous.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi-v11/notification_close.png b/res/drawable-hdpi-v11/notification_close.png new file mode 100644 index 00000000..254e130f Binary files /dev/null and b/res/drawable-hdpi-v11/notification_close.png differ diff --git a/res/drawable-hdpi-v11/notification_next.png b/res/drawable-hdpi-v11/notification_next.png new file mode 100644 index 00000000..59239305 Binary files /dev/null and b/res/drawable-hdpi-v11/notification_next.png differ diff --git a/res/drawable-hdpi-v11/notification_pause.png b/res/drawable-hdpi-v11/notification_pause.png new file mode 100644 index 00000000..cbd61795 Binary files /dev/null and b/res/drawable-hdpi-v11/notification_pause.png differ diff --git a/res/drawable-hdpi-v11/notification_play.png b/res/drawable-hdpi-v11/notification_play.png new file mode 100644 index 00000000..78b4d5bf Binary files /dev/null and b/res/drawable-hdpi-v11/notification_play.png differ diff --git a/res/drawable-hdpi-v11/notification_previous.png b/res/drawable-hdpi-v11/notification_previous.png new file mode 100644 index 00000000..556eaec3 Binary files /dev/null and b/res/drawable-hdpi-v11/notification_previous.png differ diff --git a/res/drawable-hdpi/notification_close.png b/res/drawable-hdpi/notification_close.png new file mode 100644 index 00000000..916c9a0f Binary files /dev/null and b/res/drawable-hdpi/notification_close.png differ diff --git a/res/drawable-hdpi/notification_next.png b/res/drawable-hdpi/notification_next.png index 5835f654..078c310f 100644 Binary files a/res/drawable-hdpi/notification_next.png and b/res/drawable-hdpi/notification_next.png differ diff --git a/res/drawable-hdpi/notification_pause.png b/res/drawable-hdpi/notification_pause.png index 3324f88f..16627e44 100644 Binary files a/res/drawable-hdpi/notification_pause.png and b/res/drawable-hdpi/notification_pause.png differ diff --git a/res/drawable-hdpi/notification_play.png b/res/drawable-hdpi/notification_play.png index 8c95b6a5..02f38944 100644 Binary files a/res/drawable-hdpi/notification_play.png and b/res/drawable-hdpi/notification_play.png differ diff --git a/res/drawable-hdpi/notification_prev.png b/res/drawable-hdpi/notification_prev.png deleted file mode 100644 index 73fb16f2..00000000 Binary files a/res/drawable-hdpi/notification_prev.png and /dev/null differ diff --git a/res/drawable-hdpi/notification_previous.png b/res/drawable-hdpi/notification_previous.png new file mode 100644 index 00000000..9d10abd9 Binary files /dev/null and b/res/drawable-hdpi/notification_previous.png differ diff --git a/res/drawable-hdpi/notification_stop.png b/res/drawable-hdpi/notification_stop.png deleted file mode 100644 index ab98e188..00000000 Binary files a/res/drawable-hdpi/notification_stop.png and /dev/null differ diff --git a/res/drawable-mdpi-v11/notification_close.png b/res/drawable-mdpi-v11/notification_close.png new file mode 100644 index 00000000..a056fe61 Binary files /dev/null and b/res/drawable-mdpi-v11/notification_close.png differ diff --git a/res/drawable-mdpi-v11/notification_next.png b/res/drawable-mdpi-v11/notification_next.png new file mode 100644 index 00000000..7297577f Binary files /dev/null and b/res/drawable-mdpi-v11/notification_next.png differ diff --git a/res/drawable-mdpi-v11/notification_pause.png b/res/drawable-mdpi-v11/notification_pause.png new file mode 100644 index 00000000..5d3ca3f2 Binary files /dev/null and b/res/drawable-mdpi-v11/notification_pause.png differ diff --git a/res/drawable-mdpi-v11/notification_play.png b/res/drawable-mdpi-v11/notification_play.png new file mode 100644 index 00000000..999ce798 Binary files /dev/null and b/res/drawable-mdpi-v11/notification_play.png differ diff --git a/res/drawable-mdpi-v11/notification_previous.png b/res/drawable-mdpi-v11/notification_previous.png new file mode 100644 index 00000000..55a1f326 Binary files /dev/null and b/res/drawable-mdpi-v11/notification_previous.png differ diff --git a/res/drawable-mdpi/notification_close.png b/res/drawable-mdpi/notification_close.png new file mode 100644 index 00000000..2a8f9a36 Binary files /dev/null and b/res/drawable-mdpi/notification_close.png differ diff --git a/res/drawable-mdpi/notification_next.png b/res/drawable-mdpi/notification_next.png new file mode 100644 index 00000000..f85d45a5 Binary files /dev/null and b/res/drawable-mdpi/notification_next.png differ diff --git a/res/drawable-mdpi/notification_pause.png b/res/drawable-mdpi/notification_pause.png new file mode 100644 index 00000000..06c3cf9d Binary files /dev/null and b/res/drawable-mdpi/notification_pause.png differ diff --git a/res/drawable-mdpi/notification_play.png b/res/drawable-mdpi/notification_play.png new file mode 100644 index 00000000..0248c1cc Binary files /dev/null and b/res/drawable-mdpi/notification_play.png differ diff --git a/res/drawable-mdpi/notification_previous.png b/res/drawable-mdpi/notification_previous.png new file mode 100644 index 00000000..167d7d05 Binary files /dev/null and b/res/drawable-mdpi/notification_previous.png differ diff --git a/res/drawable-xhdpi-v11/notification_close.png b/res/drawable-xhdpi-v11/notification_close.png new file mode 100644 index 00000000..f1013578 Binary files /dev/null and b/res/drawable-xhdpi-v11/notification_close.png differ diff --git a/res/drawable-xhdpi-v11/notification_next.png b/res/drawable-xhdpi-v11/notification_next.png new file mode 100644 index 00000000..ad070680 Binary files /dev/null and b/res/drawable-xhdpi-v11/notification_next.png differ diff --git a/res/drawable-xhdpi-v11/notification_pause.png b/res/drawable-xhdpi-v11/notification_pause.png new file mode 100644 index 00000000..709602aa Binary files /dev/null and b/res/drawable-xhdpi-v11/notification_pause.png differ diff --git a/res/drawable-xhdpi-v11/notification_play.png b/res/drawable-xhdpi-v11/notification_play.png new file mode 100644 index 00000000..e2bafa6a Binary files /dev/null and b/res/drawable-xhdpi-v11/notification_play.png differ diff --git a/res/drawable-xhdpi-v11/notification_previous.png b/res/drawable-xhdpi-v11/notification_previous.png new file mode 100644 index 00000000..d22488cb Binary files /dev/null and b/res/drawable-xhdpi-v11/notification_previous.png differ diff --git a/res/drawable-xhdpi/notification_close.png b/res/drawable-xhdpi/notification_close.png new file mode 100644 index 00000000..4230842e Binary files /dev/null and b/res/drawable-xhdpi/notification_close.png differ diff --git a/res/drawable-xhdpi/notification_next.png b/res/drawable-xhdpi/notification_next.png new file mode 100644 index 00000000..44dbbd12 Binary files /dev/null and b/res/drawable-xhdpi/notification_next.png differ diff --git a/res/drawable-xhdpi/notification_pause.png b/res/drawable-xhdpi/notification_pause.png new file mode 100644 index 00000000..e8d8c535 Binary files /dev/null and b/res/drawable-xhdpi/notification_pause.png differ diff --git a/res/drawable-xhdpi/notification_play.png b/res/drawable-xhdpi/notification_play.png new file mode 100644 index 00000000..532041fa Binary files /dev/null and b/res/drawable-xhdpi/notification_play.png differ diff --git a/res/drawable-xhdpi/notification_previous.png b/res/drawable-xhdpi/notification_previous.png new file mode 100644 index 00000000..87ee8d2f Binary files /dev/null and b/res/drawable-xhdpi/notification_previous.png differ diff --git a/res/drawable-xxhdpi-v11/notification_close.png b/res/drawable-xxhdpi-v11/notification_close.png new file mode 100644 index 00000000..c3ac026a Binary files /dev/null and b/res/drawable-xxhdpi-v11/notification_close.png differ diff --git a/res/drawable-xxhdpi-v11/notification_next.png b/res/drawable-xxhdpi-v11/notification_next.png new file mode 100644 index 00000000..06911082 Binary files /dev/null and b/res/drawable-xxhdpi-v11/notification_next.png differ diff --git a/res/drawable-xxhdpi-v11/notification_pause.png b/res/drawable-xxhdpi-v11/notification_pause.png new file mode 100644 index 00000000..1513f9d9 Binary files /dev/null and b/res/drawable-xxhdpi-v11/notification_pause.png differ diff --git a/res/drawable-xxhdpi-v11/notification_play.png b/res/drawable-xxhdpi-v11/notification_play.png new file mode 100644 index 00000000..9138a760 Binary files /dev/null and b/res/drawable-xxhdpi-v11/notification_play.png differ diff --git a/res/drawable-xxhdpi-v11/notification_previous.png b/res/drawable-xxhdpi-v11/notification_previous.png new file mode 100644 index 00000000..b4456c16 Binary files /dev/null and b/res/drawable-xxhdpi-v11/notification_previous.png differ diff --git a/res/drawable-xxhdpi/notification_close.png b/res/drawable-xxhdpi/notification_close.png new file mode 100644 index 00000000..022a6780 Binary files /dev/null and b/res/drawable-xxhdpi/notification_close.png differ diff --git a/res/drawable-xxhdpi/notification_next.png b/res/drawable-xxhdpi/notification_next.png new file mode 100644 index 00000000..dfe129db Binary files /dev/null and b/res/drawable-xxhdpi/notification_next.png differ diff --git a/res/drawable-xxhdpi/notification_pause.png b/res/drawable-xxhdpi/notification_pause.png new file mode 100644 index 00000000..9c952207 Binary files /dev/null and b/res/drawable-xxhdpi/notification_pause.png differ diff --git a/res/drawable-xxhdpi/notification_play.png b/res/drawable-xxhdpi/notification_play.png new file mode 100644 index 00000000..4ee0a5eb Binary files /dev/null and b/res/drawable-xxhdpi/notification_play.png differ diff --git a/res/drawable-xxhdpi/notification_previous.png b/res/drawable-xxhdpi/notification_previous.png new file mode 100644 index 00000000..e6908126 Binary files /dev/null and b/res/drawable-xxhdpi/notification_previous.png differ diff --git a/res/layout/notification.xml b/res/layout/notification.xml index 22e2cb63..55c7be2a 100644 --- a/res/layout/notification.xml +++ b/res/layout/notification.xml @@ -14,10 +14,12 @@ + android:paddingLeft="11.0dip" + android:layout_gravity="center_vertical"> - - - - - + - - + + - + - + - - - + diff --git a/res/layout/notification_expanded.xml b/res/layout/notification_expanded.xml index 70e7269c..e2246506 100644 --- a/res/layout/notification_expanded.xml +++ b/res/layout/notification_expanded.xml @@ -70,7 +70,7 @@ android:layout_weight="0.0" android:background="@drawable/btn_bg" android:scaleType="fitXY" - android:src="@drawable/notification_prev" /> + android:src="@drawable/notification_previous" /> 0) { Intent prevIntent = new Intent("KEYCODE_MEDIA_PREVIOUS"); prevIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class)); prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PREVIOUS)); pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0); - rv.setOnClickPendingIntent(R.id.control_previous, pendingIntent); - } else { + rv.setOnClickPendingIntent(previous, pendingIntent); + } + if(pause > 0) { + if(playing) { + Intent pauseIntent = new Intent("KEYCODE_MEDIA_PLAY_PAUSE"); + pauseIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class)); + pauseIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); + pendingIntent = PendingIntent.getService(context, 0, pauseIntent, 0); + rv.setOnClickPendingIntent(pause, pendingIntent); + } else { + Intent prevIntent = new Intent("KEYCODE_MEDIA_START"); + prevIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class)); + prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY)); + pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0); + rv.setOnClickPendingIntent(pause, pendingIntent); + } + } + if(next > 0) { + Intent nextIntent = new Intent("KEYCODE_MEDIA_NEXT"); + nextIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class)); + nextIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT)); + pendingIntent = PendingIntent.getService(context, 0, nextIntent, 0); + rv.setOnClickPendingIntent(next, pendingIntent); + } + if(close > 0) { Intent prevIntent = new Intent("KEYCODE_MEDIA_STOP"); prevIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class)); prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_STOP)); pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0); - rv.setOnClickPendingIntent(R.id.control_previous, pendingIntent); + rv.setOnClickPendingIntent(close, pendingIntent); } - - Intent pauseIntent = new Intent("KEYCODE_MEDIA_PLAY_PAUSE"); - pauseIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class)); - pauseIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE)); - pendingIntent = PendingIntent.getService(context, 0, pauseIntent, 0); - rv.setOnClickPendingIntent(R.id.control_pause, pendingIntent); - - Intent nextIntent = new Intent("KEYCODE_MEDIA_NEXT"); - nextIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class)); - nextIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT)); - pendingIntent = PendingIntent.getService(context, 0, nextIntent, 0); - rv.setOnClickPendingIntent(R.id.control_next, pendingIntent); } public static void hidePlayingNotification(final Context context, final DownloadServiceImpl downloadService, Handler handler) { -- cgit v1.2.3 From 829257356ed808675b2ee0b55add8a09605fc3dc Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 7 Nov 2013 18:11:06 -0800 Subject: Update icons for notification icon + song view now playing --- res/drawable-hdpi-v11/stat_notify_playing.png | Bin 0 -> 385 bytes res/drawable-hdpi/now_playing.png | Bin 0 -> 599 bytes res/drawable-hdpi/stat_notify_playing.png | Bin 716 -> 599 bytes res/drawable-mdpi-v11/stat_notify_playing.png | Bin 0 -> 280 bytes res/drawable-mdpi/now_playing.png | Bin 0 -> 417 bytes res/drawable-mdpi/stat_notify_playing.png | Bin 0 -> 417 bytes res/drawable-xhdpi-v11/stat_notify_playing.png | Bin 0 -> 493 bytes res/drawable-xhdpi/now_playing.png | Bin 0 -> 753 bytes res/drawable-xhdpi/stat_notify_playing.png | Bin 0 -> 753 bytes res/drawable-xxhdpi-v11/stat_notify_playing.png | Bin 0 -> 781 bytes res/drawable-xxhdpi/now_playing.png | Bin 0 -> 1125 bytes res/drawable-xxhdpi/stat_notify_playing.png | Bin 0 -> 1125 bytes src/github/daneren2005/dsub/view/SongView.java | 2 +- 13 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 res/drawable-hdpi-v11/stat_notify_playing.png create mode 100644 res/drawable-hdpi/now_playing.png create mode 100644 res/drawable-mdpi-v11/stat_notify_playing.png create mode 100644 res/drawable-mdpi/now_playing.png create mode 100644 res/drawable-mdpi/stat_notify_playing.png create mode 100644 res/drawable-xhdpi-v11/stat_notify_playing.png create mode 100644 res/drawable-xhdpi/now_playing.png create mode 100644 res/drawable-xhdpi/stat_notify_playing.png create mode 100644 res/drawable-xxhdpi-v11/stat_notify_playing.png create mode 100644 res/drawable-xxhdpi/now_playing.png create mode 100644 res/drawable-xxhdpi/stat_notify_playing.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi-v11/stat_notify_playing.png b/res/drawable-hdpi-v11/stat_notify_playing.png new file mode 100644 index 00000000..78b4d5bf Binary files /dev/null and b/res/drawable-hdpi-v11/stat_notify_playing.png differ diff --git a/res/drawable-hdpi/now_playing.png b/res/drawable-hdpi/now_playing.png new file mode 100644 index 00000000..02f38944 Binary files /dev/null and b/res/drawable-hdpi/now_playing.png differ diff --git a/res/drawable-hdpi/stat_notify_playing.png b/res/drawable-hdpi/stat_notify_playing.png index bfd3e6a5..02f38944 100644 Binary files a/res/drawable-hdpi/stat_notify_playing.png and b/res/drawable-hdpi/stat_notify_playing.png differ diff --git a/res/drawable-mdpi-v11/stat_notify_playing.png b/res/drawable-mdpi-v11/stat_notify_playing.png new file mode 100644 index 00000000..999ce798 Binary files /dev/null and b/res/drawable-mdpi-v11/stat_notify_playing.png differ diff --git a/res/drawable-mdpi/now_playing.png b/res/drawable-mdpi/now_playing.png new file mode 100644 index 00000000..0248c1cc Binary files /dev/null and b/res/drawable-mdpi/now_playing.png differ diff --git a/res/drawable-mdpi/stat_notify_playing.png b/res/drawable-mdpi/stat_notify_playing.png new file mode 100644 index 00000000..0248c1cc Binary files /dev/null and b/res/drawable-mdpi/stat_notify_playing.png differ diff --git a/res/drawable-xhdpi-v11/stat_notify_playing.png b/res/drawable-xhdpi-v11/stat_notify_playing.png new file mode 100644 index 00000000..e2bafa6a Binary files /dev/null and b/res/drawable-xhdpi-v11/stat_notify_playing.png differ diff --git a/res/drawable-xhdpi/now_playing.png b/res/drawable-xhdpi/now_playing.png new file mode 100644 index 00000000..532041fa Binary files /dev/null and b/res/drawable-xhdpi/now_playing.png differ diff --git a/res/drawable-xhdpi/stat_notify_playing.png b/res/drawable-xhdpi/stat_notify_playing.png new file mode 100644 index 00000000..532041fa Binary files /dev/null and b/res/drawable-xhdpi/stat_notify_playing.png differ diff --git a/res/drawable-xxhdpi-v11/stat_notify_playing.png b/res/drawable-xxhdpi-v11/stat_notify_playing.png new file mode 100644 index 00000000..9138a760 Binary files /dev/null and b/res/drawable-xxhdpi-v11/stat_notify_playing.png differ diff --git a/res/drawable-xxhdpi/now_playing.png b/res/drawable-xxhdpi/now_playing.png new file mode 100644 index 00000000..4ee0a5eb Binary files /dev/null and b/res/drawable-xxhdpi/now_playing.png differ diff --git a/res/drawable-xxhdpi/stat_notify_playing.png b/res/drawable-xxhdpi/stat_notify_playing.png new file mode 100644 index 00000000..4ee0a5eb Binary files /dev/null and b/res/drawable-xxhdpi/stat_notify_playing.png differ diff --git a/src/github/daneren2005/dsub/view/SongView.java b/src/github/daneren2005/dsub/view/SongView.java index 95a80f6c..8e10a97f 100644 --- a/src/github/daneren2005/dsub/view/SongView.java +++ b/src/github/daneren2005/dsub/view/SongView.java @@ -222,7 +222,7 @@ public class SongView extends UpdateView implements Checkable { if (playing) { if(!this.playing) { this.playing = playing; - titleTextView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.stat_notify_playing, 0, 0, 0); + titleTextView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.now_playing, 0, 0, 0); } } else { if(this.playing) { -- cgit v1.2.3 From 506f620f11708d36d89867e43156b4c42dfdcc03 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 8 Nov 2013 18:24:47 -0800 Subject: Updated list_item_more icons to something better --- res/drawable-hdpi/download_cached.png | Bin 0 -> 1172 bytes res/drawable-hdpi/download_none_dark.png | Bin 0 -> 342 bytes res/drawable-hdpi/download_none_light.png | Bin 0 -> 374 bytes res/drawable-hdpi/download_pinned.png | Bin 0 -> 1112 bytes res/drawable-hdpi/list_item_more.9.png | Bin 5838 -> 0 bytes res/drawable-hdpi/list_item_more_saved.9.png | Bin 5919 -> 0 bytes res/drawable-hdpi/list_item_more_shaded.9.png | Bin 5994 -> 0 bytes res/drawable-mdpi/download_cached.png | Bin 0 -> 824 bytes res/drawable-mdpi/download_none_dark.png | Bin 0 -> 216 bytes res/drawable-mdpi/download_none_light.png | Bin 0 -> 239 bytes res/drawable-mdpi/download_pinned.png | Bin 0 -> 841 bytes res/drawable-xhdpi/download_cached.png | Bin 0 -> 1721 bytes res/drawable-xhdpi/download_none_dark.png | Bin 0 -> 355 bytes res/drawable-xhdpi/download_none_light.png | Bin 0 -> 375 bytes res/drawable-xhdpi/download_pinned.png | Bin 0 -> 1750 bytes res/drawable-xxhdpi/download_none_dark.png | Bin 0 -> 617 bytes res/drawable-xxhdpi/download_none_light.png | Bin 0 -> 639 bytes res/layout/album_list_item.xml | 2 +- res/layout/artist_list_item.xml | 2 +- res/layout/main_buttons.xml | 7 ------- res/layout/playlist_list_item.xml | 2 +- res/layout/song_list_item.xml | 2 +- res/values/attrs.xml | 3 ++- res/values/themes.xml | 3 +++ src/github/daneren2005/dsub/view/SongView.java | 15 ++++++++------- src/github/daneren2005/dsub/view/UpdateView.java | 11 ++++++++--- 26 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 res/drawable-hdpi/download_cached.png create mode 100644 res/drawable-hdpi/download_none_dark.png create mode 100644 res/drawable-hdpi/download_none_light.png create mode 100644 res/drawable-hdpi/download_pinned.png delete mode 100644 res/drawable-hdpi/list_item_more.9.png delete mode 100644 res/drawable-hdpi/list_item_more_saved.9.png delete mode 100644 res/drawable-hdpi/list_item_more_shaded.9.png create mode 100644 res/drawable-mdpi/download_cached.png create mode 100644 res/drawable-mdpi/download_none_dark.png create mode 100644 res/drawable-mdpi/download_none_light.png create mode 100644 res/drawable-mdpi/download_pinned.png create mode 100644 res/drawable-xhdpi/download_cached.png create mode 100644 res/drawable-xhdpi/download_none_dark.png create mode 100644 res/drawable-xhdpi/download_none_light.png create mode 100644 res/drawable-xhdpi/download_pinned.png create mode 100644 res/drawable-xxhdpi/download_none_dark.png create mode 100644 res/drawable-xxhdpi/download_none_light.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi/download_cached.png b/res/drawable-hdpi/download_cached.png new file mode 100644 index 00000000..d935cb2c Binary files /dev/null and b/res/drawable-hdpi/download_cached.png differ diff --git a/res/drawable-hdpi/download_none_dark.png b/res/drawable-hdpi/download_none_dark.png new file mode 100644 index 00000000..a074c10d Binary files /dev/null and b/res/drawable-hdpi/download_none_dark.png differ diff --git a/res/drawable-hdpi/download_none_light.png b/res/drawable-hdpi/download_none_light.png new file mode 100644 index 00000000..21544e5f Binary files /dev/null and b/res/drawable-hdpi/download_none_light.png differ diff --git a/res/drawable-hdpi/download_pinned.png b/res/drawable-hdpi/download_pinned.png new file mode 100644 index 00000000..b5b6dfb1 Binary files /dev/null and b/res/drawable-hdpi/download_pinned.png differ diff --git a/res/drawable-hdpi/list_item_more.9.png b/res/drawable-hdpi/list_item_more.9.png deleted file mode 100644 index 79ca860d..00000000 Binary files a/res/drawable-hdpi/list_item_more.9.png and /dev/null differ diff --git a/res/drawable-hdpi/list_item_more_saved.9.png b/res/drawable-hdpi/list_item_more_saved.9.png deleted file mode 100644 index f3805bfb..00000000 Binary files a/res/drawable-hdpi/list_item_more_saved.9.png and /dev/null differ diff --git a/res/drawable-hdpi/list_item_more_shaded.9.png b/res/drawable-hdpi/list_item_more_shaded.9.png deleted file mode 100644 index 99c2f5b8..00000000 Binary files a/res/drawable-hdpi/list_item_more_shaded.9.png and /dev/null differ diff --git a/res/drawable-mdpi/download_cached.png b/res/drawable-mdpi/download_cached.png new file mode 100644 index 00000000..fa02cc7c Binary files /dev/null and b/res/drawable-mdpi/download_cached.png differ diff --git a/res/drawable-mdpi/download_none_dark.png b/res/drawable-mdpi/download_none_dark.png new file mode 100644 index 00000000..b6d614fc Binary files /dev/null and b/res/drawable-mdpi/download_none_dark.png differ diff --git a/res/drawable-mdpi/download_none_light.png b/res/drawable-mdpi/download_none_light.png new file mode 100644 index 00000000..2485c570 Binary files /dev/null and b/res/drawable-mdpi/download_none_light.png differ diff --git a/res/drawable-mdpi/download_pinned.png b/res/drawable-mdpi/download_pinned.png new file mode 100644 index 00000000..8e6e8e7a Binary files /dev/null and b/res/drawable-mdpi/download_pinned.png differ diff --git a/res/drawable-xhdpi/download_cached.png b/res/drawable-xhdpi/download_cached.png new file mode 100644 index 00000000..1ef7c805 Binary files /dev/null and b/res/drawable-xhdpi/download_cached.png differ diff --git a/res/drawable-xhdpi/download_none_dark.png b/res/drawable-xhdpi/download_none_dark.png new file mode 100644 index 00000000..7be3c2a4 Binary files /dev/null and b/res/drawable-xhdpi/download_none_dark.png differ diff --git a/res/drawable-xhdpi/download_none_light.png b/res/drawable-xhdpi/download_none_light.png new file mode 100644 index 00000000..817651d7 Binary files /dev/null and b/res/drawable-xhdpi/download_none_light.png differ diff --git a/res/drawable-xhdpi/download_pinned.png b/res/drawable-xhdpi/download_pinned.png new file mode 100644 index 00000000..09eb6ffb Binary files /dev/null and b/res/drawable-xhdpi/download_pinned.png differ diff --git a/res/drawable-xxhdpi/download_none_dark.png b/res/drawable-xxhdpi/download_none_dark.png new file mode 100644 index 00000000..a0cb8a41 Binary files /dev/null and b/res/drawable-xxhdpi/download_none_dark.png differ diff --git a/res/drawable-xxhdpi/download_none_light.png b/res/drawable-xxhdpi/download_none_light.png new file mode 100644 index 00000000..7a1639ef Binary files /dev/null and b/res/drawable-xxhdpi/download_none_light.png differ diff --git a/res/layout/album_list_item.xml b/res/layout/album_list_item.xml index ee710539..51b45b5d 100644 --- a/res/layout/album_list_item.xml +++ b/res/layout/album_list_item.xml @@ -51,7 +51,7 @@ - + + diff --git a/res/values/themes.xml b/res/values/themes.xml index 2a4382d4..4735b161 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -12,6 +12,7 @@ @drawable/media_stop_light @drawable/ic_menu_chat_light @drawable/ic_menu_chat_send_light + @drawable/download_none_light @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -28,6 +29,7 @@ @drawable/media_stop @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark + @drawable/download_none_dark @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -48,6 +50,7 @@ @drawable/media_stop @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark + @drawable/download_none_dark @style/DSub.TextViewStyle @style/DSub.ButtonStyle diff --git a/src/github/daneren2005/dsub/view/SongView.java b/src/github/daneren2005/dsub/view/SongView.java index 8e10a97f..24e2df0f 100644 --- a/src/github/daneren2005/dsub/view/SongView.java +++ b/src/github/daneren2005/dsub/view/SongView.java @@ -19,6 +19,7 @@ package github.daneren2005.dsub.view; import android.content.Context; +import android.content.res.TypedArray; import android.media.MediaMetadataRetriever; import android.util.Log; import android.view.LayoutInflater; @@ -42,8 +43,7 @@ import java.text.DateFormat; */ public class SongView extends UpdateView implements Checkable { private static final String TAG = SongView.class.getSimpleName(); - - private Context context; + private MusicDirectory.Entry song; private CheckedTextView checkedTextView; @@ -67,7 +67,6 @@ public class SongView extends UpdateView implements Checkable { public SongView(Context context) { super(context); - this.context = context; LayoutInflater.from(context).inflate(R.layout.song_list_item, this, true); checkedTextView = (CheckedTextView) findViewById(R.id.song_check); @@ -197,14 +196,16 @@ public class SongView extends UpdateView implements Checkable { int rightImage = 0; if (isWorkDone) { - int moreImage = isSaved ? R.drawable.list_item_more_saved : R.drawable.list_item_more_shaded; + int moreImage = isSaved ? R.drawable.download_pinned : R.drawable.download_cached; if(moreImage != this.moreImage) { moreButton.setImageResource(moreImage); this.moreImage = moreImage; } - } else if(this.moreImage != R.drawable.list_item_more) { - moreButton.setImageResource(R.drawable.list_item_more); - this.moreImage = R.drawable.list_item_more; + } else if(true) { + int[] attrs = new int[] {R.attr.download_none}; + TypedArray typedArray = context.obtainStyledAttributes(attrs); + moreButton.setImageResource(typedArray.getResourceId(0, 0)); + this.moreImage = R.drawable.download_none_light; } if (downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && partialFileExists) { diff --git a/src/github/daneren2005/dsub/view/UpdateView.java b/src/github/daneren2005/dsub/view/UpdateView.java index 20f9db9f..05b17417 100644 --- a/src/github/daneren2005/dsub/view/UpdateView.java +++ b/src/github/daneren2005/dsub/view/UpdateView.java @@ -19,6 +19,7 @@ package github.daneren2005.dsub.view; import android.content.Context; +import android.content.res.TypedArray; import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -41,7 +42,8 @@ public class UpdateView extends LinearLayout { private static Handler backgroundHandler; private static Handler uiHandler; private static Runnable updateRunnable; - + + protected Context context; protected ImageButton starButton; protected ImageView moreButton; @@ -52,6 +54,7 @@ public class UpdateView extends LinearLayout { public UpdateView(Context context) { super(context); + this.context = context; setLayoutParams(new AbsListView.LayoutParams( ViewGroup.LayoutParams.FILL_PARENT, @@ -168,12 +171,14 @@ public class UpdateView extends LinearLayout { if(moreButton != null) { if(exists) { if(!shaded) { - moreButton.setImageResource(R.drawable.list_item_more_shaded); + moreButton.setImageResource(R.drawable.download_cached); shaded = true; } } else { if(shaded) { - moreButton.setImageResource(R.drawable.list_item_more); + int[] attrs = new int[] {R.attr.download_none}; + TypedArray typedArray = context.obtainStyledAttributes(attrs); + moreButton.setImageResource(typedArray.getResourceId(0, 0)); shaded = false; } } -- cgit v1.2.3 From 9aed91fe7633857c29a600d3dc3c2b4c02affcd9 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 8 Nov 2013 18:43:01 -0800 Subject: More updates to icons for different themes/dpi --- res/drawable-hdpi/media_backward.png | Bin 939 -> 0 bytes res/drawable-hdpi/media_backward_dark.png | Bin 0 -> 579 bytes res/drawable-hdpi/media_backward_light.png | Bin 1106 -> 627 bytes res/drawable-hdpi/media_forward.png | Bin 913 -> 0 bytes res/drawable-hdpi/media_forward_dark.png | Bin 0 -> 559 bytes res/drawable-hdpi/media_forward_light.png | Bin 1128 -> 631 bytes res/drawable-hdpi/media_pause.png | Bin 168 -> 0 bytes res/drawable-hdpi/media_pause_dark.png | Bin 0 -> 276 bytes res/drawable-hdpi/media_pause_light.png | Bin 443 -> 301 bytes res/drawable-hdpi/media_start.png | Bin 742 -> 0 bytes res/drawable-hdpi/media_start_dark.png | Bin 0 -> 449 bytes res/drawable-hdpi/media_start_light.png | Bin 1121 -> 511 bytes res/drawable-hdpi/media_stop.png | Bin 162 -> 0 bytes res/drawable-hdpi/media_stop_dark.png | Bin 0 -> 265 bytes res/drawable-hdpi/media_stop_light.png | Bin 301 -> 274 bytes res/drawable-mdpi/media_backward_dark.png | Bin 0 -> 378 bytes res/drawable-mdpi/media_backward_light.png | Bin 0 -> 412 bytes res/drawable-mdpi/media_forward_dark.png | Bin 0 -> 372 bytes res/drawable-mdpi/media_forward_light.png | Bin 0 -> 417 bytes res/drawable-mdpi/media_pause_dark.png | Bin 0 -> 169 bytes res/drawable-mdpi/media_pause_light.png | Bin 0 -> 192 bytes res/drawable-mdpi/media_start_dark.png | Bin 0 -> 301 bytes res/drawable-mdpi/media_start_light.png | Bin 0 -> 335 bytes res/drawable-mdpi/media_stop_dark.png | Bin 0 -> 154 bytes res/drawable-mdpi/media_stop_light.png | Bin 0 -> 162 bytes res/drawable-xhdpi/media_backward_dark.png | Bin 0 -> 778 bytes res/drawable-xhdpi/media_backward_light.png | Bin 0 -> 860 bytes res/drawable-xhdpi/media_forward_dark.png | Bin 0 -> 716 bytes res/drawable-xhdpi/media_forward_light.png | Bin 0 -> 834 bytes res/drawable-xhdpi/media_pause_dark.png | Bin 0 -> 314 bytes res/drawable-xhdpi/media_pause_light.png | Bin 0 -> 333 bytes res/drawable-xhdpi/media_start_dark.png | Bin 0 -> 580 bytes res/drawable-xhdpi/media_start_light.png | Bin 0 -> 649 bytes res/drawable-xhdpi/media_stop_dark.png | Bin 0 -> 298 bytes res/drawable-xhdpi/media_stop_light.png | Bin 0 -> 307 bytes res/drawable-xxhdpi/media_backward_dark.png | Bin 0 -> 1282 bytes res/drawable-xxhdpi/media_backward_light.png | Bin 0 -> 1443 bytes res/drawable-xxhdpi/media_forward_dark.png | Bin 0 -> 1258 bytes res/drawable-xxhdpi/media_forward_light.png | Bin 0 -> 1388 bytes res/drawable-xxhdpi/media_pause_dark.png | Bin 0 -> 612 bytes res/drawable-xxhdpi/media_pause_light.png | Bin 0 -> 631 bytes res/drawable-xxhdpi/media_start_dark.png | Bin 0 -> 996 bytes res/drawable-xxhdpi/media_start_light.png | Bin 0 -> 1069 bytes res/drawable-xxhdpi/media_stop_dark.png | Bin 0 -> 545 bytes res/drawable-xxhdpi/media_stop_light.png | Bin 0 -> 554 bytes res/values/themes.xml | 20 ++++++++++---------- .../dsub/activity/SubsonicFragmentActivity.java | 3 +-- src/github/daneren2005/dsub/view/SongView.java | 4 +++- 48 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 res/drawable-hdpi/media_backward.png create mode 100644 res/drawable-hdpi/media_backward_dark.png delete mode 100644 res/drawable-hdpi/media_forward.png create mode 100644 res/drawable-hdpi/media_forward_dark.png delete mode 100644 res/drawable-hdpi/media_pause.png create mode 100644 res/drawable-hdpi/media_pause_dark.png delete mode 100644 res/drawable-hdpi/media_start.png create mode 100644 res/drawable-hdpi/media_start_dark.png delete mode 100644 res/drawable-hdpi/media_stop.png create mode 100644 res/drawable-hdpi/media_stop_dark.png create mode 100644 res/drawable-mdpi/media_backward_dark.png create mode 100644 res/drawable-mdpi/media_backward_light.png create mode 100644 res/drawable-mdpi/media_forward_dark.png create mode 100644 res/drawable-mdpi/media_forward_light.png create mode 100644 res/drawable-mdpi/media_pause_dark.png create mode 100644 res/drawable-mdpi/media_pause_light.png create mode 100644 res/drawable-mdpi/media_start_dark.png create mode 100644 res/drawable-mdpi/media_start_light.png create mode 100644 res/drawable-mdpi/media_stop_dark.png create mode 100644 res/drawable-mdpi/media_stop_light.png create mode 100644 res/drawable-xhdpi/media_backward_dark.png create mode 100644 res/drawable-xhdpi/media_backward_light.png create mode 100644 res/drawable-xhdpi/media_forward_dark.png create mode 100644 res/drawable-xhdpi/media_forward_light.png create mode 100644 res/drawable-xhdpi/media_pause_dark.png create mode 100644 res/drawable-xhdpi/media_pause_light.png create mode 100644 res/drawable-xhdpi/media_start_dark.png create mode 100644 res/drawable-xhdpi/media_start_light.png create mode 100644 res/drawable-xhdpi/media_stop_dark.png create mode 100644 res/drawable-xhdpi/media_stop_light.png create mode 100644 res/drawable-xxhdpi/media_backward_dark.png create mode 100644 res/drawable-xxhdpi/media_backward_light.png create mode 100644 res/drawable-xxhdpi/media_forward_dark.png create mode 100644 res/drawable-xxhdpi/media_forward_light.png create mode 100644 res/drawable-xxhdpi/media_pause_dark.png create mode 100644 res/drawable-xxhdpi/media_pause_light.png create mode 100644 res/drawable-xxhdpi/media_start_dark.png create mode 100644 res/drawable-xxhdpi/media_start_light.png create mode 100644 res/drawable-xxhdpi/media_stop_dark.png create mode 100644 res/drawable-xxhdpi/media_stop_light.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi/media_backward.png b/res/drawable-hdpi/media_backward.png deleted file mode 100644 index 3bb85e68..00000000 Binary files a/res/drawable-hdpi/media_backward.png and /dev/null differ diff --git a/res/drawable-hdpi/media_backward_dark.png b/res/drawable-hdpi/media_backward_dark.png new file mode 100644 index 00000000..b1dde4f5 Binary files /dev/null and b/res/drawable-hdpi/media_backward_dark.png differ diff --git a/res/drawable-hdpi/media_backward_light.png b/res/drawable-hdpi/media_backward_light.png index 14188c86..3e277267 100644 Binary files a/res/drawable-hdpi/media_backward_light.png and b/res/drawable-hdpi/media_backward_light.png differ diff --git a/res/drawable-hdpi/media_forward.png b/res/drawable-hdpi/media_forward.png deleted file mode 100644 index cf39f1f0..00000000 Binary files a/res/drawable-hdpi/media_forward.png and /dev/null differ diff --git a/res/drawable-hdpi/media_forward_dark.png b/res/drawable-hdpi/media_forward_dark.png new file mode 100644 index 00000000..eb2546c7 Binary files /dev/null and b/res/drawable-hdpi/media_forward_dark.png differ diff --git a/res/drawable-hdpi/media_forward_light.png b/res/drawable-hdpi/media_forward_light.png index 9e172d8f..185e3c39 100644 Binary files a/res/drawable-hdpi/media_forward_light.png and b/res/drawable-hdpi/media_forward_light.png differ diff --git a/res/drawable-hdpi/media_pause.png b/res/drawable-hdpi/media_pause.png deleted file mode 100644 index d4cab525..00000000 Binary files a/res/drawable-hdpi/media_pause.png and /dev/null differ diff --git a/res/drawable-hdpi/media_pause_dark.png b/res/drawable-hdpi/media_pause_dark.png new file mode 100644 index 00000000..b057588e Binary files /dev/null and b/res/drawable-hdpi/media_pause_dark.png differ diff --git a/res/drawable-hdpi/media_pause_light.png b/res/drawable-hdpi/media_pause_light.png index 8ebf9b45..e01815e3 100644 Binary files a/res/drawable-hdpi/media_pause_light.png and b/res/drawable-hdpi/media_pause_light.png differ diff --git a/res/drawable-hdpi/media_start.png b/res/drawable-hdpi/media_start.png deleted file mode 100644 index 2af5996f..00000000 Binary files a/res/drawable-hdpi/media_start.png and /dev/null differ diff --git a/res/drawable-hdpi/media_start_dark.png b/res/drawable-hdpi/media_start_dark.png new file mode 100644 index 00000000..dbfd337a Binary files /dev/null and b/res/drawable-hdpi/media_start_dark.png differ diff --git a/res/drawable-hdpi/media_start_light.png b/res/drawable-hdpi/media_start_light.png index 45cad73c..e4310efc 100644 Binary files a/res/drawable-hdpi/media_start_light.png and b/res/drawable-hdpi/media_start_light.png differ diff --git a/res/drawable-hdpi/media_stop.png b/res/drawable-hdpi/media_stop.png deleted file mode 100644 index 329eb906..00000000 Binary files a/res/drawable-hdpi/media_stop.png and /dev/null differ diff --git a/res/drawable-hdpi/media_stop_dark.png b/res/drawable-hdpi/media_stop_dark.png new file mode 100644 index 00000000..5ceb39f3 Binary files /dev/null and b/res/drawable-hdpi/media_stop_dark.png differ diff --git a/res/drawable-hdpi/media_stop_light.png b/res/drawable-hdpi/media_stop_light.png index 110d538e..8deca73e 100644 Binary files a/res/drawable-hdpi/media_stop_light.png and b/res/drawable-hdpi/media_stop_light.png differ diff --git a/res/drawable-mdpi/media_backward_dark.png b/res/drawable-mdpi/media_backward_dark.png new file mode 100644 index 00000000..4f2233a1 Binary files /dev/null and b/res/drawable-mdpi/media_backward_dark.png differ diff --git a/res/drawable-mdpi/media_backward_light.png b/res/drawable-mdpi/media_backward_light.png new file mode 100644 index 00000000..425f2df7 Binary files /dev/null and b/res/drawable-mdpi/media_backward_light.png differ diff --git a/res/drawable-mdpi/media_forward_dark.png b/res/drawable-mdpi/media_forward_dark.png new file mode 100644 index 00000000..1641c0fa Binary files /dev/null and b/res/drawable-mdpi/media_forward_dark.png differ diff --git a/res/drawable-mdpi/media_forward_light.png b/res/drawable-mdpi/media_forward_light.png new file mode 100644 index 00000000..2e66868f Binary files /dev/null and b/res/drawable-mdpi/media_forward_light.png differ diff --git a/res/drawable-mdpi/media_pause_dark.png b/res/drawable-mdpi/media_pause_dark.png new file mode 100644 index 00000000..3580dab4 Binary files /dev/null and b/res/drawable-mdpi/media_pause_dark.png differ diff --git a/res/drawable-mdpi/media_pause_light.png b/res/drawable-mdpi/media_pause_light.png new file mode 100644 index 00000000..7e9ade73 Binary files /dev/null and b/res/drawable-mdpi/media_pause_light.png differ diff --git a/res/drawable-mdpi/media_start_dark.png b/res/drawable-mdpi/media_start_dark.png new file mode 100644 index 00000000..a2f198ae Binary files /dev/null and b/res/drawable-mdpi/media_start_dark.png differ diff --git a/res/drawable-mdpi/media_start_light.png b/res/drawable-mdpi/media_start_light.png new file mode 100644 index 00000000..d69107ba Binary files /dev/null and b/res/drawable-mdpi/media_start_light.png differ diff --git a/res/drawable-mdpi/media_stop_dark.png b/res/drawable-mdpi/media_stop_dark.png new file mode 100644 index 00000000..944482e6 Binary files /dev/null and b/res/drawable-mdpi/media_stop_dark.png differ diff --git a/res/drawable-mdpi/media_stop_light.png b/res/drawable-mdpi/media_stop_light.png new file mode 100644 index 00000000..ff1932a1 Binary files /dev/null and b/res/drawable-mdpi/media_stop_light.png differ diff --git a/res/drawable-xhdpi/media_backward_dark.png b/res/drawable-xhdpi/media_backward_dark.png new file mode 100644 index 00000000..3c9921a8 Binary files /dev/null and b/res/drawable-xhdpi/media_backward_dark.png differ diff --git a/res/drawable-xhdpi/media_backward_light.png b/res/drawable-xhdpi/media_backward_light.png new file mode 100644 index 00000000..aafd76fa Binary files /dev/null and b/res/drawable-xhdpi/media_backward_light.png differ diff --git a/res/drawable-xhdpi/media_forward_dark.png b/res/drawable-xhdpi/media_forward_dark.png new file mode 100644 index 00000000..b082b3a6 Binary files /dev/null and b/res/drawable-xhdpi/media_forward_dark.png differ diff --git a/res/drawable-xhdpi/media_forward_light.png b/res/drawable-xhdpi/media_forward_light.png new file mode 100644 index 00000000..20772843 Binary files /dev/null and b/res/drawable-xhdpi/media_forward_light.png differ diff --git a/res/drawable-xhdpi/media_pause_dark.png b/res/drawable-xhdpi/media_pause_dark.png new file mode 100644 index 00000000..aafdd4aa Binary files /dev/null and b/res/drawable-xhdpi/media_pause_dark.png differ diff --git a/res/drawable-xhdpi/media_pause_light.png b/res/drawable-xhdpi/media_pause_light.png new file mode 100644 index 00000000..2639777d Binary files /dev/null and b/res/drawable-xhdpi/media_pause_light.png differ diff --git a/res/drawable-xhdpi/media_start_dark.png b/res/drawable-xhdpi/media_start_dark.png new file mode 100644 index 00000000..9e63c90b Binary files /dev/null and b/res/drawable-xhdpi/media_start_dark.png differ diff --git a/res/drawable-xhdpi/media_start_light.png b/res/drawable-xhdpi/media_start_light.png new file mode 100644 index 00000000..2ff8c399 Binary files /dev/null and b/res/drawable-xhdpi/media_start_light.png differ diff --git a/res/drawable-xhdpi/media_stop_dark.png b/res/drawable-xhdpi/media_stop_dark.png new file mode 100644 index 00000000..9cb32909 Binary files /dev/null and b/res/drawable-xhdpi/media_stop_dark.png differ diff --git a/res/drawable-xhdpi/media_stop_light.png b/res/drawable-xhdpi/media_stop_light.png new file mode 100644 index 00000000..edf13ccf Binary files /dev/null and b/res/drawable-xhdpi/media_stop_light.png differ diff --git a/res/drawable-xxhdpi/media_backward_dark.png b/res/drawable-xxhdpi/media_backward_dark.png new file mode 100644 index 00000000..5b6c6148 Binary files /dev/null and b/res/drawable-xxhdpi/media_backward_dark.png differ diff --git a/res/drawable-xxhdpi/media_backward_light.png b/res/drawable-xxhdpi/media_backward_light.png new file mode 100644 index 00000000..32f7d3bc Binary files /dev/null and b/res/drawable-xxhdpi/media_backward_light.png differ diff --git a/res/drawable-xxhdpi/media_forward_dark.png b/res/drawable-xxhdpi/media_forward_dark.png new file mode 100644 index 00000000..ca4ee295 Binary files /dev/null and b/res/drawable-xxhdpi/media_forward_dark.png differ diff --git a/res/drawable-xxhdpi/media_forward_light.png b/res/drawable-xxhdpi/media_forward_light.png new file mode 100644 index 00000000..208e46e9 Binary files /dev/null and b/res/drawable-xxhdpi/media_forward_light.png differ diff --git a/res/drawable-xxhdpi/media_pause_dark.png b/res/drawable-xxhdpi/media_pause_dark.png new file mode 100644 index 00000000..4b5aacbc Binary files /dev/null and b/res/drawable-xxhdpi/media_pause_dark.png differ diff --git a/res/drawable-xxhdpi/media_pause_light.png b/res/drawable-xxhdpi/media_pause_light.png new file mode 100644 index 00000000..111f6d00 Binary files /dev/null and b/res/drawable-xxhdpi/media_pause_light.png differ diff --git a/res/drawable-xxhdpi/media_start_dark.png b/res/drawable-xxhdpi/media_start_dark.png new file mode 100644 index 00000000..641ad544 Binary files /dev/null and b/res/drawable-xxhdpi/media_start_dark.png differ diff --git a/res/drawable-xxhdpi/media_start_light.png b/res/drawable-xxhdpi/media_start_light.png new file mode 100644 index 00000000..a6286203 Binary files /dev/null and b/res/drawable-xxhdpi/media_start_light.png differ diff --git a/res/drawable-xxhdpi/media_stop_dark.png b/res/drawable-xxhdpi/media_stop_dark.png new file mode 100644 index 00000000..9a9c432a Binary files /dev/null and b/res/drawable-xxhdpi/media_stop_dark.png differ diff --git a/res/drawable-xxhdpi/media_stop_light.png b/res/drawable-xxhdpi/media_stop_light.png new file mode 100644 index 00000000..79eb8d95 Binary files /dev/null and b/res/drawable-xxhdpi/media_stop_light.png differ diff --git a/res/values/themes.xml b/res/values/themes.xml index 4735b161..9e10376b 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -21,12 +21,12 @@ @style/Widget.DSub.ActionBarStyle.Dark @color/cyan @drawable/main_offline - @drawable/media_backward - @drawable/media_forward - @drawable/media_pause + @drawable/media_backward_dark + @drawable/media_forward_dark + @drawable/media_pause_dark @drawable/media_repeat_off - @drawable/media_start - @drawable/media_stop + @drawable/media_start_dark + @drawable/media_stop_dark @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark @@ -42,12 +42,12 @@ @color/cyan @drawable/background @drawable/main_offline - @drawable/media_backward - @drawable/media_forward - @drawable/media_pause + @drawable/media_backward_dark + @drawable/media_forward_dark + @drawable/media_pause_dark @drawable/media_repeat_off - @drawable/media_start - @drawable/media_stop + @drawable/media_start_dark + @drawable/media_stop_dark @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark diff --git a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index 5b3733da..4df064e5 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -356,8 +356,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity { getImageLoader().loadImage(coverArtView, song, false, false); int[] attrs = new int[] {(getDownloadService().getPlayerState() == PlayerState.STARTED) ? R.attr.media_button_pause : R.attr.media_button_start}; TypedArray typedArray = this.obtainStyledAttributes(attrs); - Drawable drawable = typedArray.getDrawable(0); - startButton.setImageDrawable(drawable); + startButton.setImageResource(typedArray.getResourceId(0, 0)); typedArray.recycle(); } diff --git a/src/github/daneren2005/dsub/view/SongView.java b/src/github/daneren2005/dsub/view/SongView.java index 24e2df0f..ea1f63c5 100644 --- a/src/github/daneren2005/dsub/view/SongView.java +++ b/src/github/daneren2005/dsub/view/SongView.java @@ -223,7 +223,9 @@ public class SongView extends UpdateView implements Checkable { if (playing) { if(!this.playing) { this.playing = playing; - titleTextView.setCompoundDrawablesWithIntrinsicBounds(R.drawable.now_playing, 0, 0, 0); + int[] attrs = new int[] {R.attr.media_button_start}; + TypedArray typedArray = context.obtainStyledAttributes(attrs); + titleTextView.setCompoundDrawablesWithIntrinsicBounds(typedArray.getResourceId(0, 0), 0, 0, 0); } } else { if(this.playing) { -- cgit v1.2.3 From 3e2a0091eb6293d32d6f75d65a0431193b11ace9 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 8 Nov 2013 20:26:22 -0800 Subject: Update all icons that I could find replacements for --- res/drawable-hdpi/action_browse.png | Bin 1673 -> 0 bytes res/drawable-hdpi/action_compass.png | Bin 2069 -> 0 bytes res/drawable-hdpi/action_exit.png | Bin 923 -> 0 bytes res/drawable-hdpi/action_help.png | Bin 1197 -> 0 bytes res/drawable-hdpi/action_moreoverflow.png | Bin 126 -> 0 bytes res/drawable-hdpi/action_offline.png | Bin 1558 -> 0 bytes res/drawable-hdpi/action_play_all.png | Bin 1359 -> 0 bytes res/drawable-hdpi/action_refresh.png | Bin 1820 -> 0 bytes res/drawable-hdpi/action_remove_all.png | Bin 1201 -> 0 bytes res/drawable-hdpi/action_save.png | Bin 1044 -> 0 bytes res/drawable-hdpi/action_screen_on_off.png | Bin 1525 -> 0 bytes res/drawable-hdpi/action_search.png | Bin 1592 -> 0 bytes res/drawable-hdpi/action_select.png | Bin 1158 -> 0 bytes res/drawable-hdpi/action_settings.png | Bin 1649 -> 0 bytes res/drawable-hdpi/action_share.png | Bin 1823 -> 0 bytes res/drawable-hdpi/action_shuffle.png | Bin 1386 -> 0 bytes res/drawable-hdpi/ic_menu_chat_dark.png | Bin 1401 -> 421 bytes res/drawable-hdpi/ic_menu_chat_light.png | Bin 1374 -> 453 bytes res/drawable-hdpi/ic_menu_chat_send_dark.png | Bin 1668 -> 602 bytes res/drawable-hdpi/ic_menu_chat_send_light.png | Bin 1691 -> 677 bytes res/drawable-hdpi/ic_menu_exit.png | Bin 5689 -> 0 bytes res/drawable-hdpi/ic_menu_help.png | Bin 5250 -> 0 bytes res/drawable-hdpi/ic_menu_settings.png | Bin 5455 -> 0 bytes res/drawable-hdpi/ic_menu_shuffle.png | Bin 1386 -> 0 bytes res/drawable-hdpi/ic_menu_shuffle_dark.png | Bin 0 -> 985 bytes res/drawable-hdpi/ic_menu_shuffle_light.png | Bin 0 -> 1132 bytes res/drawable-hdpi/main_offline.png | Bin 1405 -> 0 bytes res/drawable-hdpi/main_offline_light.png | Bin 564 -> 746 bytes res/drawable-hdpi/volume.png | Bin 1659 -> 0 bytes res/drawable-mdpi/ic_menu_shuffle_dark.png | Bin 0 -> 653 bytes res/drawable-mdpi/ic_menu_shuffle_light.png | Bin 0 -> 725 bytes res/drawable-xhdpi/ic_menu_shuffle_dark.png | Bin 0 -> 1400 bytes res/drawable-xhdpi/ic_menu_shuffle_light.png | Bin 0 -> 1637 bytes res/drawable-xxhdpi/ic_menu_shuffle_dark.png | Bin 0 -> 2268 bytes res/drawable-xxhdpi/ic_menu_shuffle_light.png | Bin 0 -> 2529 bytes res/layout/jukebox_volume.xml | 2 +- res/menu/abstract_top_menu.xml | 6 ++---- res/menu/chat.xml | 4 +--- res/menu/drawer_menu.xml | 2 -- res/menu/empty.xml | 2 +- res/menu/main.xml | 7 ++----- res/menu/nowplaying.xml | 11 ++++------- res/menu/nowplaying_downloading.xml | 3 +-- res/menu/nowplaying_offline.xml | 9 +++------ res/menu/search.xml | 4 +--- res/menu/select_album.xml | 6 +++--- res/menu/select_album_list.xml | 2 +- res/menu/select_artist.xml | 8 +++----- res/menu/select_genres.xml | 2 +- res/menu/select_podcast_episode.xml | 3 +-- res/menu/select_podcast_episode_offline.xml | 3 +-- res/menu/select_podcasts.xml | 8 ++------ res/menu/select_song.xml | 26 ++++++++------------------ res/menu/select_song_offline.xml | 18 ++++++------------ res/values/attrs.xml | 10 ++++++++-- res/values/themes.xml | 24 +++++++++++++++++++++--- 56 files changed, 71 insertions(+), 89 deletions(-) delete mode 100644 res/drawable-hdpi/action_browse.png delete mode 100644 res/drawable-hdpi/action_compass.png delete mode 100644 res/drawable-hdpi/action_exit.png delete mode 100644 res/drawable-hdpi/action_help.png delete mode 100644 res/drawable-hdpi/action_moreoverflow.png delete mode 100644 res/drawable-hdpi/action_offline.png delete mode 100644 res/drawable-hdpi/action_play_all.png delete mode 100644 res/drawable-hdpi/action_refresh.png delete mode 100644 res/drawable-hdpi/action_remove_all.png delete mode 100644 res/drawable-hdpi/action_save.png delete mode 100644 res/drawable-hdpi/action_screen_on_off.png delete mode 100644 res/drawable-hdpi/action_search.png delete mode 100644 res/drawable-hdpi/action_select.png delete mode 100644 res/drawable-hdpi/action_settings.png delete mode 100644 res/drawable-hdpi/action_share.png delete mode 100644 res/drawable-hdpi/action_shuffle.png delete mode 100644 res/drawable-hdpi/ic_menu_exit.png delete mode 100644 res/drawable-hdpi/ic_menu_help.png delete mode 100644 res/drawable-hdpi/ic_menu_settings.png delete mode 100644 res/drawable-hdpi/ic_menu_shuffle.png create mode 100644 res/drawable-hdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-hdpi/ic_menu_shuffle_light.png delete mode 100644 res/drawable-hdpi/main_offline.png delete mode 100644 res/drawable-hdpi/volume.png create mode 100644 res/drawable-mdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-mdpi/ic_menu_shuffle_light.png create mode 100644 res/drawable-xhdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_shuffle_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_shuffle_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_shuffle_light.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi/action_browse.png b/res/drawable-hdpi/action_browse.png deleted file mode 100644 index 54296909..00000000 Binary files a/res/drawable-hdpi/action_browse.png and /dev/null differ diff --git a/res/drawable-hdpi/action_compass.png b/res/drawable-hdpi/action_compass.png deleted file mode 100644 index 39760f89..00000000 Binary files a/res/drawable-hdpi/action_compass.png and /dev/null differ diff --git a/res/drawable-hdpi/action_exit.png b/res/drawable-hdpi/action_exit.png deleted file mode 100644 index 09e18dee..00000000 Binary files a/res/drawable-hdpi/action_exit.png and /dev/null differ diff --git a/res/drawable-hdpi/action_help.png b/res/drawable-hdpi/action_help.png deleted file mode 100644 index aaf8304c..00000000 Binary files a/res/drawable-hdpi/action_help.png and /dev/null differ diff --git a/res/drawable-hdpi/action_moreoverflow.png b/res/drawable-hdpi/action_moreoverflow.png deleted file mode 100644 index cb6ebdaf..00000000 Binary files a/res/drawable-hdpi/action_moreoverflow.png and /dev/null differ diff --git a/res/drawable-hdpi/action_offline.png b/res/drawable-hdpi/action_offline.png deleted file mode 100644 index a85f0931..00000000 Binary files a/res/drawable-hdpi/action_offline.png and /dev/null differ diff --git a/res/drawable-hdpi/action_play_all.png b/res/drawable-hdpi/action_play_all.png deleted file mode 100644 index 6ce5629a..00000000 Binary files a/res/drawable-hdpi/action_play_all.png and /dev/null differ diff --git a/res/drawable-hdpi/action_refresh.png b/res/drawable-hdpi/action_refresh.png deleted file mode 100644 index 9f30dc95..00000000 Binary files a/res/drawable-hdpi/action_refresh.png and /dev/null differ diff --git a/res/drawable-hdpi/action_remove_all.png b/res/drawable-hdpi/action_remove_all.png deleted file mode 100644 index 97b88837..00000000 Binary files a/res/drawable-hdpi/action_remove_all.png and /dev/null differ diff --git a/res/drawable-hdpi/action_save.png b/res/drawable-hdpi/action_save.png deleted file mode 100644 index 7bda97d6..00000000 Binary files a/res/drawable-hdpi/action_save.png and /dev/null differ diff --git a/res/drawable-hdpi/action_screen_on_off.png b/res/drawable-hdpi/action_screen_on_off.png deleted file mode 100644 index c7168563..00000000 Binary files a/res/drawable-hdpi/action_screen_on_off.png and /dev/null differ diff --git a/res/drawable-hdpi/action_search.png b/res/drawable-hdpi/action_search.png deleted file mode 100644 index 6bc3d426..00000000 Binary files a/res/drawable-hdpi/action_search.png and /dev/null differ diff --git a/res/drawable-hdpi/action_select.png b/res/drawable-hdpi/action_select.png deleted file mode 100644 index e9e83e3d..00000000 Binary files a/res/drawable-hdpi/action_select.png and /dev/null differ diff --git a/res/drawable-hdpi/action_settings.png b/res/drawable-hdpi/action_settings.png deleted file mode 100644 index 1ab7722b..00000000 Binary files a/res/drawable-hdpi/action_settings.png and /dev/null differ diff --git a/res/drawable-hdpi/action_share.png b/res/drawable-hdpi/action_share.png deleted file mode 100644 index 28376157..00000000 Binary files a/res/drawable-hdpi/action_share.png and /dev/null differ diff --git a/res/drawable-hdpi/action_shuffle.png b/res/drawable-hdpi/action_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/res/drawable-hdpi/action_shuffle.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_chat_dark.png b/res/drawable-hdpi/ic_menu_chat_dark.png index be04b06e..75363fce 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_dark.png and b/res/drawable-hdpi/ic_menu_chat_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_chat_light.png b/res/drawable-hdpi/ic_menu_chat_light.png index 3f58695c..e28933e4 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_light.png and b/res/drawable-hdpi/ic_menu_chat_light.png differ diff --git a/res/drawable-hdpi/ic_menu_chat_send_dark.png b/res/drawable-hdpi/ic_menu_chat_send_dark.png index bd37dc59..c0e9b372 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_send_dark.png and b/res/drawable-hdpi/ic_menu_chat_send_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_chat_send_light.png b/res/drawable-hdpi/ic_menu_chat_send_light.png index 0c870d2c..ebcfe9e8 100644 Binary files a/res/drawable-hdpi/ic_menu_chat_send_light.png and b/res/drawable-hdpi/ic_menu_chat_send_light.png differ diff --git a/res/drawable-hdpi/ic_menu_exit.png b/res/drawable-hdpi/ic_menu_exit.png deleted file mode 100644 index 847a1ed3..00000000 Binary files a/res/drawable-hdpi/ic_menu_exit.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_help.png b/res/drawable-hdpi/ic_menu_help.png deleted file mode 100644 index 9f11f434..00000000 Binary files a/res/drawable-hdpi/ic_menu_help.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_settings.png b/res/drawable-hdpi/ic_menu_settings.png deleted file mode 100644 index 48775c1e..00000000 Binary files a/res/drawable-hdpi/ic_menu_settings.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_shuffle.png b/res/drawable-hdpi/ic_menu_shuffle.png deleted file mode 100644 index 0613965c..00000000 Binary files a/res/drawable-hdpi/ic_menu_shuffle.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_shuffle_dark.png b/res/drawable-hdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..f77cfed2 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_shuffle_light.png b/res/drawable-hdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..ded93939 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_shuffle_light.png differ diff --git a/res/drawable-hdpi/main_offline.png b/res/drawable-hdpi/main_offline.png deleted file mode 100644 index a1d27cec..00000000 Binary files a/res/drawable-hdpi/main_offline.png and /dev/null differ diff --git a/res/drawable-hdpi/main_offline_light.png b/res/drawable-hdpi/main_offline_light.png index 69bee782..cabca581 100644 Binary files a/res/drawable-hdpi/main_offline_light.png and b/res/drawable-hdpi/main_offline_light.png differ diff --git a/res/drawable-hdpi/volume.png b/res/drawable-hdpi/volume.png deleted file mode 100644 index 95134dfd..00000000 Binary files a/res/drawable-hdpi/volume.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_shuffle_dark.png b/res/drawable-mdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..7007fde5 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_shuffle_light.png b/res/drawable-mdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..4d07c3b4 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_shuffle_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_shuffle_dark.png b/res/drawable-xhdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..e3a31a84 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_shuffle_light.png b/res/drawable-xhdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..14eb942c Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_shuffle_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_dark.png b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png new file mode 100644 index 00000000..b53733df Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_shuffle_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_shuffle_light.png b/res/drawable-xxhdpi/ic_menu_shuffle_light.png new file mode 100644 index 00000000..4d5dff32 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_shuffle_light.png differ diff --git a/res/layout/jukebox_volume.xml b/res/layout/jukebox_volume.xml index 4bccaec7..fd718326 100644 --- a/res/layout/jukebox_volume.xml +++ b/res/layout/jukebox_volume.xml @@ -32,7 +32,7 @@ android:paddingRight="12dip" android:layout_alignParentLeft="true" android:layout_below="@+id/jukebox_volume_title" - android:src="@drawable/volume"/> + android:src="?attr/volume"/> diff --git a/res/menu/chat.xml b/res/menu/chat.xml index c8ea860a..5e39a5c7 100644 --- a/res/menu/chat.xml +++ b/res/menu/chat.xml @@ -3,17 +3,15 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/res/menu/drawer_menu.xml b/res/menu/drawer_menu.xml index adba3c90..2b557738 100644 --- a/res/menu/drawer_menu.xml +++ b/res/menu/drawer_menu.xml @@ -4,11 +4,9 @@ diff --git a/res/menu/empty.xml b/res/menu/empty.xml index 979eefe4..9bb43bf7 100644 --- a/res/menu/empty.xml +++ b/res/menu/empty.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> diff --git a/res/menu/main.xml b/res/menu/main.xml index 4b13b3c1..22809c47 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -3,19 +3,18 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml index 2fad22d2..3c9c5ba6 100644 --- a/res/menu/nowplaying.xml +++ b/res/menu/nowplaying.xml @@ -3,27 +3,25 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> + android:title="@string/download.menu_screen_on"/> diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/nowplaying_downloading.xml index 2c513964..50ab00f3 100644 --- a/res/menu/nowplaying_downloading.xml +++ b/res/menu/nowplaying_downloading.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> @@ -13,6 +13,5 @@ diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml index 3faa8d97..41d1d5d1 100644 --- a/res/menu/nowplaying_offline.xml +++ b/res/menu/nowplaying_offline.xml @@ -4,21 +4,19 @@ + android:title="@string/download.menu_screen_on"/> diff --git a/res/menu/search.xml b/res/menu/search.xml index 0f74e65c..fdadd748 100644 --- a/res/menu/search.xml +++ b/res/menu/search.xml @@ -3,18 +3,16 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml index 329c479c..469561f1 100644 --- a/res/menu/select_album.xml +++ b/res/menu/select_album.xml @@ -3,19 +3,19 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml index 635a36bf..60b636e3 100644 --- a/res/menu/select_album_list.xml +++ b/res/menu/select_album_list.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml index 1346343b..5e10dc80 100644 --- a/res/menu/select_artist.xml +++ b/res/menu/select_artist.xml @@ -3,29 +3,27 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> diff --git a/res/menu/select_genres.xml b/res/menu/select_genres.xml index ad2756d6..837b3534 100644 --- a/res/menu/select_genres.xml +++ b/res/menu/select_genres.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml index 7e79d0f7..8472325a 100644 --- a/res/menu/select_podcast_episode.xml +++ b/res/menu/select_podcast_episode.xml @@ -3,7 +3,7 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> @@ -13,6 +13,5 @@ diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml index cb6d1a3b..4d464c1f 100644 --- a/res/menu/select_podcast_episode_offline.xml +++ b/res/menu/select_podcast_episode_offline.xml @@ -3,12 +3,11 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml index de6b83a7..d97ebe6c 100644 --- a/res/menu/select_podcasts.xml +++ b/res/menu/select_podcasts.xml @@ -3,33 +3,29 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml index 658e3ffe..d60dedac 100644 --- a/res/menu/select_song.xml +++ b/res/menu/select_song.xml @@ -3,45 +3,37 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> + android:title="@string/menu.select"/> + android:title="@string/common.download"/> + android:title="@string/common.pin"/> + android:title="@string/common.delete"/> + android:title="@string/menu.play_last"/> diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml index 7588d9ad..88e9758d 100644 --- a/res/menu/select_song_offline.xml +++ b/res/menu/select_song_offline.xml @@ -3,37 +3,31 @@ xmlns:compat="http://schemas.android.com/apk/res-auto"> + android:title="@string/menu.select"/> + android:title="@string/common.delete"/> + android:title="@string/menu.play_last"/> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index d2b53374..e54db415 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -8,6 +8,12 @@ - - + + + + + + + + diff --git a/res/values/themes.xml b/res/values/themes.xml index 9e10376b..1d8ddcf0 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -13,6 +13,12 @@ @drawable/ic_menu_chat_light @drawable/ic_menu_chat_send_light @drawable/download_none_light + @drawable/ic_menu_shuffle_light + @drawable/ic_menu_refresh_light + @drawable/ic_menu_search_light + @drawable/ic_menu_remove_light + @drawable/ic_menu_save_light + @drawable/ic_action_volume_light @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -20,7 +26,7 @@ @style/Widget.DSub.ActionBarStyle.Dark @style/Widget.DSub.ActionBarStyle.Dark @color/cyan - @drawable/main_offline + @drawable/main_offline_dark @drawable/media_backward_dark @drawable/media_forward_dark @drawable/media_pause_dark @@ -30,6 +36,12 @@ @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark + @drawable/ic_menu_shuffle_dark + @drawable/ic_menu_refresh_dark + @drawable/ic_menu_search_dark + @drawable/ic_menu_remove_dark + @drawable/ic_menu_save_dark + @drawable/ic_action_volume_dark @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -41,16 +53,22 @@ @style/Widget.DSub.ActionBarStyle.Holo @color/cyan @drawable/background - @drawable/main_offline + @drawable/main_offline_dark @drawable/media_backward_dark @drawable/media_forward_dark @drawable/media_pause_dark @drawable/media_repeat_off @drawable/media_start_dark @drawable/media_stop_dark - @drawable/ic_menu_chat_dark + @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark + @drawable/ic_menu_shuffle_dark + @drawable/ic_menu_refresh_dark + @drawable/ic_menu_search_dark + @drawable/ic_menu_remove_dark + @drawable/ic_menu_save_dark + @drawable/ic_action_volume_dark @style/DSub.TextViewStyle @style/DSub.ButtonStyle -- cgit v1.2.3 From f018b56985ff12a63b21cefe302421bb5f0c2209 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 9 Nov 2013 12:40:15 -0800 Subject: Added icons to the drawer --- res/drawable-hdpi/ic_action_volume_dark.png | Bin 0 -> 1365 bytes res/drawable-hdpi/ic_action_volume_light.png | Bin 0 -> 1550 bytes res/drawable-hdpi/ic_menu_bookmark_dark.png | Bin 0 -> 1087 bytes res/drawable-hdpi/ic_menu_bookmark_light.png | Bin 0 -> 1292 bytes res/drawable-hdpi/ic_menu_home_dark.png | Bin 0 -> 916 bytes res/drawable-hdpi/ic_menu_home_light.png | Bin 0 -> 992 bytes res/drawable-hdpi/ic_menu_library_dark.png | Bin 0 -> 617 bytes res/drawable-hdpi/ic_menu_library_light.png | Bin 0 -> 696 bytes res/drawable-hdpi/ic_menu_playlist_dark.png | Bin 0 -> 457 bytes res/drawable-hdpi/ic_menu_playlist_light.png | Bin 0 -> 496 bytes res/drawable-hdpi/ic_menu_podcast_dark.png | Bin 0 -> 1167 bytes res/drawable-hdpi/ic_menu_podcast_light.png | Bin 0 -> 1410 bytes res/drawable-hdpi/ic_menu_refresh_dark.png | Bin 0 -> 1139 bytes res/drawable-hdpi/ic_menu_refresh_light.png | Bin 0 -> 1351 bytes res/drawable-hdpi/ic_menu_remove_dark.png | Bin 0 -> 898 bytes res/drawable-hdpi/ic_menu_remove_light.png | Bin 0 -> 1090 bytes res/drawable-hdpi/ic_menu_save_dark.png | Bin 0 -> 553 bytes res/drawable-hdpi/ic_menu_save_light.png | Bin 0 -> 631 bytes res/drawable-hdpi/ic_menu_search_dark.png | Bin 0 -> 1071 bytes res/drawable-hdpi/ic_menu_search_light.png | Bin 0 -> 1271 bytes res/drawable-hdpi/main_offline_dark.png | Bin 0 -> 631 bytes res/drawable-mdpi/ic_action_volume_dark.png | Bin 0 -> 820 bytes res/drawable-mdpi/ic_action_volume_light.png | Bin 0 -> 974 bytes res/drawable-mdpi/ic_menu_bookmark_dark.png | Bin 0 -> 658 bytes res/drawable-mdpi/ic_menu_bookmark_light.png | Bin 0 -> 782 bytes res/drawable-mdpi/ic_menu_chat_dark.png | Bin 0 -> 277 bytes res/drawable-mdpi/ic_menu_chat_light.png | Bin 0 -> 311 bytes res/drawable-mdpi/ic_menu_chat_send_dark.png | Bin 0 -> 366 bytes res/drawable-mdpi/ic_menu_chat_send_light.png | Bin 0 -> 394 bytes res/drawable-mdpi/ic_menu_home_dark.png | Bin 0 -> 550 bytes res/drawable-mdpi/ic_menu_home_light.png | Bin 0 -> 656 bytes res/drawable-mdpi/ic_menu_library_dark.png | Bin 0 -> 420 bytes res/drawable-mdpi/ic_menu_library_light.png | Bin 0 -> 492 bytes res/drawable-mdpi/ic_menu_playlist_dark.png | Bin 0 -> 315 bytes res/drawable-mdpi/ic_menu_playlist_light.png | Bin 0 -> 364 bytes res/drawable-mdpi/ic_menu_podcast_dark.png | Bin 0 -> 750 bytes res/drawable-mdpi/ic_menu_podcast_light.png | Bin 0 -> 862 bytes res/drawable-mdpi/ic_menu_refresh_dark.png | Bin 0 -> 748 bytes res/drawable-mdpi/ic_menu_refresh_light.png | Bin 0 -> 914 bytes res/drawable-mdpi/ic_menu_remove_dark.png | Bin 0 -> 576 bytes res/drawable-mdpi/ic_menu_remove_light.png | Bin 0 -> 689 bytes res/drawable-mdpi/ic_menu_save_dark.png | Bin 0 -> 406 bytes res/drawable-mdpi/ic_menu_save_light.png | Bin 0 -> 481 bytes res/drawable-mdpi/ic_menu_search_dark.png | Bin 0 -> 655 bytes res/drawable-mdpi/ic_menu_search_light.png | Bin 0 -> 794 bytes res/drawable-mdpi/main_offline_dark.png | Bin 0 -> 408 bytes res/drawable-mdpi/main_offline_light.png | Bin 0 -> 456 bytes res/drawable-xhdpi/ic_action_volume_dark.png | Bin 0 -> 1916 bytes res/drawable-xhdpi/ic_action_volume_light.png | Bin 0 -> 2180 bytes res/drawable-xhdpi/ic_menu_bookmark_dark.png | Bin 0 -> 1442 bytes res/drawable-xhdpi/ic_menu_bookmark_light.png | Bin 0 -> 1665 bytes res/drawable-xhdpi/ic_menu_chat_dark.png | Bin 0 -> 472 bytes res/drawable-xhdpi/ic_menu_chat_light.png | Bin 0 -> 517 bytes res/drawable-xhdpi/ic_menu_chat_send_dark.png | Bin 0 -> 743 bytes res/drawable-xhdpi/ic_menu_chat_send_light.png | Bin 0 -> 799 bytes res/drawable-xhdpi/ic_menu_home_dark.png | Bin 0 -> 1225 bytes res/drawable-xhdpi/ic_menu_home_light.png | Bin 0 -> 1360 bytes res/drawable-xhdpi/ic_menu_library_dark.png | Bin 0 -> 820 bytes res/drawable-xhdpi/ic_menu_library_light.png | Bin 0 -> 980 bytes res/drawable-xhdpi/ic_menu_playlist_dark.png | Bin 0 -> 508 bytes res/drawable-xhdpi/ic_menu_playlist_light.png | Bin 0 -> 555 bytes res/drawable-xhdpi/ic_menu_podcast_dark.png | Bin 0 -> 1553 bytes res/drawable-xhdpi/ic_menu_podcast_light.png | Bin 0 -> 1787 bytes res/drawable-xhdpi/ic_menu_refresh_dark.png | Bin 0 -> 1520 bytes res/drawable-xhdpi/ic_menu_refresh_light.png | Bin 0 -> 1802 bytes res/drawable-xhdpi/ic_menu_remove_dark.png | Bin 0 -> 1146 bytes res/drawable-xhdpi/ic_menu_remove_light.png | Bin 0 -> 1394 bytes res/drawable-xhdpi/ic_menu_save_dark.png | Bin 0 -> 644 bytes res/drawable-xhdpi/ic_menu_save_light.png | Bin 0 -> 735 bytes res/drawable-xhdpi/ic_menu_search_dark.png | Bin 0 -> 1445 bytes res/drawable-xhdpi/ic_menu_search_light.png | Bin 0 -> 1701 bytes res/drawable-xhdpi/main_offline_dark.png | Bin 0 -> 818 bytes res/drawable-xhdpi/main_offline_light.png | Bin 0 -> 976 bytes res/drawable-xxhdpi/ic_action_volume_dark.png | Bin 0 -> 3148 bytes res/drawable-xxhdpi/ic_action_volume_light.png | Bin 0 -> 3473 bytes res/drawable-xxhdpi/ic_menu_bookmark_dark.png | Bin 0 -> 2194 bytes res/drawable-xxhdpi/ic_menu_bookmark_light.png | Bin 0 -> 2474 bytes res/drawable-xxhdpi/ic_menu_chat_dark.png | Bin 0 -> 723 bytes res/drawable-xxhdpi/ic_menu_chat_light.png | Bin 0 -> 771 bytes res/drawable-xxhdpi/ic_menu_chat_send_dark.png | Bin 0 -> 1326 bytes res/drawable-xxhdpi/ic_menu_chat_send_light.png | Bin 0 -> 1608 bytes res/drawable-xxhdpi/ic_menu_home_dark.png | Bin 0 -> 1998 bytes res/drawable-xxhdpi/ic_menu_home_light.png | Bin 0 -> 2249 bytes res/drawable-xxhdpi/ic_menu_library_dark.png | Bin 0 -> 1357 bytes res/drawable-xxhdpi/ic_menu_library_light.png | Bin 0 -> 1579 bytes res/drawable-xxhdpi/ic_menu_playlist_dark.png | Bin 0 -> 783 bytes res/drawable-xxhdpi/ic_menu_playlist_light.png | Bin 0 -> 840 bytes res/drawable-xxhdpi/ic_menu_podcast_dark.png | Bin 0 -> 2439 bytes res/drawable-xxhdpi/ic_menu_podcast_light.png | Bin 0 -> 2798 bytes res/drawable-xxhdpi/ic_menu_refresh_dark.png | Bin 0 -> 2453 bytes res/drawable-xxhdpi/ic_menu_refresh_light.png | Bin 0 -> 2952 bytes res/drawable-xxhdpi/ic_menu_remove_dark.png | Bin 0 -> 1843 bytes res/drawable-xxhdpi/ic_menu_remove_light.png | Bin 0 -> 2164 bytes res/drawable-xxhdpi/ic_menu_save_dark.png | Bin 0 -> 977 bytes res/drawable-xxhdpi/ic_menu_save_light.png | Bin 0 -> 1076 bytes res/drawable-xxhdpi/ic_menu_search_dark.png | Bin 0 -> 2258 bytes res/drawable-xxhdpi/ic_menu_search_light.png | Bin 0 -> 2571 bytes res/drawable-xxhdpi/main_offline_dark.png | Bin 0 -> 1265 bytes res/drawable-xxhdpi/main_offline_light.png | Bin 0 -> 1466 bytes res/layout/drawer_list_item.xml | 24 ++++++++ res/values/arrays.xml | 9 +++ .../dsub/activity/SubsonicActivity.java | 26 ++++---- .../daneren2005/dsub/view/DrawerAdapter.java | 68 +++++++++++++++++++++ 103 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 res/drawable-hdpi/ic_action_volume_dark.png create mode 100644 res/drawable-hdpi/ic_action_volume_light.png create mode 100644 res/drawable-hdpi/ic_menu_bookmark_dark.png create mode 100644 res/drawable-hdpi/ic_menu_bookmark_light.png create mode 100644 res/drawable-hdpi/ic_menu_home_dark.png create mode 100644 res/drawable-hdpi/ic_menu_home_light.png create mode 100644 res/drawable-hdpi/ic_menu_library_dark.png create mode 100644 res/drawable-hdpi/ic_menu_library_light.png create mode 100644 res/drawable-hdpi/ic_menu_playlist_dark.png create mode 100644 res/drawable-hdpi/ic_menu_playlist_light.png create mode 100644 res/drawable-hdpi/ic_menu_podcast_dark.png create mode 100644 res/drawable-hdpi/ic_menu_podcast_light.png create mode 100644 res/drawable-hdpi/ic_menu_refresh_dark.png create mode 100644 res/drawable-hdpi/ic_menu_refresh_light.png create mode 100644 res/drawable-hdpi/ic_menu_remove_dark.png create mode 100644 res/drawable-hdpi/ic_menu_remove_light.png create mode 100644 res/drawable-hdpi/ic_menu_save_dark.png create mode 100644 res/drawable-hdpi/ic_menu_save_light.png create mode 100644 res/drawable-hdpi/ic_menu_search_dark.png create mode 100644 res/drawable-hdpi/ic_menu_search_light.png create mode 100644 res/drawable-hdpi/main_offline_dark.png create mode 100644 res/drawable-mdpi/ic_action_volume_dark.png create mode 100644 res/drawable-mdpi/ic_action_volume_light.png create mode 100644 res/drawable-mdpi/ic_menu_bookmark_dark.png create mode 100644 res/drawable-mdpi/ic_menu_bookmark_light.png create mode 100644 res/drawable-mdpi/ic_menu_chat_dark.png create mode 100644 res/drawable-mdpi/ic_menu_chat_light.png create mode 100644 res/drawable-mdpi/ic_menu_chat_send_dark.png create mode 100644 res/drawable-mdpi/ic_menu_chat_send_light.png create mode 100644 res/drawable-mdpi/ic_menu_home_dark.png create mode 100644 res/drawable-mdpi/ic_menu_home_light.png create mode 100644 res/drawable-mdpi/ic_menu_library_dark.png create mode 100644 res/drawable-mdpi/ic_menu_library_light.png create mode 100644 res/drawable-mdpi/ic_menu_playlist_dark.png create mode 100644 res/drawable-mdpi/ic_menu_playlist_light.png create mode 100644 res/drawable-mdpi/ic_menu_podcast_dark.png create mode 100644 res/drawable-mdpi/ic_menu_podcast_light.png create mode 100644 res/drawable-mdpi/ic_menu_refresh_dark.png create mode 100644 res/drawable-mdpi/ic_menu_refresh_light.png create mode 100644 res/drawable-mdpi/ic_menu_remove_dark.png create mode 100644 res/drawable-mdpi/ic_menu_remove_light.png create mode 100644 res/drawable-mdpi/ic_menu_save_dark.png create mode 100644 res/drawable-mdpi/ic_menu_save_light.png create mode 100644 res/drawable-mdpi/ic_menu_search_dark.png create mode 100644 res/drawable-mdpi/ic_menu_search_light.png create mode 100644 res/drawable-mdpi/main_offline_dark.png create mode 100644 res/drawable-mdpi/main_offline_light.png create mode 100644 res/drawable-xhdpi/ic_action_volume_dark.png create mode 100644 res/drawable-xhdpi/ic_action_volume_light.png create mode 100644 res/drawable-xhdpi/ic_menu_bookmark_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_bookmark_light.png create mode 100644 res/drawable-xhdpi/ic_menu_chat_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_chat_light.png create mode 100644 res/drawable-xhdpi/ic_menu_chat_send_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_chat_send_light.png create mode 100644 res/drawable-xhdpi/ic_menu_home_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_home_light.png create mode 100644 res/drawable-xhdpi/ic_menu_library_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_library_light.png create mode 100644 res/drawable-xhdpi/ic_menu_playlist_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_playlist_light.png create mode 100644 res/drawable-xhdpi/ic_menu_podcast_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_podcast_light.png create mode 100644 res/drawable-xhdpi/ic_menu_refresh_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_refresh_light.png create mode 100644 res/drawable-xhdpi/ic_menu_remove_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_remove_light.png create mode 100644 res/drawable-xhdpi/ic_menu_save_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_save_light.png create mode 100644 res/drawable-xhdpi/ic_menu_search_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_search_light.png create mode 100644 res/drawable-xhdpi/main_offline_dark.png create mode 100644 res/drawable-xhdpi/main_offline_light.png create mode 100644 res/drawable-xxhdpi/ic_action_volume_dark.png create mode 100644 res/drawable-xxhdpi/ic_action_volume_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_bookmark_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_bookmark_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_chat_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_chat_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_chat_send_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_chat_send_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_home_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_home_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_library_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_library_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_playlist_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_playlist_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_podcast_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_podcast_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_refresh_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_refresh_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_remove_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_remove_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_save_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_save_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_search_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_search_light.png create mode 100644 res/drawable-xxhdpi/main_offline_dark.png create mode 100644 res/drawable-xxhdpi/main_offline_light.png create mode 100644 res/layout/drawer_list_item.xml create mode 100644 src/github/daneren2005/dsub/view/DrawerAdapter.java (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi/ic_action_volume_dark.png b/res/drawable-hdpi/ic_action_volume_dark.png new file mode 100644 index 00000000..62550655 Binary files /dev/null and b/res/drawable-hdpi/ic_action_volume_dark.png differ diff --git a/res/drawable-hdpi/ic_action_volume_light.png b/res/drawable-hdpi/ic_action_volume_light.png new file mode 100644 index 00000000..1b1d182c Binary files /dev/null and b/res/drawable-hdpi/ic_action_volume_light.png differ diff --git a/res/drawable-hdpi/ic_menu_bookmark_dark.png b/res/drawable-hdpi/ic_menu_bookmark_dark.png new file mode 100644 index 00000000..e7cd08e4 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_bookmark_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_bookmark_light.png b/res/drawable-hdpi/ic_menu_bookmark_light.png new file mode 100644 index 00000000..fdb46da3 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_bookmark_light.png differ diff --git a/res/drawable-hdpi/ic_menu_home_dark.png b/res/drawable-hdpi/ic_menu_home_dark.png new file mode 100644 index 00000000..8f391ffd Binary files /dev/null and b/res/drawable-hdpi/ic_menu_home_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_home_light.png b/res/drawable-hdpi/ic_menu_home_light.png new file mode 100644 index 00000000..813cfa8a Binary files /dev/null and b/res/drawable-hdpi/ic_menu_home_light.png differ diff --git a/res/drawable-hdpi/ic_menu_library_dark.png b/res/drawable-hdpi/ic_menu_library_dark.png new file mode 100644 index 00000000..717cb3e1 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_library_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_library_light.png b/res/drawable-hdpi/ic_menu_library_light.png new file mode 100644 index 00000000..17a45d77 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_library_light.png differ diff --git a/res/drawable-hdpi/ic_menu_playlist_dark.png b/res/drawable-hdpi/ic_menu_playlist_dark.png new file mode 100644 index 00000000..8e3babc7 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_playlist_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_playlist_light.png b/res/drawable-hdpi/ic_menu_playlist_light.png new file mode 100644 index 00000000..4131dba4 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_playlist_light.png differ diff --git a/res/drawable-hdpi/ic_menu_podcast_dark.png b/res/drawable-hdpi/ic_menu_podcast_dark.png new file mode 100644 index 00000000..d1d62d03 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_podcast_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_podcast_light.png b/res/drawable-hdpi/ic_menu_podcast_light.png new file mode 100644 index 00000000..4ce1b787 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_podcast_light.png differ diff --git a/res/drawable-hdpi/ic_menu_refresh_dark.png b/res/drawable-hdpi/ic_menu_refresh_dark.png new file mode 100644 index 00000000..2795cfa9 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_refresh_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_refresh_light.png b/res/drawable-hdpi/ic_menu_refresh_light.png new file mode 100644 index 00000000..86d1b042 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_refresh_light.png differ diff --git a/res/drawable-hdpi/ic_menu_remove_dark.png b/res/drawable-hdpi/ic_menu_remove_dark.png new file mode 100644 index 00000000..878b378a Binary files /dev/null and b/res/drawable-hdpi/ic_menu_remove_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_remove_light.png b/res/drawable-hdpi/ic_menu_remove_light.png new file mode 100644 index 00000000..ece5ad8d Binary files /dev/null and b/res/drawable-hdpi/ic_menu_remove_light.png differ diff --git a/res/drawable-hdpi/ic_menu_save_dark.png b/res/drawable-hdpi/ic_menu_save_dark.png new file mode 100644 index 00000000..b80828bf Binary files /dev/null and b/res/drawable-hdpi/ic_menu_save_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_save_light.png b/res/drawable-hdpi/ic_menu_save_light.png new file mode 100644 index 00000000..a3a5e23a Binary files /dev/null and b/res/drawable-hdpi/ic_menu_save_light.png differ diff --git a/res/drawable-hdpi/ic_menu_search_dark.png b/res/drawable-hdpi/ic_menu_search_dark.png new file mode 100644 index 00000000..ef2b3013 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_search_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_search_light.png b/res/drawable-hdpi/ic_menu_search_light.png new file mode 100644 index 00000000..756937df Binary files /dev/null and b/res/drawable-hdpi/ic_menu_search_light.png differ diff --git a/res/drawable-hdpi/main_offline_dark.png b/res/drawable-hdpi/main_offline_dark.png new file mode 100644 index 00000000..a594530d Binary files /dev/null and b/res/drawable-hdpi/main_offline_dark.png differ diff --git a/res/drawable-mdpi/ic_action_volume_dark.png b/res/drawable-mdpi/ic_action_volume_dark.png new file mode 100644 index 00000000..2b5f1d11 Binary files /dev/null and b/res/drawable-mdpi/ic_action_volume_dark.png differ diff --git a/res/drawable-mdpi/ic_action_volume_light.png b/res/drawable-mdpi/ic_action_volume_light.png new file mode 100644 index 00000000..47071ccf Binary files /dev/null and b/res/drawable-mdpi/ic_action_volume_light.png differ diff --git a/res/drawable-mdpi/ic_menu_bookmark_dark.png b/res/drawable-mdpi/ic_menu_bookmark_dark.png new file mode 100644 index 00000000..3360f37e Binary files /dev/null and b/res/drawable-mdpi/ic_menu_bookmark_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_bookmark_light.png b/res/drawable-mdpi/ic_menu_bookmark_light.png new file mode 100644 index 00000000..b4d916fb Binary files /dev/null and b/res/drawable-mdpi/ic_menu_bookmark_light.png differ diff --git a/res/drawable-mdpi/ic_menu_chat_dark.png b/res/drawable-mdpi/ic_menu_chat_dark.png new file mode 100644 index 00000000..74d98888 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_chat_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_chat_light.png b/res/drawable-mdpi/ic_menu_chat_light.png new file mode 100644 index 00000000..468c1220 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_chat_light.png differ diff --git a/res/drawable-mdpi/ic_menu_chat_send_dark.png b/res/drawable-mdpi/ic_menu_chat_send_dark.png new file mode 100644 index 00000000..91db4a4a Binary files /dev/null and b/res/drawable-mdpi/ic_menu_chat_send_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_chat_send_light.png b/res/drawable-mdpi/ic_menu_chat_send_light.png new file mode 100644 index 00000000..f2a3e724 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_chat_send_light.png differ diff --git a/res/drawable-mdpi/ic_menu_home_dark.png b/res/drawable-mdpi/ic_menu_home_dark.png new file mode 100644 index 00000000..7be15b95 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_home_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_home_light.png b/res/drawable-mdpi/ic_menu_home_light.png new file mode 100644 index 00000000..715ffcc3 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_home_light.png differ diff --git a/res/drawable-mdpi/ic_menu_library_dark.png b/res/drawable-mdpi/ic_menu_library_dark.png new file mode 100644 index 00000000..0102d7ad Binary files /dev/null and b/res/drawable-mdpi/ic_menu_library_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_library_light.png b/res/drawable-mdpi/ic_menu_library_light.png new file mode 100644 index 00000000..a30b4d39 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_library_light.png differ diff --git a/res/drawable-mdpi/ic_menu_playlist_dark.png b/res/drawable-mdpi/ic_menu_playlist_dark.png new file mode 100644 index 00000000..ebf00427 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_playlist_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_playlist_light.png b/res/drawable-mdpi/ic_menu_playlist_light.png new file mode 100644 index 00000000..e248a488 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_playlist_light.png differ diff --git a/res/drawable-mdpi/ic_menu_podcast_dark.png b/res/drawable-mdpi/ic_menu_podcast_dark.png new file mode 100644 index 00000000..ad69156a Binary files /dev/null and b/res/drawable-mdpi/ic_menu_podcast_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_podcast_light.png b/res/drawable-mdpi/ic_menu_podcast_light.png new file mode 100644 index 00000000..c15cb03f Binary files /dev/null and b/res/drawable-mdpi/ic_menu_podcast_light.png differ diff --git a/res/drawable-mdpi/ic_menu_refresh_dark.png b/res/drawable-mdpi/ic_menu_refresh_dark.png new file mode 100644 index 00000000..554c07dc Binary files /dev/null and b/res/drawable-mdpi/ic_menu_refresh_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_refresh_light.png b/res/drawable-mdpi/ic_menu_refresh_light.png new file mode 100644 index 00000000..a2d90c16 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_refresh_light.png differ diff --git a/res/drawable-mdpi/ic_menu_remove_dark.png b/res/drawable-mdpi/ic_menu_remove_dark.png new file mode 100644 index 00000000..5ba24546 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_remove_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_remove_light.png b/res/drawable-mdpi/ic_menu_remove_light.png new file mode 100644 index 00000000..93483b6c Binary files /dev/null and b/res/drawable-mdpi/ic_menu_remove_light.png differ diff --git a/res/drawable-mdpi/ic_menu_save_dark.png b/res/drawable-mdpi/ic_menu_save_dark.png new file mode 100644 index 00000000..89aa17cc Binary files /dev/null and b/res/drawable-mdpi/ic_menu_save_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_save_light.png b/res/drawable-mdpi/ic_menu_save_light.png new file mode 100644 index 00000000..dcb3a2f6 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_save_light.png differ diff --git a/res/drawable-mdpi/ic_menu_search_dark.png b/res/drawable-mdpi/ic_menu_search_dark.png new file mode 100644 index 00000000..076085c5 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_search_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_search_light.png b/res/drawable-mdpi/ic_menu_search_light.png new file mode 100644 index 00000000..026c8498 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_search_light.png differ diff --git a/res/drawable-mdpi/main_offline_dark.png b/res/drawable-mdpi/main_offline_dark.png new file mode 100644 index 00000000..4990fb8e Binary files /dev/null and b/res/drawable-mdpi/main_offline_dark.png differ diff --git a/res/drawable-mdpi/main_offline_light.png b/res/drawable-mdpi/main_offline_light.png new file mode 100644 index 00000000..e70ec1c2 Binary files /dev/null and b/res/drawable-mdpi/main_offline_light.png differ diff --git a/res/drawable-xhdpi/ic_action_volume_dark.png b/res/drawable-xhdpi/ic_action_volume_dark.png new file mode 100644 index 00000000..400de38b Binary files /dev/null and b/res/drawable-xhdpi/ic_action_volume_dark.png differ diff --git a/res/drawable-xhdpi/ic_action_volume_light.png b/res/drawable-xhdpi/ic_action_volume_light.png new file mode 100644 index 00000000..9a1128c1 Binary files /dev/null and b/res/drawable-xhdpi/ic_action_volume_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_bookmark_dark.png b/res/drawable-xhdpi/ic_menu_bookmark_dark.png new file mode 100644 index 00000000..18f71365 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_bookmark_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_bookmark_light.png b/res/drawable-xhdpi/ic_menu_bookmark_light.png new file mode 100644 index 00000000..d5776317 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_bookmark_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_chat_dark.png b/res/drawable-xhdpi/ic_menu_chat_dark.png new file mode 100644 index 00000000..28318219 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_chat_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_chat_light.png b/res/drawable-xhdpi/ic_menu_chat_light.png new file mode 100644 index 00000000..dcc95dcb Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_chat_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_chat_send_dark.png b/res/drawable-xhdpi/ic_menu_chat_send_dark.png new file mode 100644 index 00000000..c0a5a3eb Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_chat_send_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_chat_send_light.png b/res/drawable-xhdpi/ic_menu_chat_send_light.png new file mode 100644 index 00000000..f9c3b9bb Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_chat_send_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_home_dark.png b/res/drawable-xhdpi/ic_menu_home_dark.png new file mode 100644 index 00000000..2c2b9912 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_home_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_home_light.png b/res/drawable-xhdpi/ic_menu_home_light.png new file mode 100644 index 00000000..156c58c9 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_home_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_library_dark.png b/res/drawable-xhdpi/ic_menu_library_dark.png new file mode 100644 index 00000000..b1612f65 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_library_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_library_light.png b/res/drawable-xhdpi/ic_menu_library_light.png new file mode 100644 index 00000000..1f93c8f2 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_library_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_playlist_dark.png b/res/drawable-xhdpi/ic_menu_playlist_dark.png new file mode 100644 index 00000000..fd6cd498 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_playlist_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_playlist_light.png b/res/drawable-xhdpi/ic_menu_playlist_light.png new file mode 100644 index 00000000..e7e510d0 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_playlist_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_podcast_dark.png b/res/drawable-xhdpi/ic_menu_podcast_dark.png new file mode 100644 index 00000000..40469b46 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_podcast_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_podcast_light.png b/res/drawable-xhdpi/ic_menu_podcast_light.png new file mode 100644 index 00000000..3748526a Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_podcast_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_refresh_dark.png b/res/drawable-xhdpi/ic_menu_refresh_dark.png new file mode 100644 index 00000000..b6801006 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_refresh_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_refresh_light.png b/res/drawable-xhdpi/ic_menu_refresh_light.png new file mode 100644 index 00000000..38943f82 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_refresh_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_remove_dark.png b/res/drawable-xhdpi/ic_menu_remove_dark.png new file mode 100644 index 00000000..09ce75e2 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_remove_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_remove_light.png b/res/drawable-xhdpi/ic_menu_remove_light.png new file mode 100644 index 00000000..94f7c8c1 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_remove_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_save_dark.png b/res/drawable-xhdpi/ic_menu_save_dark.png new file mode 100644 index 00000000..1612fd0a Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_save_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_save_light.png b/res/drawable-xhdpi/ic_menu_save_light.png new file mode 100644 index 00000000..5dcd75d7 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_save_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_search_dark.png b/res/drawable-xhdpi/ic_menu_search_dark.png new file mode 100644 index 00000000..1ae3dff0 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_search_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_search_light.png b/res/drawable-xhdpi/ic_menu_search_light.png new file mode 100644 index 00000000..705074bd Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_search_light.png differ diff --git a/res/drawable-xhdpi/main_offline_dark.png b/res/drawable-xhdpi/main_offline_dark.png new file mode 100644 index 00000000..231e4715 Binary files /dev/null and b/res/drawable-xhdpi/main_offline_dark.png differ diff --git a/res/drawable-xhdpi/main_offline_light.png b/res/drawable-xhdpi/main_offline_light.png new file mode 100644 index 00000000..87937fcb Binary files /dev/null and b/res/drawable-xhdpi/main_offline_light.png differ diff --git a/res/drawable-xxhdpi/ic_action_volume_dark.png b/res/drawable-xxhdpi/ic_action_volume_dark.png new file mode 100644 index 00000000..7991a65d Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_volume_dark.png differ diff --git a/res/drawable-xxhdpi/ic_action_volume_light.png b/res/drawable-xxhdpi/ic_action_volume_light.png new file mode 100644 index 00000000..8dfbf3f5 Binary files /dev/null and b/res/drawable-xxhdpi/ic_action_volume_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_bookmark_dark.png b/res/drawable-xxhdpi/ic_menu_bookmark_dark.png new file mode 100644 index 00000000..2523e14c Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_bookmark_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_bookmark_light.png b/res/drawable-xxhdpi/ic_menu_bookmark_light.png new file mode 100644 index 00000000..9e8c4591 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_bookmark_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_dark.png b/res/drawable-xxhdpi/ic_menu_chat_dark.png new file mode 100644 index 00000000..60efb47d Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_light.png b/res/drawable-xxhdpi/ic_menu_chat_light.png new file mode 100644 index 00000000..02c89560 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_send_dark.png b/res/drawable-xxhdpi/ic_menu_chat_send_dark.png new file mode 100644 index 00000000..b86ca3d3 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_send_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_chat_send_light.png b/res/drawable-xxhdpi/ic_menu_chat_send_light.png new file mode 100644 index 00000000..048b8aac Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_chat_send_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_home_dark.png b/res/drawable-xxhdpi/ic_menu_home_dark.png new file mode 100644 index 00000000..15f458e7 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_home_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_home_light.png b/res/drawable-xxhdpi/ic_menu_home_light.png new file mode 100644 index 00000000..765386c4 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_home_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_library_dark.png b/res/drawable-xxhdpi/ic_menu_library_dark.png new file mode 100644 index 00000000..02a4f3f2 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_library_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_library_light.png b/res/drawable-xxhdpi/ic_menu_library_light.png new file mode 100644 index 00000000..52ce8203 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_library_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_playlist_dark.png b/res/drawable-xxhdpi/ic_menu_playlist_dark.png new file mode 100644 index 00000000..2c955eee Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_playlist_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_playlist_light.png b/res/drawable-xxhdpi/ic_menu_playlist_light.png new file mode 100644 index 00000000..d1877328 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_playlist_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_podcast_dark.png b/res/drawable-xxhdpi/ic_menu_podcast_dark.png new file mode 100644 index 00000000..a748dc60 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_podcast_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_podcast_light.png b/res/drawable-xxhdpi/ic_menu_podcast_light.png new file mode 100644 index 00000000..efa7b037 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_podcast_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_refresh_dark.png b/res/drawable-xxhdpi/ic_menu_refresh_dark.png new file mode 100644 index 00000000..0e5616bd Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_refresh_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_refresh_light.png b/res/drawable-xxhdpi/ic_menu_refresh_light.png new file mode 100644 index 00000000..7dea70df Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_refresh_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_remove_dark.png b/res/drawable-xxhdpi/ic_menu_remove_dark.png new file mode 100644 index 00000000..d5952ea0 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_remove_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_remove_light.png b/res/drawable-xxhdpi/ic_menu_remove_light.png new file mode 100644 index 00000000..c814869e Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_remove_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_save_dark.png b/res/drawable-xxhdpi/ic_menu_save_dark.png new file mode 100644 index 00000000..acb264ec Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_save_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_save_light.png b/res/drawable-xxhdpi/ic_menu_save_light.png new file mode 100644 index 00000000..fcd18ccd Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_save_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_search_dark.png b/res/drawable-xxhdpi/ic_menu_search_dark.png new file mode 100644 index 00000000..500ac03a Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_search_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_search_light.png b/res/drawable-xxhdpi/ic_menu_search_light.png new file mode 100644 index 00000000..fa64f9e8 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_search_light.png differ diff --git a/res/drawable-xxhdpi/main_offline_dark.png b/res/drawable-xxhdpi/main_offline_dark.png new file mode 100644 index 00000000..c415e0a5 Binary files /dev/null and b/res/drawable-xxhdpi/main_offline_dark.png differ diff --git a/res/drawable-xxhdpi/main_offline_light.png b/res/drawable-xxhdpi/main_offline_light.png new file mode 100644 index 00000000..b7e1c380 Binary files /dev/null and b/res/drawable-xxhdpi/main_offline_light.png differ diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml new file mode 100644 index 00000000..608affea --- /dev/null +++ b/res/layout/drawer_list_item.xml @@ -0,0 +1,24 @@ + + + + + + + \ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 21b500d2..adc60c9e 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -18,6 +18,15 @@ Chat + + @drawable/ic_menu_home_dark + @drawable/ic_menu_library_dark + @drawable/ic_menu_playlist_dark + @drawable/ic_menu_podcast_dark + @drawable/ic_menu_bookmark_dark + @drawable/ic_menu_chat_dark + + light dark diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index 71b2b790..3c884683 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageInfo; +import android.content.res.TypedArray; import android.media.AudioManager; import android.os.Build; import android.os.Bundle; @@ -58,10 +59,14 @@ import github.daneren2005.dsub.service.DownloadServiceImpl; import github.daneren2005.dsub.util.Constants; import github.daneren2005.dsub.util.ImageLoader; import github.daneren2005.dsub.util.Util; +import github.daneren2005.dsub.view.DrawerAdapter; + import java.io.File; import java.io.PrintWriter; +import java.util.AbstractList; import java.util.ArrayList; import java.util.Arrays; +import java.util.Iterator; import java.util.List; public class SubsonicActivity extends ActionBarActivity implements OnItemSelectedListener { @@ -376,11 +381,18 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte int alreadyRemoved = 0; List drawerItemsList = new ArrayList(Arrays.asList(drawerItems)); List drawerItemsDescriptionsList = new ArrayList(Arrays.asList(drawerItemsDescriptions)); + List drawerItemsIconsList = new ArrayList(); + + TypedArray typedArray = getResources().obtainTypedArray(R.array.drawerItemIcons); + for(int i = 0; i < drawerItemsList.size(); i++) { + drawerItemsIconsList.add(typedArray.getResourceId(i, 0)); + } // Selectively remove podcast listing [3] if(!podcastsEnabled) { drawerItemsList.remove(3 - alreadyRemoved); drawerItemsDescriptionsList.remove(3 - alreadyRemoved); + drawerItemsIconsList.remove(3 - alreadyRemoved); alreadyRemoved++; } @@ -388,6 +400,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte if(!bookmarksEnabled) { drawerItemsList.remove(4 - alreadyRemoved); drawerItemsDescriptionsList.remove(4 - alreadyRemoved); + drawerItemsIconsList.remove(4 - alreadyRemoved); alreadyRemoved++; } @@ -395,6 +408,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte if(!chatEnabled) { drawerItemsList.remove(5 - alreadyRemoved); drawerItemsDescriptionsList.remove(5 - alreadyRemoved); + drawerItemsIconsList.remove(5 - alreadyRemoved); alreadyRemoved++; } @@ -404,23 +418,13 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte drawerItemsDescriptions = drawerItemsDescriptionsList.toArray(new String[0]); } - drawerList.setAdapter(new ArrayAdapter(this, android.R.layout.simple_list_item_1, drawerItems)); + drawerList.setAdapter(new DrawerAdapter(this, drawerItemsList, drawerItemsIconsList)); enabledItems[0] = podcastsEnabled; enabledItems[1] = bookmarksEnabled; enabledItems[2] = chatEnabled; } } - public void startActivity(Class t) { - Intent intent = new Intent(); - intent.setClass(SubsonicActivity.this, t); - intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - startActivity(intent); - if(this.getClass() != SubsonicFragmentActivity.class) { - finish(); - } - drawer.closeDrawers(); - } public void startFragmentActivity(String fragmentType) { Intent intent = new Intent(); intent.setClass(SubsonicActivity.this, SubsonicFragmentActivity.class); diff --git a/src/github/daneren2005/dsub/view/DrawerAdapter.java b/src/github/daneren2005/dsub/view/DrawerAdapter.java new file mode 100644 index 00000000..d3639373 --- /dev/null +++ b/src/github/daneren2005/dsub/view/DrawerAdapter.java @@ -0,0 +1,68 @@ +/* + This file is part of Subsonic. + + Subsonic is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Subsonic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Subsonic. If not, see . + + Copyright 2009 (C) Sindre Mehus +*/ +package github.daneren2005.dsub.view; + +import android.content.Context; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import java.util.List; + +import github.daneren2005.dsub.R; + +/** + * Created by Scott on 11/8/13. + */ +public class DrawerAdapter extends ArrayAdapter { + private static String TAG = DrawerAdapter.class.getSimpleName(); + private Context context; + private List items; + private List icons; + + public DrawerAdapter(Context context, List items, List icons) { + super(context, R.layout.drawer_list_item, items); + + this.context = context; + this.items = items; + this.icons = icons; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + String item = items.get(position); + Integer icon = icons.get(position); + + if(convertView == null) { + convertView = LayoutInflater.from(context).inflate(R.layout.drawer_list_item, null); + } + + TextView textView = (TextView) convertView.findViewById(R.id.drawer_name); + textView.setText(item); + ImageView iconView = (ImageView) convertView.findViewById(R.id.drawer_icon); + Log.d(TAG, "icon: " + icon); + iconView.setImageResource(icon); + + return convertView; + } +} -- cgit v1.2.3 From 4656ce51bad7e2a7ac538c7dea3c6a29e284b84f Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sun, 10 Nov 2013 20:53:25 -0800 Subject: Fixed drawer icons to be themed, added settings to drawer --- Subsonic.iml | 2 +- res/drawable-hdpi/ic_menu_home_dark.png | Bin 916 -> 0 bytes res/drawable-hdpi/ic_menu_home_light.png | Bin 992 -> 0 bytes res/drawable-hdpi/ic_menu_settings_dark.png | Bin 0 -> 557 bytes res/drawable-hdpi/ic_menu_settings_light.png | Bin 0 -> 586 bytes res/drawable-mdpi/ic_menu_home_dark.png | Bin 550 -> 0 bytes res/drawable-mdpi/ic_menu_home_light.png | Bin 656 -> 0 bytes res/drawable-mdpi/ic_menu_settings_dark.png | Bin 0 -> 365 bytes res/drawable-mdpi/ic_menu_settings_light.png | Bin 0 -> 365 bytes res/drawable-xhdpi/ic_menu_home_dark.png | Bin 1225 -> 0 bytes res/drawable-xhdpi/ic_menu_home_light.png | Bin 1360 -> 0 bytes res/drawable-xhdpi/ic_menu_settings_dark.png | Bin 0 -> 708 bytes res/drawable-xhdpi/ic_menu_settings_light.png | Bin 0 -> 748 bytes res/drawable-xxhdpi/ic_menu_home_dark.png | Bin 1998 -> 0 bytes res/drawable-xxhdpi/ic_menu_home_light.png | Bin 2249 -> 0 bytes res/drawable-xxhdpi/ic_menu_settings_dark.png | Bin 0 -> 1221 bytes res/drawable-xxhdpi/ic_menu_settings_light.png | Bin 0 -> 1194 bytes res/layout/drawer_list_item.xml | 7 +++--- res/menu/abstract_top_menu.xml | 4 ---- res/menu/drawer_menu.xml | 4 ---- res/menu/main.xml | 4 ---- res/menu/search.xml | 4 ---- res/menu/select_artist.xml | 4 ---- res/menu/select_podcasts.xml | 4 ---- res/values/arrays.xml | 17 +++++++++++++-- res/values/attrs.xml | 2 +- res/values/themes.xml | 6 +++--- .../dsub/activity/SubsonicActivity.java | 24 +++++++++++++++------ .../dsub/fragments/SubsonicFragment.java | 3 --- 29 files changed, 41 insertions(+), 44 deletions(-) delete mode 100644 res/drawable-hdpi/ic_menu_home_dark.png delete mode 100644 res/drawable-hdpi/ic_menu_home_light.png create mode 100644 res/drawable-hdpi/ic_menu_settings_dark.png create mode 100644 res/drawable-hdpi/ic_menu_settings_light.png delete mode 100644 res/drawable-mdpi/ic_menu_home_dark.png delete mode 100644 res/drawable-mdpi/ic_menu_home_light.png create mode 100644 res/drawable-mdpi/ic_menu_settings_dark.png create mode 100644 res/drawable-mdpi/ic_menu_settings_light.png delete mode 100644 res/drawable-xhdpi/ic_menu_home_dark.png delete mode 100644 res/drawable-xhdpi/ic_menu_home_light.png create mode 100644 res/drawable-xhdpi/ic_menu_settings_dark.png create mode 100644 res/drawable-xhdpi/ic_menu_settings_light.png delete mode 100644 res/drawable-xxhdpi/ic_menu_home_dark.png delete mode 100644 res/drawable-xxhdpi/ic_menu_home_light.png create mode 100644 res/drawable-xxhdpi/ic_menu_settings_dark.png create mode 100644 res/drawable-xxhdpi/ic_menu_settings_light.png (limited to 'res/drawable-mdpi') diff --git a/Subsonic.iml b/Subsonic.iml index d89b96cf..cbfa6072 100644 --- a/Subsonic.iml +++ b/Subsonic.iml @@ -11,7 +11,7 @@ - + diff --git a/res/drawable-hdpi/ic_menu_home_dark.png b/res/drawable-hdpi/ic_menu_home_dark.png deleted file mode 100644 index 8f391ffd..00000000 Binary files a/res/drawable-hdpi/ic_menu_home_dark.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_home_light.png b/res/drawable-hdpi/ic_menu_home_light.png deleted file mode 100644 index 813cfa8a..00000000 Binary files a/res/drawable-hdpi/ic_menu_home_light.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_settings_dark.png b/res/drawable-hdpi/ic_menu_settings_dark.png new file mode 100644 index 00000000..d6dd17ec Binary files /dev/null and b/res/drawable-hdpi/ic_menu_settings_dark.png differ diff --git a/res/drawable-hdpi/ic_menu_settings_light.png b/res/drawable-hdpi/ic_menu_settings_light.png new file mode 100644 index 00000000..70c29951 Binary files /dev/null and b/res/drawable-hdpi/ic_menu_settings_light.png differ diff --git a/res/drawable-mdpi/ic_menu_home_dark.png b/res/drawable-mdpi/ic_menu_home_dark.png deleted file mode 100644 index 7be15b95..00000000 Binary files a/res/drawable-mdpi/ic_menu_home_dark.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_home_light.png b/res/drawable-mdpi/ic_menu_home_light.png deleted file mode 100644 index 715ffcc3..00000000 Binary files a/res/drawable-mdpi/ic_menu_home_light.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_settings_dark.png b/res/drawable-mdpi/ic_menu_settings_dark.png new file mode 100644 index 00000000..fc2bf8c3 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_settings_dark.png differ diff --git a/res/drawable-mdpi/ic_menu_settings_light.png b/res/drawable-mdpi/ic_menu_settings_light.png new file mode 100644 index 00000000..0e65c682 Binary files /dev/null and b/res/drawable-mdpi/ic_menu_settings_light.png differ diff --git a/res/drawable-xhdpi/ic_menu_home_dark.png b/res/drawable-xhdpi/ic_menu_home_dark.png deleted file mode 100644 index 2c2b9912..00000000 Binary files a/res/drawable-xhdpi/ic_menu_home_dark.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_home_light.png b/res/drawable-xhdpi/ic_menu_home_light.png deleted file mode 100644 index 156c58c9..00000000 Binary files a/res/drawable-xhdpi/ic_menu_home_light.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_settings_dark.png b/res/drawable-xhdpi/ic_menu_settings_dark.png new file mode 100644 index 00000000..ae917587 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_settings_dark.png differ diff --git a/res/drawable-xhdpi/ic_menu_settings_light.png b/res/drawable-xhdpi/ic_menu_settings_light.png new file mode 100644 index 00000000..29f961b2 Binary files /dev/null and b/res/drawable-xhdpi/ic_menu_settings_light.png differ diff --git a/res/drawable-xxhdpi/ic_menu_home_dark.png b/res/drawable-xxhdpi/ic_menu_home_dark.png deleted file mode 100644 index 15f458e7..00000000 Binary files a/res/drawable-xxhdpi/ic_menu_home_dark.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_home_light.png b/res/drawable-xxhdpi/ic_menu_home_light.png deleted file mode 100644 index 765386c4..00000000 Binary files a/res/drawable-xxhdpi/ic_menu_home_light.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_settings_dark.png b/res/drawable-xxhdpi/ic_menu_settings_dark.png new file mode 100644 index 00000000..ded5dbb5 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_settings_dark.png differ diff --git a/res/drawable-xxhdpi/ic_menu_settings_light.png b/res/drawable-xxhdpi/ic_menu_settings_light.png new file mode 100644 index 00000000..cd242306 Binary files /dev/null and b/res/drawable-xxhdpi/ic_menu_settings_light.png differ diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml index 608affea..66dd5a70 100644 --- a/res/layout/drawer_list_item.xml +++ b/res/layout/drawer_list_item.xml @@ -3,8 +3,8 @@ android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingTop="2dip" - android:paddingBottom="3dip"> + android:paddingTop="5dip" + android:paddingBottom="6dip"> + android:paddingRight="8dip" + android:paddingLeft="10dip"/> - - diff --git a/res/menu/drawer_menu.xml b/res/menu/drawer_menu.xml index 2b557738..c2969938 100644 --- a/res/menu/drawer_menu.xml +++ b/res/menu/drawer_menu.xml @@ -2,10 +2,6 @@ - - diff --git a/res/menu/main.xml b/res/menu/main.xml index 22809c47..5e504242 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -25,10 +25,6 @@ android:id="@+id/menu_changelog" android:title="@string/changelog_full_title"/> - - diff --git a/res/menu/search.xml b/res/menu/search.xml index fdadd748..cab9c4f6 100644 --- a/res/menu/search.xml +++ b/res/menu/search.xml @@ -7,10 +7,6 @@ android:title="@string/menu.search" compat:showAsAction="ifRoom|withText"/> - - diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml index 5e10dc80..d1e1f4e3 100644 --- a/res/menu/select_artist.xml +++ b/res/menu/select_artist.xml @@ -19,10 +19,6 @@ android:title="@string/menu.search" compat:showAsAction="ifRoom|withText"/> - - diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml index d97ebe6c..212feb04 100644 --- a/res/menu/select_podcasts.xml +++ b/res/menu/select_podcasts.xml @@ -21,10 +21,6 @@ android:id="@+id/menu_check" android:title="@string/menu.check_podcasts"/> - - diff --git a/res/values/arrays.xml b/res/values/arrays.xml index adc60c9e..269c75ae 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -7,6 +7,7 @@ @string/button_bar.podcasts @string/button_bar.bookmarks @string/button_bar.chat + @string/menu.settings @@ -16,15 +17,27 @@ Podcast Bookmark Chat + Settings - - @drawable/ic_menu_home_dark + + @drawable/main_offline_light + @drawable/ic_menu_library_light + @drawable/ic_menu_playlist_light + @drawable/ic_menu_podcast_light + @drawable/ic_menu_bookmark_light + @drawable/ic_menu_chat_light + @drawable/ic_menu_settings_light + + + + @drawable/main_offline_dark @drawable/ic_menu_library_dark @drawable/ic_menu_playlist_dark @drawable/ic_menu_podcast_dark @drawable/ic_menu_bookmark_dark @drawable/ic_menu_chat_dark + @drawable/ic_menu_settings_dark diff --git a/res/values/attrs.xml b/res/values/attrs.xml index e54db415..f38f749a 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -7,7 +7,6 @@ - @@ -16,4 +15,5 @@ + diff --git a/res/values/themes.xml b/res/values/themes.xml index 4f00b7ec..7e48cfb9 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -10,7 +10,6 @@ @drawable/media_repeat_off_light @drawable/media_start_light @drawable/media_stop_light - @drawable/ic_menu_chat_light @drawable/ic_menu_chat_send_light @drawable/download_none_light @drawable/ic_menu_shuffle_light @@ -19,6 +18,7 @@ @drawable/ic_menu_remove_light @drawable/ic_menu_save_light @drawable/ic_action_volume_light + @array/drawerItemIconsLight @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -33,7 +33,6 @@ @drawable/media_repeat_off @drawable/media_start_dark @drawable/media_stop_dark - @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark @drawable/ic_menu_shuffle_dark @@ -42,6 +41,7 @@ @drawable/ic_menu_remove_dark @drawable/ic_menu_save_dark @drawable/ic_action_volume_dark + @array/drawerItemIconsDark @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -59,7 +59,6 @@ @drawable/media_repeat_off @drawable/media_start_dark @drawable/media_stop_dark - @drawable/ic_menu_chat_dark @drawable/ic_menu_chat_send_dark @drawable/download_none_dark @drawable/ic_menu_shuffle_dark @@ -68,6 +67,7 @@ @drawable/ic_menu_remove_dark @drawable/ic_menu_save_dark @drawable/ic_action_volume_dark + @array/drawerItemIconsDark @style/DSub.TextViewStyle @style/DSub.ButtonStyle diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java index 3c884683..0ac2aa19 100644 --- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -158,12 +158,17 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte drawerList.setOnItemClickListener(new ListView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - startFragmentActivity(drawerItemsDescriptions[position]); + if("Settings".equals(drawerItemsDescriptions[position])) { + startActivity(new Intent(SubsonicActivity.this, SettingsActivity.class)); + drawer.closeDrawers(); + } else { + startFragmentActivity(drawerItemsDescriptions[position]); - if(lastSelectedView != view) { - lastSelectedView.setBackgroundResource(android.R.color.transparent); - view.setBackgroundResource(R.color.dividerColor); - lastSelectedView = view; + if(lastSelectedView != view) { + lastSelectedView.setBackgroundResource(android.R.color.transparent); + view.setBackgroundResource(R.color.dividerColor); + lastSelectedView = view; + } } } }); @@ -383,10 +388,15 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte List drawerItemsDescriptionsList = new ArrayList(Arrays.asList(drawerItemsDescriptions)); List drawerItemsIconsList = new ArrayList(); - TypedArray typedArray = getResources().obtainTypedArray(R.array.drawerItemIcons); + int[] arrayAttr = {R.attr.drawerItemsIcons}; + TypedArray arrayType = obtainStyledAttributes(arrayAttr); + int arrayId = arrayType.getResourceId(0, 0); + TypedArray iconType = getResources().obtainTypedArray(arrayId); for(int i = 0; i < drawerItemsList.size(); i++) { - drawerItemsIconsList.add(typedArray.getResourceId(i, 0)); + drawerItemsIconsList.add(iconType.getResourceId(i, 0)); } + iconType.recycle(); + arrayType.recycle(); // Selectively remove podcast listing [3] if(!podcastsEnabled) { diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java index 18c9476a..5965db0b 100644 --- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java +++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java @@ -144,9 +144,6 @@ public class SubsonicFragment extends Fragment { case R.id.menu_exit: exit(); return true; - case R.id.menu_settings: - startActivity(new Intent(context, SettingsActivity.class)); - return true; } return false; -- cgit v1.2.3 From c7767207dc85058e41fbaf3e91bce1d1f94b6f9f Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sun, 10 Nov 2013 22:03:11 -0800 Subject: Updated some more icons --- res/drawable-hdpi/action_toggle_list.png | Bin 552 -> 0 bytes res/drawable-hdpi/action_toggle_list_dark.png | Bin 0 -> 290 bytes res/drawable-hdpi/action_toggle_list_light.png | Bin 0 -> 309 bytes res/drawable-hdpi/actionbar_background.9.png | Bin 234 -> 0 bytes res/drawable-hdpi/album_art_background.png | Bin 9287 -> 0 bytes res/drawable-hdpi/downloading.png | Bin 457 -> 0 bytes res/drawable-hdpi/downloading_dark.png | Bin 0 -> 618 bytes res/drawable-hdpi/downloading_light.png | Bin 0 -> 743 bytes res/drawable-hdpi/main_select_server.png | Bin 1920 -> 0 bytes res/drawable-hdpi/main_select_server_dark.png | Bin 0 -> 720 bytes res/drawable-hdpi/main_select_server_light.png | Bin 0 -> 799 bytes res/drawable-mdpi/action_toggle_list_dark.png | Bin 0 -> 204 bytes res/drawable-mdpi/action_toggle_list_light.png | Bin 0 -> 225 bytes res/drawable-mdpi/downloading_dark.png | Bin 0 -> 447 bytes res/drawable-mdpi/downloading_light.png | Bin 0 -> 527 bytes res/drawable-mdpi/main_select_server_dark.png | Bin 0 -> 434 bytes res/drawable-mdpi/main_select_server_light.png | Bin 0 -> 502 bytes res/drawable-xhdpi/action_toggle_list_dark.png | Bin 0 -> 312 bytes res/drawable-xhdpi/action_toggle_list_light.png | Bin 0 -> 320 bytes res/drawable-xhdpi/downloading_dark.png | Bin 0 -> 869 bytes res/drawable-xhdpi/downloading_light.png | Bin 0 -> 1017 bytes res/drawable-xhdpi/main_select_server_dark.png | Bin 0 -> 939 bytes res/drawable-xhdpi/main_select_server_light.png | Bin 0 -> 1079 bytes res/drawable-xxhdpi/action_toggle_list_dark.png | Bin 0 -> 608 bytes res/drawable-xxhdpi/action_toggle_list_light.png | Bin 0 -> 630 bytes res/drawable-xxhdpi/downloading_dark.png | Bin 0 -> 1353 bytes res/drawable-xxhdpi/downloading_light.png | Bin 0 -> 1542 bytes res/drawable-xxhdpi/main_select_server_dark.png | Bin 0 -> 1396 bytes res/drawable-xxhdpi/main_select_server_light.png | Bin 0 -> 1622 bytes res/layout/download_media_buttons.xml | 2 +- res/layout/main_buttons.xml | 2 +- res/layout/select_artist_header.xml | 2 +- res/layout/song_list_item.xml | 20 ++++++++++++++------ res/values/attrs.xml | 3 +++ res/values/themes.xml | 9 +++++++++ src/github/daneren2005/dsub/view/SongView.java | 18 ++++++++++-------- 36 files changed, 39 insertions(+), 17 deletions(-) delete mode 100644 res/drawable-hdpi/action_toggle_list.png create mode 100644 res/drawable-hdpi/action_toggle_list_dark.png create mode 100644 res/drawable-hdpi/action_toggle_list_light.png delete mode 100644 res/drawable-hdpi/actionbar_background.9.png delete mode 100644 res/drawable-hdpi/album_art_background.png delete mode 100644 res/drawable-hdpi/downloading.png create mode 100644 res/drawable-hdpi/downloading_dark.png create mode 100644 res/drawable-hdpi/downloading_light.png delete mode 100644 res/drawable-hdpi/main_select_server.png create mode 100644 res/drawable-hdpi/main_select_server_dark.png create mode 100644 res/drawable-hdpi/main_select_server_light.png create mode 100644 res/drawable-mdpi/action_toggle_list_dark.png create mode 100644 res/drawable-mdpi/action_toggle_list_light.png create mode 100644 res/drawable-mdpi/downloading_dark.png create mode 100644 res/drawable-mdpi/downloading_light.png create mode 100644 res/drawable-mdpi/main_select_server_dark.png create mode 100644 res/drawable-mdpi/main_select_server_light.png create mode 100644 res/drawable-xhdpi/action_toggle_list_dark.png create mode 100644 res/drawable-xhdpi/action_toggle_list_light.png create mode 100644 res/drawable-xhdpi/downloading_dark.png create mode 100644 res/drawable-xhdpi/downloading_light.png create mode 100644 res/drawable-xhdpi/main_select_server_dark.png create mode 100644 res/drawable-xhdpi/main_select_server_light.png create mode 100644 res/drawable-xxhdpi/action_toggle_list_dark.png create mode 100644 res/drawable-xxhdpi/action_toggle_list_light.png create mode 100644 res/drawable-xxhdpi/downloading_dark.png create mode 100644 res/drawable-xxhdpi/downloading_light.png create mode 100644 res/drawable-xxhdpi/main_select_server_dark.png create mode 100644 res/drawable-xxhdpi/main_select_server_light.png (limited to 'res/drawable-mdpi') diff --git a/res/drawable-hdpi/action_toggle_list.png b/res/drawable-hdpi/action_toggle_list.png deleted file mode 100644 index 87f9280f..00000000 Binary files a/res/drawable-hdpi/action_toggle_list.png and /dev/null differ diff --git a/res/drawable-hdpi/action_toggle_list_dark.png b/res/drawable-hdpi/action_toggle_list_dark.png new file mode 100644 index 00000000..d0ec1a5d Binary files /dev/null and b/res/drawable-hdpi/action_toggle_list_dark.png differ diff --git a/res/drawable-hdpi/action_toggle_list_light.png b/res/drawable-hdpi/action_toggle_list_light.png new file mode 100644 index 00000000..60ec88be Binary files /dev/null and b/res/drawable-hdpi/action_toggle_list_light.png differ diff --git a/res/drawable-hdpi/actionbar_background.9.png b/res/drawable-hdpi/actionbar_background.9.png deleted file mode 100644 index 9ce38a61..00000000 Binary files a/res/drawable-hdpi/actionbar_background.9.png and /dev/null differ diff --git a/res/drawable-hdpi/album_art_background.png b/res/drawable-hdpi/album_art_background.png deleted file mode 100644 index f0757695..00000000 Binary files a/res/drawable-hdpi/album_art_background.png and /dev/null differ diff --git a/res/drawable-hdpi/downloading.png b/res/drawable-hdpi/downloading.png deleted file mode 100644 index afff39a9..00000000 Binary files a/res/drawable-hdpi/downloading.png and /dev/null differ diff --git a/res/drawable-hdpi/downloading_dark.png b/res/drawable-hdpi/downloading_dark.png new file mode 100644 index 00000000..3ccb1837 Binary files /dev/null and b/res/drawable-hdpi/downloading_dark.png differ diff --git a/res/drawable-hdpi/downloading_light.png b/res/drawable-hdpi/downloading_light.png new file mode 100644 index 00000000..07be3016 Binary files /dev/null and b/res/drawable-hdpi/downloading_light.png differ diff --git a/res/drawable-hdpi/main_select_server.png b/res/drawable-hdpi/main_select_server.png deleted file mode 100644 index c2cefead..00000000 Binary files a/res/drawable-hdpi/main_select_server.png and /dev/null differ diff --git a/res/drawable-hdpi/main_select_server_dark.png b/res/drawable-hdpi/main_select_server_dark.png new file mode 100644 index 00000000..e3a9dd5d Binary files /dev/null and b/res/drawable-hdpi/main_select_server_dark.png differ diff --git a/res/drawable-hdpi/main_select_server_light.png b/res/drawable-hdpi/main_select_server_light.png new file mode 100644 index 00000000..4606410d Binary files /dev/null and b/res/drawable-hdpi/main_select_server_light.png differ diff --git a/res/drawable-mdpi/action_toggle_list_dark.png b/res/drawable-mdpi/action_toggle_list_dark.png new file mode 100644 index 00000000..ace7fcee Binary files /dev/null and b/res/drawable-mdpi/action_toggle_list_dark.png differ diff --git a/res/drawable-mdpi/action_toggle_list_light.png b/res/drawable-mdpi/action_toggle_list_light.png new file mode 100644 index 00000000..fa6432da Binary files /dev/null and b/res/drawable-mdpi/action_toggle_list_light.png differ diff --git a/res/drawable-mdpi/downloading_dark.png b/res/drawable-mdpi/downloading_dark.png new file mode 100644 index 00000000..ae6c5c9c Binary files /dev/null and b/res/drawable-mdpi/downloading_dark.png differ diff --git a/res/drawable-mdpi/downloading_light.png b/res/drawable-mdpi/downloading_light.png new file mode 100644 index 00000000..abd5b748 Binary files /dev/null and b/res/drawable-mdpi/downloading_light.png differ diff --git a/res/drawable-mdpi/main_select_server_dark.png b/res/drawable-mdpi/main_select_server_dark.png new file mode 100644 index 00000000..119b1573 Binary files /dev/null and b/res/drawable-mdpi/main_select_server_dark.png differ diff --git a/res/drawable-mdpi/main_select_server_light.png b/res/drawable-mdpi/main_select_server_light.png new file mode 100644 index 00000000..7d8dad34 Binary files /dev/null and b/res/drawable-mdpi/main_select_server_light.png differ diff --git a/res/drawable-xhdpi/action_toggle_list_dark.png b/res/drawable-xhdpi/action_toggle_list_dark.png new file mode 100644 index 00000000..92003c6b Binary files /dev/null and b/res/drawable-xhdpi/action_toggle_list_dark.png differ diff --git a/res/drawable-xhdpi/action_toggle_list_light.png b/res/drawable-xhdpi/action_toggle_list_light.png new file mode 100644 index 00000000..a4007ea5 Binary files /dev/null and b/res/drawable-xhdpi/action_toggle_list_light.png differ diff --git a/res/drawable-xhdpi/downloading_dark.png b/res/drawable-xhdpi/downloading_dark.png new file mode 100644 index 00000000..3f14bdf4 Binary files /dev/null and b/res/drawable-xhdpi/downloading_dark.png differ diff --git a/res/drawable-xhdpi/downloading_light.png b/res/drawable-xhdpi/downloading_light.png new file mode 100644 index 00000000..643c15d0 Binary files /dev/null and b/res/drawable-xhdpi/downloading_light.png differ diff --git a/res/drawable-xhdpi/main_select_server_dark.png b/res/drawable-xhdpi/main_select_server_dark.png new file mode 100644 index 00000000..b84f1851 Binary files /dev/null and b/res/drawable-xhdpi/main_select_server_dark.png differ diff --git a/res/drawable-xhdpi/main_select_server_light.png b/res/drawable-xhdpi/main_select_server_light.png new file mode 100644 index 00000000..ee154cc7 Binary files /dev/null and b/res/drawable-xhdpi/main_select_server_light.png differ diff --git a/res/drawable-xxhdpi/action_toggle_list_dark.png b/res/drawable-xxhdpi/action_toggle_list_dark.png new file mode 100644 index 00000000..598fc312 Binary files /dev/null and b/res/drawable-xxhdpi/action_toggle_list_dark.png differ diff --git a/res/drawable-xxhdpi/action_toggle_list_light.png b/res/drawable-xxhdpi/action_toggle_list_light.png new file mode 100644 index 00000000..ceb3fade Binary files /dev/null and b/res/drawable-xxhdpi/action_toggle_list_light.png differ diff --git a/res/drawable-xxhdpi/downloading_dark.png b/res/drawable-xxhdpi/downloading_dark.png new file mode 100644 index 00000000..afc4bf84 Binary files /dev/null and b/res/drawable-xxhdpi/downloading_dark.png differ diff --git a/res/drawable-xxhdpi/downloading_light.png b/res/drawable-xxhdpi/downloading_light.png new file mode 100644 index 00000000..ba31a979 Binary files /dev/null and b/res/drawable-xxhdpi/downloading_light.png differ diff --git a/res/drawable-xxhdpi/main_select_server_dark.png b/res/drawable-xxhdpi/main_select_server_dark.png new file mode 100644 index 00000000..b85e3a1e Binary files /dev/null and b/res/drawable-xxhdpi/main_select_server_dark.png differ diff --git a/res/drawable-xxhdpi/main_select_server_light.png b/res/drawable-xxhdpi/main_select_server_light.png new file mode 100644 index 00000000..8fc39eff Binary files /dev/null and b/res/drawable-xxhdpi/main_select_server_light.png differ diff --git a/res/layout/download_media_buttons.xml b/res/layout/download_media_buttons.xml index 1835a373..1ccf6c68 100644 --- a/res/layout/download_media_buttons.xml +++ b/res/layout/download_media_buttons.xml @@ -54,7 +54,7 @@ diff --git a/res/layout/main_buttons.xml b/res/layout/main_buttons.xml index c087bc2d..7729315c 100644 --- a/res/layout/main_buttons.xml +++ b/res/layout/main_buttons.xml @@ -15,7 +15,7 @@ android:minHeight="?android:attr/listPreferredItemHeight"> diff --git a/res/layout/select_artist_header.xml b/res/layout/select_artist_header.xml index 0b3d151b..ba1b3d47 100644 --- a/res/layout/select_artist_header.xml +++ b/res/layout/select_artist_header.xml @@ -14,7 +14,7 @@ android:minHeight="?android:attr/listPreferredItemHeight"> diff --git a/res/layout/song_list_item.xml b/res/layout/song_list_item.xml index e6bef279..3bf7ab44 100644 --- a/res/layout/song_list_item.xml +++ b/res/layout/song_list_item.xml @@ -48,12 +48,20 @@ android:visibility="gone"/> + android:id="@+id/song_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center_vertical" + android:drawablePadding="1dip" + android:paddingRight="2dip"/> + + + + + diff --git a/res/values/themes.xml b/res/values/themes.xml index 7e48cfb9..06cbab6e 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -18,6 +18,9 @@ @drawable/ic_menu_remove_light @drawable/ic_menu_save_light @drawable/ic_action_volume_light + @drawable/action_toggle_list_light + @drawable/main_select_server_light + @drawable/downloading_light @array/drawerItemIconsLight @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -41,6 +44,9 @@ @drawable/ic_menu_remove_dark @drawable/ic_menu_save_dark @drawable/ic_action_volume_dark + @drawable/action_toggle_list_dark + @drawable/main_select_server_dark + @drawable/downloading_dark @array/drawerItemIconsDark @style/DSub.TextViewStyle @style/DSub.ButtonStyle @@ -67,6 +73,9 @@ @drawable/ic_menu_remove_dark @drawable/ic_menu_save_dark @drawable/ic_action_volume_dark + @drawable/action_toggle_list_dark + @drawable/main_select_server_dark + @drawable/downloading_dark @array/drawerItemIconsDark @style/DSub.TextViewStyle @style/DSub.ButtonStyle diff --git a/src/github/daneren2005/dsub/view/SongView.java b/src/github/daneren2005/dsub/view/SongView.java index c619834e..c256495b 100644 --- a/src/github/daneren2005/dsub/view/SongView.java +++ b/src/github/daneren2005/dsub/view/SongView.java @@ -51,13 +51,14 @@ public class SongView extends UpdateView implements Checkable { private TextView artistTextView; private TextView durationTextView; private TextView statusTextView; + private ImageView statusImageView; private DownloadService downloadService; private long revision = -1; private DownloadFile downloadFile; private boolean playing = false; - private int rightImage = 0; + private boolean rightImage = false; private int moreImage = 0; private boolean isWorkDone = false; private boolean isSaved = false; @@ -74,6 +75,7 @@ public class SongView extends UpdateView implements Checkable { artistTextView = (TextView) findViewById(R.id.song_artist); durationTextView = (TextView) findViewById(R.id.song_duration); statusTextView = (TextView) findViewById(R.id.song_status); + statusImageView = (ImageView) findViewById(R.id.song_status_icon); starButton = (ImageButton) findViewById(R.id.song_star); starButton.setFocusable(false); moreButton = (ImageView) findViewById(R.id.artist_more); @@ -194,7 +196,6 @@ public class SongView extends UpdateView implements Checkable { } } - int rightImage = 0; if (isWorkDone) { int moreImage = isSaved ? R.drawable.download_pinned : R.drawable.download_cached; if(moreImage != this.moreImage) { @@ -211,14 +212,15 @@ public class SongView extends UpdateView implements Checkable { if (downloadFile.isDownloading() && !downloadFile.isDownloadCancelled() && partialFileExists) { statusTextView.setText(Util.formatLocalizedBytes(partialFile.length(), getContext())); - rightImage = R.drawable.downloading; - } else if(this.rightImage != 0) { + if(!rightImage) { + statusImageView.setVisibility(View.VISIBLE); + rightImage = true; + } + } else if(rightImage) { statusTextView.setText(null); + statusImageView.setVisibility(View.GONE); + rightImage = false; } - if(this.rightImage != rightImage) { - statusTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, rightImage, 0); - this.rightImage = rightImage; - } boolean playing = downloadService.getCurrentPlaying() == downloadFile; if (playing) { -- cgit v1.2.3 From 5a134fbfce9ed74b616b3ddb42a2b23828f407cc Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sun, 10 Nov 2013 22:22:24 -0800 Subject: Updated app icon --- DSub.png | Bin 75587 -> 1052037 bytes res/drawable-hdpi/launch.png | Bin 6155 -> 23597 bytes res/drawable-mdpi/launch.png | Bin 3527 -> 12053 bytes res/drawable-xhdpi/launch.png | Bin 8969 -> 39749 bytes res/drawable-xxhdpi/launch.png | Bin 15050 -> 85882 bytes 5 files changed, 0 insertions(+), 0 deletions(-) (limited to 'res/drawable-mdpi') diff --git a/DSub.png b/DSub.png index 1ec0bfff..d6bd8439 100644 Binary files a/DSub.png and b/DSub.png differ diff --git a/res/drawable-hdpi/launch.png b/res/drawable-hdpi/launch.png index 72f80486..9caa6675 100644 Binary files a/res/drawable-hdpi/launch.png and b/res/drawable-hdpi/launch.png differ diff --git a/res/drawable-mdpi/launch.png b/res/drawable-mdpi/launch.png index c07fc594..22e094eb 100644 Binary files a/res/drawable-mdpi/launch.png and b/res/drawable-mdpi/launch.png differ diff --git a/res/drawable-xhdpi/launch.png b/res/drawable-xhdpi/launch.png index b9379f27..f73729d0 100644 Binary files a/res/drawable-xhdpi/launch.png and b/res/drawable-xhdpi/launch.png differ diff --git a/res/drawable-xxhdpi/launch.png b/res/drawable-xxhdpi/launch.png index 797104fe..b067bd9f 100644 Binary files a/res/drawable-xxhdpi/launch.png and b/res/drawable-xxhdpi/launch.png differ -- cgit v1.2.3