From a95e71c52cf04c875b29491563bcecc4adeb57ef Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 21 Jun 2015 14:20:24 +0200 Subject: [PATCH] Added missing string, removed obsolete code. --- .../gramophone/ui/activities/PlaylistDetailActivity.java | 3 --- .../gramophone/ui/activities/SmartPlaylistDetailActivity.java | 3 --- app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java | 2 +- app/src/main/res/values/strings.xml | 1 + 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java index a71e8882..18ec6842 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/PlaylistDetailActivity.java @@ -122,9 +122,6 @@ public class PlaylistDetailActivity extends AbsFabActivity implements CabHolder case R.id.action_playing_queue: NavigationUtil.openPlayingQueueDialog(this); return true; - case R.id.action_clear_playlist: - //TODO - return true; } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java index cd606c91..b24a5b42 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SmartPlaylistDetailActivity.java @@ -113,9 +113,6 @@ public class SmartPlaylistDetailActivity extends AbsFabActivity implements CabHo case R.id.action_playing_queue: NavigationUtil.openPlayingQueueDialog(this); return true; - case R.id.action_clear_playlist: - playlist.clear(this); - return true; } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java index 06c64315..d0b26754 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java @@ -187,7 +187,7 @@ public class MusicUtil { cursor.close(); } context.getContentResolver().notifyChange(Uri.parse("content://media"), null); - Toast.makeText(context, "Deleted " + songs.size() + " songs", Toast.LENGTH_SHORT).show(); //TODO add resource string + Toast.makeText(context, context.getString(R.string.deleted_x_songs, songs.size()), Toast.LENGTH_SHORT).show(); App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED)); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5c8228ac..c4c9db90 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -67,6 +67,7 @@ Inserted %1$d songs into this playlist. Created playlist %1$s Deleted playlist %1$s + Deleted %1$d songs Could not create playlist %1$s %1$s?]]> %1$s? This cannot be undone!]]>