Convert a few things over to use R.string

2 files changed, 15 insertions, 8 deletions

diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 48a30059..02f55908 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -75,6 +75,8 @@
 	<string name="playlist.updated_info">Updated playlist information for %s</string>

 	<string name="playlist.updated_info_error">Failed to update playlist information for %s</string>

 	<string name="playlist.overwrite">Overwrite existing playlist</string>

+	<string name="playlist.add_to">Add to Playlist</string>

+	<string name="playlist.create_new">Create New</string>

 

     <string name="help.label">Help</string>

     <string name="help.title">Welcome to DSub!</string>

@@ -116,6 +118,7 @@
     <string name="select_album.donate_dialog_0_trial_days_left">Trial period is over</string>

 

 	<string name="select_genre.empty">No genres found</string>

+	<string name="select_genre.blank">Blank</string>

 

     <string name="select_playlist.empty">No saved playlists on server</string>

 

@@ -290,6 +293,7 @@
 	<string name="settings.video_transcode">Direct Transcode (Requires video -> mp4 or similar setup on Server)</string>

 	<string name="settings.video_flash">Flash (Requires Plugin)</string>

 

+	<string name="shuffle.title">Shuffle By</string>

 	<string name="shuffle.startYear">Start Year:</string>

 	<string name="shuffle.endYear">End Year:</string>

 	<string name="shuffle.genre">Genre:</string>

diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 4639ac61..100fcbc6 100644
--- a/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/subsonic-android/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -403,7 +403,8 @@ public class SubsonicFragment extends SherlockFragment {
 						@Override

 						protected void done(final List<Genre> genres) {

 							List<String> names = new ArrayList<String>();

-							names.add("Blank");

+							String blank = context.getResources().getString(R.string.select_genre_blank);

+							names.add(blank);

 							for(Genre genre: genres) {

 								names.add(genre.getName());

 							}

@@ -413,7 +414,11 @@ public class SubsonicFragment extends SherlockFragment {
 							builder.setTitle(R.string.shuffle_pick_genre)

 								.setItems(names.toArray(new CharSequence[names.size()]), new DialogInterface.OnClickListener() {

 								public void onClick(DialogInterface dialog, int which) {

-									genreCombo.setText(finalNames.get(which));

+									if(which == 0) {

+										genreCombo.setText("");

+									} else {

+										genreCombo.setText(finalNames.get(which));

+									}

 								}

 							});

 							AlertDialog dialog = builder.create();

@@ -446,7 +451,7 @@ public class SubsonicFragment extends SherlockFragment {
 		genreCombo.setText(oldGenre);

 

 		AlertDialog.Builder builder = new AlertDialog.Builder(context);

-		builder.setTitle("Shuffle By")

+		builder.setTitle(R.string.shuffle_title)

 			.setView(dialogView)

 			.setPositiveButton(R.string.common_ok, new DialogInterface.OnClickListener() {

 				@Override

@@ -456,9 +461,6 @@ public class SubsonicFragment extends SherlockFragment {
 					String genre;

 					if(useCombo) {

 						genre = genreCombo.getText().toString();

-						if(genre == null || "Blank".equals(genre)) {

-							genre = "";

-						}

 					} else {

 						genre = genreBox.getText().toString();

 					}

@@ -628,13 +630,14 @@ public class SubsonicFragment extends SherlockFragment {
 			@Override

 			protected void done(final List<Playlist> playlists) {

 				List<String> names = new ArrayList<String>();

-				names.add("Create New");

+				String createNew = context.getResources().getString(R.string.playlist_create_new);

+				names.add(createNew);

 				for(Playlist playlist: playlists) {

 					names.add(playlist.getName());

 				}

 

 				AlertDialog.Builder builder = new AlertDialog.Builder(context);

-				builder.setTitle("Add to Playlist")

+				builder.setTitle(R.string.playlist_add_to)

 					.setItems(names.toArray(new CharSequence[names.size()]), new DialogInterface.OnClickListener() {

 					public void onClick(DialogInterface dialog, int which) {